diff --git a/src/api/model/asm.js b/src/api/model/asm.js
index 641f2633..05520d26 100644
--- a/src/api/model/asm.js
+++ b/src/api/model/asm.js
@@ -27,6 +27,13 @@ export default {
data);
}
},
+ update: {
+ req: async function(id, data){
+ return await http.put(
+ `${config.API_URL}/asm/assetcate/${id}/`,
+ data);
+ }
+ },
delete: {
name: "删除",
req: async function(id){
@@ -77,6 +84,13 @@ export default {
data);
}
},
+ update: {
+ req: async function(id, data){
+ return await http.put(
+ `${config.API_URL}/asm/assetlog/${id}/`,
+ data);
+ }
+ },
delete: {
name: "删除",
req: async function(id){
diff --git a/src/components/xtSelect/index.vue b/src/components/xtSelect/index.vue
index 94c622a5..83405748 100644
--- a/src/components/xtSelect/index.vue
+++ b/src/components/xtSelect/index.vue
@@ -89,7 +89,7 @@ const props = defineProps({
options: { type: Array, default: null },
});
-const emit = defineEmits(["update:modelValue", "update:obj", "change"]);
+const emit = defineEmits(["update:modelValue", "update:obj", "change", "update::label"]);
const selectable = (row) => row.count_canhandover?row.count_canhandover>0:true;
// 控制 popover 显示与隐藏的状态
const showPopover = ref(false);
@@ -170,6 +170,7 @@ const selectValue = computed({
},
set(val) {
emit("update:modelValue", val);
+ emit("update:label", selectLabel.value);
},
});
diff --git a/src/views/asm/assetlogin_form.vue b/src/views/asm/assetlogin_form.vue
index 0058408a..bd8f0766 100644
--- a/src/views/asm/assetlogin_form.vue
+++ b/src/views/asm/assetlogin_form.vue
@@ -8,10 +8,19 @@
+
+
+
+
+
@@ -31,41 +40,71 @@
:addTemplate="addTemplate"
placeholder="暂无数据"
>
-
+
+
+ *
+ 资产类别
+
-
+
-
+
+
+ *
+ 资产名称
+
-
+
+
+ *
+ 规格型号
+
+
+ *
+ 数量
+
+
+ *
+ 可用年限
+
+
+ *
+ 资产原值
+
-
+
+
+ *
+ 供应商
+
-
+
+
+
@@ -83,21 +122,21 @@
@click="handleDel"
:loading="saveLoading"
>删除
+ 提交审批
- 提交审批
+ v-if = "formData.ticket_ && localMode=='show'"
+ :t_id="formData.id"
+ :ticket_="formData.ticket_"
+ :ticket_data="ticket_data"
+ @success="$emit('success', localMode)"
+ ref="ticketd_b"
+ >
@@ -136,7 +175,8 @@ export default {
localMode: this.mode,
saveLoading: false,
addTemplate: {
- name: null,
+ quantity: 1,
+ canuse_year: 1
}
}
},
@@ -150,7 +190,7 @@ export default {
methods: {
async getTid() {
try {
- let res = await this.$API.em.repair.item.req(this.t_id);
+ let res = await this.$API.asm.assetlog.item.req(this.t_id);
this.formData = res;
if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
this.localMode = "edit";
@@ -164,7 +204,7 @@ export default {
type: "warning",
})
.then(()=>{
- this.$API.em.repair.delete.req(this.formData.id).then(res=>{
+ this.$API.asm.assetlog.delete.req(this.formData.id).then(res=>{
this.$message.success("删除成功");
this.$emit('success');
})
@@ -173,7 +213,7 @@ export default {
async handleSave() {
if (this.localMode == "add") {
try {
- let res = await this.$API.em.repair.create.req(this.formData);
+ let res = await this.$API.asm.assetlog.create.req(this.formData);
this.$message.success("提交成功");
this.$emit('success', this.localMode);
} catch (error) {
@@ -181,7 +221,15 @@ export default {
throw error;
}
} else if (this.localMode == "edit") {
- this.$message.error("不支持编辑");
+ try{
+ let res = await this.$API.asm.assetlog.update.req(this.formData.id, this.formData);
+ this.$message.success("提交成功");
+ this.$emit('success', this.localMode);
+ }catch (error){
+ throw error;
+ }
+
+
}
}
}
diff --git a/src/views/em/repair_form.vue b/src/views/em/repair_form.vue
index 4c62764c..d3a1bf1b 100644
--- a/src/views/em/repair_form.vue
+++ b/src/views/em/repair_form.vue
@@ -80,21 +80,21 @@
@click="handleDel"
:loading="saveLoading"
>删除
-
- 提交审批
+ 提交审批
+
diff --git a/src/views/hrm/resignation_form.vue b/src/views/hrm/resignation_form.vue
index b305a6e1..274c5b40 100644
--- a/src/views/hrm/resignation_form.vue
+++ b/src/views/hrm/resignation_form.vue
@@ -42,20 +42,21 @@
@click="handleDel"
:loading="saveLoading"
>删除
-
- 提交审批
+ 提交审批
+
diff --git a/src/views/inm/good_mio.vue b/src/views/inm/good_mio.vue
index d92829ee..d1043bda 100644
--- a/src/views/inm/good_mio.vue
+++ b/src/views/inm/good_mio.vue
@@ -113,7 +113,7 @@
v-auth="'mio.submit'"
v-if="scope.row.state == 10"
>
- 接收
+ 接收
提交
-
+
删除
-
- 提交审批
+ 提交审批
+
diff --git a/src/views/statistics/bxerp/mioitemw.vue b/src/views/statistics/bxerp/mioitemw.vue
index 7573aded..3af23bd5 100644
--- a/src/views/statistics/bxerp/mioitemw.vue
+++ b/src/views/statistics/bxerp/mioitemw.vue
@@ -16,7 +16,16 @@
-
+
+
@@ -39,13 +48,13 @@
@@ -69,7 +78,9 @@ export default {
mioitem__material__type:30,
ftest__isnull:0,
mioitem__mio__state:20,
- }
+ },
+ dataTotal:0,
+ apiObj:this.$API.inm.mioitemw.list,
};
},
diff --git a/src/views/statistics/bxerp/workerTimesRY.vue b/src/views/statistics/bxerp/workerTimesRY.vue
index b8395648..25ab6102 100644
--- a/src/views/statistics/bxerp/workerTimesRY.vue
+++ b/src/views/statistics/bxerp/workerTimesRY.vue
@@ -47,6 +47,10 @@
>
+
+
+
+
@@ -58,10 +62,6 @@
-
-
-
-
diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue
index 99f7d990..0dfee290 100644
--- a/src/views/wpm/mlog6_form.vue
+++ b/src/views/wpm/mlog6_form.vue
@@ -729,7 +729,7 @@ export default {
countUseChange(){
if(this.form.count_real>this.form.count_use){
this.form.count_real = this.form.count_use;
- this.count_ok = this.form.count_real - this.form.count_notok;
+ this.form.count_ok = this.form.count_use - this.form.count_notok;
}
},
countNotOkSun() {
diff --git a/src/views/wpm_bx/handover_form2.vue b/src/views/wpm_bx/handover_form2.vue
index c294bd57..3f25fe2e 100644
--- a/src/views/wpm_bx/handover_form2.vue
+++ b/src/views/wpm_bx/handover_form2.vue
@@ -32,7 +32,6 @@
选择物料:
{{ item3 }}
-->
-
+
@@ -262,11 +261,12 @@ export default {
}else{
//放入对应的行中的handoverb中，并且在列表中disabled
that.wprOptions.forEach(item=>{
- if(item.number.indexOf(arr) > -1){
+ if(item.number.indexOf(number) > -1){
if(item.disabled){
that.$message.error("该物料已被分配");
that.form.handoverb[index].wpr = '';
}else{
+ item.checked = true;
item.disabled = true;
let obj = {};
obj.number = item.number;
diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue
index 6687a209..43ec2af5 100644
--- a/src/views/wpm_bx/inmIn.vue
+++ b/src/views/wpm_bx/inmIn.vue
@@ -93,7 +93,7 @@
min-width="150"
>
- {{scope.row.batch}}
+ {{scope.row.batch}}
{{scope.row.batch}}
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 1a3c059f..b5211ce5 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -101,20 +101,15 @@
-
+
-
+
{{scope.row.handoverb.length}}批
-
拆批
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 2f8a4a99..4432ab6a 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -186,8 +186,16 @@
-
-
+
+
+
+
+
@@ -340,12 +348,14 @@ export default {
},
],
},
+ new_batch:'',
listParams:{},
totalCount: 0,
mtype:10,
deptID:'',
route_code:'',
codeText: "",
+ batchList:[],
fileList:[],
userList: [],
userList2: [],
@@ -406,6 +416,14 @@ export default {
}
that.getTid();
},
+ watch: {
+ batchList:{
+ deep:true,
+ handler (v) {
+ console.log('batchList',v)
+ }
+ }
+ },
methods: {
getTid (){
var that = this;
@@ -514,6 +532,44 @@ export default {
that.userList2 = res;
});
},
+ remoFun(val){
+ let that = this;
+ let params = {};
+ that.batchList = [];
+ params.material = that.form.handoverb[0].material;
+ params.batch = val;
+ params.mgroup = that.mgroupId;
+ params.count_all = 1;
+ params.defect = that.form.handoverb[0].defect!=null?that.form.handoverb[0].defect:'';
+ params.defect__isnull = that.form.handoverb[0].defect!=null?false:true;
+ params.page = 0;
+ that.$API.wpm.wmaterial.list.req(params).then(res=>{
+ if(res.length>0){
+ that.batchList = res;
+ }else{
+ let obj = {};
+ obj.batch = val;
+ obj.id = val;
+ that.batchList.push(obj);
+ }
+ })
+ },
+ new_batch_change(){
+ let that = this;
+ let arr = that.batchList.filter(item=>{
+ return item.batch == that.new_batch;
+ })
+ if(arr.length>0){
+ that.form.new_batch = arr[0].batch;
+ }else{
+ that.batchList.forEach(item=>{
+ if(item.id == that.new_batch){
+ that.form.new_batch = item.batch;
+ that.form.new_wm = item.id;
+ }
+ })
+ }
+ },
addMaterial(){
this.addShow = true;
},
@@ -538,6 +594,8 @@ export default {
obj.wm = item.wm;
obj.label = item.label;
obj.batch = item.batch;
+ obj.defect = item.defect;
+ obj.material = item.material;
obj.count_cando = item.count_canhandover;
obj.count = item.count_canhandover;
this.form.handoverb.push(obj);
@@ -617,6 +675,23 @@ export default {
that.form.mtype=30;
that.mtype==30
}
+ if(that.mtype==30&&that.form.new_batch==null&&that.form.new_batch==undefined&&that.new_batch!=''){
+ let arr = that.batchList.filter(item=>{
+ return item.batch == that.new_batch;
+ })
+ if(arr.length>0){
+ that.form.new_batch = arr[0].batch;
+ }else{
+ that.batchList.forEach(item=>{
+ if(item.id == that.new_batch){
+ that.form.new_batch = item.batch;
+ that.form.new_wm = item.id;
+ }
+ })
+ }
+ }
+ console.log('that.form.new_wm',that.form.new_wm);
+ console.log('that.form.new_batch',that.form.new_batch);
if(that.mtype==20||that.mtype==30||that.type==40){
that.$API.wpm.handover.createsubmit.req(that.form).then((res) => {
that.isSaveing = false;
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index dbc2ec58..0b0c0735 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -324,6 +324,8 @@ export default {
let obj = {};
obj.wm = item.id;
obj.batch = item.batch;
+ obj.defect = item.defect;
+ obj.material = item.material;
obj.count_canhandover = item.count_canhandover;
obj.count = item.count_canhandover;
obj.label = item.defect !== null?item.batch+'('+item.material_name+')'+item.defect_name:item.batch+'('+item.material_name+')';
diff --git a/src/views/wpm_gx/inmOut.vue b/src/views/wpm_gx/inmOut.vue
index 5a53122e..4383ff82 100644
--- a/src/views/wpm_gx/inmOut.vue
+++ b/src/views/wpm_gx/inmOut.vue
@@ -409,6 +409,8 @@ export default {
let obj = {};
obj.wm = item.id;
obj.batch = item.batch;
+ obj.defect = item.defect;
+ obj.material = item.material;
obj.count_canhandover = item.count_canhandover;
obj.count = item.count_canhandover;
obj.label = item.defect !== null?item.batch+'('+item.material_name+')'+item.defect_name:item.batch+'('+item.material_name+')';