From 9760735630ca608a75dfc95ef3348a94de3a6d35 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 10 Jul 2025 14:34:11 +0800 Subject: [PATCH 01/83] =?UTF-8?q?fix=EF=BC=9A=E5=85=89=E8=8A=AF=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/fmlog_detail.vue | 35 ++++--------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue index b0880946..b37ed87c 100644 --- a/src/views/wpm_gx/fmlog_detail.vue +++ b/src/views/wpm_gx/fmlog_detail.vue @@ -43,13 +43,13 @@ - + - + @@ -96,32 +96,6 @@ - - Date: Fri, 11 Jul 2025 08:37:12 +0800 Subject: [PATCH 02/83] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=86=E6=9E=90=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/lasi.vue | 250 +++++++++++++++++++ src/views/statistics/bxerp/maopi.vue | 3 +- src/views/statistics/bxerp/niuzhuan.vue | 273 +++++++++++++++++++++ src/views/statistics/bxerp/shenjiagong.vue | 213 ++++++++++++++++ 4 files changed, 737 insertions(+), 2 deletions(-) create mode 100644 src/views/statistics/bxerp/lasi.vue create mode 100644 src/views/statistics/bxerp/niuzhuan.vue create mode 100644 src/views/statistics/bxerp/shenjiagong.vue diff --git a/src/views/statistics/bxerp/lasi.vue b/src/views/statistics/bxerp/lasi.vue new file mode 100644 index 00000000..659f0e3c --- /dev/null +++ b/src/views/statistics/bxerp/lasi.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue index 978bc6ec..2f4859cf 100644 --- a/src/views/statistics/bxerp/maopi.vue +++ b/src/views/statistics/bxerp/maopi.vue @@ -189,8 +189,7 @@ export default { data() { return { params: { - ordering:'-create_time', - + ordering:'create_time', querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]], }, query:{ diff --git a/src/views/statistics/bxerp/niuzhuan.vue b/src/views/statistics/bxerp/niuzhuan.vue new file mode 100644 index 00000000..96018b8a --- /dev/null +++ b/src/views/statistics/bxerp/niuzhuan.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/src/views/statistics/bxerp/shenjiagong.vue b/src/views/statistics/bxerp/shenjiagong.vue new file mode 100644 index 00000000..7748a8e2 --- /dev/null +++ b/src/views/statistics/bxerp/shenjiagong.vue @@ -0,0 +1,213 @@ + + + + + From 3b2cecec17711b48797db635fc9675a1cc893544 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 11 Jul 2025 14:59:00 +0800 Subject: [PATCH 03/83] =?UTF-8?q?fix:fmlog=5Fdetail=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/fmlog_detail.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue index b37ed87c..71f0319b 100644 --- a/src/views/wpm_gx/fmlog_detail.vue +++ b/src/views/wpm_gx/fmlog_detail.vue @@ -239,7 +239,6 @@ export default { that.material_out = that.material_out; that.paramsWm.mgroup = res.mgroup; that.apiObjWm = that.$API.wpm.wmaterial.list; - that.getMlogs(); }); }, getMlogs(){ @@ -285,7 +284,7 @@ export default { that.isSaveing = true; that.$API.wpm.mlog.submit.req(row.id).then((res) => { that.isSaveing = false; - that.getMlogs(); + that.$refs.table.refresh(); that.$message.success("操作成功"); }); }, @@ -300,7 +299,7 @@ export default { if (res.err_msg) { that.$message.error(res.err_msg); } else { - that.getMlogs(); + that.$refs.table.refresh(); that.$message.success("撤回成功"); } }); @@ -317,17 +316,17 @@ export default { if (res.err_msg) { that.$message.error(res.err_msg); } else { - that.getMlogs(); + that.$refs.table.refresh(); that.$message.success("删除成功"); } }); }); }, handleSaveSuccess() { - this.getMlogs(); + this.$refs.table.refresh(); }, handleCheckSuccess() { - this.getMlogs(); + this.$refs.table.refresh(); }, fileUPSuccess(res) { console.log('res',res); From ae67be4728f356c2005f89efccea26b69b644a3b Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 11 Jul 2025 16:27:02 +0800 Subject: [PATCH 04/83] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/mlogs.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue index d669cc23..1712577b 100644 --- a/src/views/wpm_gx/mlogs.vue +++ b/src/views/wpm_gx/mlogs.vue @@ -150,7 +150,7 @@ >删除 Date: Fri, 11 Jul 2025 16:42:12 +0800 Subject: [PATCH 05/83] =?UTF-8?q?fix:=E5=85=89=E8=8A=AFmlog->mlogb?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=A0=E5=8F=82=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 17 +++++++++++++---- src/views/wpm_bx/mlogs.vue | 7 +++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 64b7557b..fa44a19b 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -402,7 +402,9 @@ :isfix = "mlogItem.is_fix" :routeId ="routeId" :tracking="tracking" - :materialIn="materialIn" + :material_in="materialIn" + :hasRoute = "hasRoute" + :process="process" @success="handleSaveSuccess" @closed="saveMlogbInClose" > @@ -474,6 +476,10 @@ export default { type: String, default: "", }, + mgroup:{ + type: String, + default: "", + }, }, components: { editDialog, @@ -521,7 +527,6 @@ export default { }, tracking:10, mlogb:"", - mgroup: "", mlogItem: {}, saveInForm: { count_use: 0, @@ -569,6 +574,7 @@ export default { qct:null, defectlist:[], batchNumber:'', + hasRoute:false, isSubmit:false, fileVisible:false, }; @@ -594,6 +600,9 @@ export default { let that = this; that.$API.wpm.mlog.item.req(that.mlogId).then((res) => { that.mlogItem = res; + if(res.route!==null){ + that.hasRoute = true; + } that.oinfo_json = []; if(res.oinfo_json_){ for(let key in res.oinfo_json_){ @@ -604,12 +613,12 @@ export default { } } that.routeId = res.route; - that.tracking = res.material_in_.tracking; + that.tracking = res.material_in_!==null?res.material_in_.tracking:null; if(res.test_file!==null){ that.fileList = [{name:res.test_file,url:res.test_file}]; that.form.test_file = res.test_file; } - that.mgroup = res.mgroup; + // that.mgroup = res.mgroup; // that.paramsWm.mgroup = res.mgroup; // that.paramsWm.search = that.batchContains; that.materialIn = res.material_in; diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue index edaf02e1..63352d2c 100644 --- a/src/views/wpm_bx/mlogs.vue +++ b/src/views/wpm_bx/mlogs.vue @@ -201,6 +201,7 @@ :process="process" :mtask="mtask" :dept = "deptId" + :mgroup="mgroupId" @closed="detailClose" > @@ -241,8 +242,8 @@ export default { default: "", }, mgroupMtype: { - type: String, - default: "", + type: Number, + default: 10, } }, name: "mlog", @@ -267,6 +268,7 @@ export default { selection: [], mtask: "", mlogId: "", + mgroup_name: "", route_code: "", equipmentId: "", showHidden:false, @@ -276,6 +278,7 @@ export default { mgroupName: { handler: function (newval,odlval) { let that = this; + that.mgroup_name = newval; that.params.mgroup = ""; that.apiObj = null; that.getMgroupInfo(); From aca0fd057e82d92446063c7995c91608af4a5237 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 14 Jul 2025 08:57:07 +0800 Subject: [PATCH 06/83] =?UTF-8?q?fix:=E5=AE=A1=E6=89=B9=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=8F=90=E4=BA=A4=E4=BA=BA=E6=92=A4=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/mlogs.vue | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue index 1712577b..1ae58329 100644 --- a/src/views/wpm_gx/mlogs.vue +++ b/src/views/wpm_gx/mlogs.vue @@ -113,9 +113,7 @@ > 删除 撤回 { - this.$API.wf.ticket.ticketRetreat.req(row.ticket).then(res=>{ - that.$refs.table.refresh(); + let that = this; + if(that.userId!==row.ticket_.create_by){ + this.$confirm(`需要日志提交人撤回该日志`, "提示", { + type: "warning", + }).then(() => {}) + }else{ + this.$confirm(`确定撤回该日志审批吗？`, "提示", { + type: "warning", + }).then(() => { + this.$API.wf.ticket.ticketRetreat.req(row.ticket).then(res=>{ + that.$refs.table.refresh(); + }) }) - }) + } + }, customMethod(row,index){ let color = '',context = ''; From 263d7bd706a1d8b431878c22201be4d2b8e2179d Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 14 Jul 2025 09:01:55 +0800 Subject: [PATCH 07/83] =?UTF-8?q?fix:mlogb=E4=B8=AD=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E6=AD=A5=E9=AA=A4=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogb_form.vue | 260 +++++++++++++++++--------------- 1 file changed, 136 insertions(+), 124 deletions(-) diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue index e0bbf03c..aaac6bd5 100644 --- a/src/views/wpm_bx/mlogb_form.vue +++ b/src/views/wpm_bx/mlogb_form.vue @@ -18,6 +18,28 @@ style="padding: 0 10px" > + + + + + [{{ item.routepack_name }}]{{ item.name }} + + + + - { + that.routeOptions = res; + if(res.length==1){ + that.form.route = res[0].id; + } + }); + }, getParentList(){ let that = this; that.$API.wpm.mlogb.list.req(that.params).then((res) => { @@ -313,19 +300,41 @@ export default { getMaterial() { let that = this; let obj = {}; + console.log('that.mgroup',that.mgroup); obj.mtaskx =that.form.mtask; - obj.mgroupx =that.mgroup; - obj.route =that.routeId; + obj.mgroup =that.mgroup; + if(that.routeId!==null&&that.routeId!==''){ + obj.route =that.routeId; + } obj.page =0; - if(that.isfix){ - obj.state =30; + if(that.is_fix){//来料未完成的返修品&&出料已完成的返修品和不合格品 + obj.tag = 'canfix'; }else{ + if(that.materialIn!==null&&that.materialIn!==''){ + obj.material =that.materialIn; + } obj.state =10; + obj.tag = 'todo'; } this.$API.wpm.wmaterial.list.req(obj).then((res) => { - that.materialOptions = res; + let arr = []; + if(res.length>0){ + arr = res.filter((item)=>{ + return Number(item.count_cando)>0; + }) + } + that.materialOptions = arr; }); }, + routeChange(){ + let that = this; + that.routeOptions.forEach(item=>{ + if(item.id == that.form.route){ + that.materialIn = item.material_in; + that.getMaterial(); + } + }) + }, changeMaterial(){ let that = this; that.materialOptions.forEach(item=>{ @@ -338,6 +347,7 @@ export default { }, //扫描后处理方法 formWminChange(code){ + console.log('code',code); let that = this,codeId='',arr=[]; code = code.replace(/(^\s*)|(\s*$)/g, ""); if(code.indexOf("#")>-1){ @@ -367,67 +377,69 @@ export default { }); }else{ that.scanKyes = ""; - if(that.tracking==10){//批次 - arr = that.materialOptions.filter((item) => { - return item.batch == code; - }) - if (arr.length > 0) { - that.form.batch = arr[0].batch; - that.form.wm_in = arr[0].id; - that.form.count_use = arr[0].count; - that.wm_in = arr[0].batch; - }else{ - that.wm_in = ''; - that.$message.error("批次号不存在"); - } - }else{//单件 - that.$API.wpm.wpr.list.req({number:code,page:0}).then((res) => { - if(res.length>0){ - let index = res.length-1;//最后一条记录 - let bwitem = {}; - bwitem.mlogb=""; - bwitem.number=res[index].number; - bwitem.wpr=res[index].id; - let arr = that.materialOptions.filter((item) => { - return item.id == res[index].wm; + that.$API.wpm.wpr.list.req({number:code,page:0}).then((res) => { + if(res.length>0){ + let index = res.length-1;//最后一条记录 + let bwitem = {}; + bwitem.mlogb=""; + bwitem.number=res[index].number; + bwitem.wpr=res[index].id; + let arr = that.materialOptions.filter((item) => { + return item.id == res[index].wm; + }) + if(arr.length>0){ //车间存在该批次 + let batch = arr[0].batch; + that.wm_in = arr[0].batch; + that.mlogbInCount = arr[0].count;//该批次数量 + //判断日志中是否存在该批次 + let arr0= that.mlogbIns.filter((item)=>{ + return item.batch == batch; }) - if(arr.length>0){ //车间存在该批次 - let batch = arr[0].batch; - that.wm_in = arr[0].batch; - that.mlogbInCount = arr[0].count;//该批次数量 - //判断日志中是否存在该批次 - let arr0= that.mlogbIns.filter((item)=>{ - return item.batch == batch; - }) - let arr1 = that.bwItemForms.filter((item)=>{ - return item.number == bwitem.number; - }) - if (arr0.length > 0) { - that.hasMlogbIn = true; - that.form.count_use = 1; - that.mlogbId = arr0[0].id; - bwitem.mlogb = arr0[0].id; - }else{ - if(arr1.length>0){ - that.wm_in = ''; - that.$message.error("已存在"); - }else{ - that.form.batch = arr[0].batch; - that.form.wm_in = arr[0].id; - that.form.count_use += 1; - that.wm_in = ''; - that.batchs = arr[0].id; - } - } - that.bwItemForms.push(bwitem); - // that.bwItemForm = bwitem; + let arr1 = that.bwItemForms.filter((item)=>{ + return item.number == bwitem.number; + }) + if (arr0.length > 0) { + that.hasMlogbIn = true; + that.form.count_use = 1; + that.mlogbId = arr0[0].id; + bwitem.mlogb = arr0[0].id; }else{ - that.wm_in = ''; - that.$message.error("批次号不存在"); + if(arr1.length>0){ + that.wm_in = ''; + that.$message.error("已存在"); + }else{ + that.form.batch = arr[0].batch; + that.form.wm_in = arr[0].id; + that.form.count_use += 1; + that.wm_in = ''; + that.batchs = arr[0].id; + } } + that.bwItemForms.push(bwitem); + // that.bwItemForm = bwitem; + }else{ + that.wm_in = ''; + that.$message.error("批次号不存在"); } - }) - } + } + }) + // if(that.tracking==10||that.tracking==null){//批次 + // arr = that.materialOptions.filter((item) => { + // return item.batch == code; + // }) + // if (arr.length > 0) { + // that.form.batch = arr[0].batch; + // that.form.wm_in = arr[0].id; + // that.form.count_use = arr[0].count; + // that.wm_in = arr[0].batch; + // }else{ + // that.wm_in = ''; + // that.$message.error("批次号不存在"); + // } + // }else{//单件 + // console.log('code',code); + + // } } }, //表单提交方法 From d18c9be671590d591f67443d438a38e6a31844a2 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 14 Jul 2025 11:14:17 +0800 Subject: [PATCH 08/83] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4wpr=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E8=A1=A8=E4=B8=AD=E6=A3=80=E9=AA=8C=E6=9D=BF=E6=AE=B5?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue index ae7cc7f4..583953ad 100644 --- a/src/views/wpm_bx/mlogbw_check.vue +++ b/src/views/wpm_bx/mlogbw_check.vue @@ -27,7 +27,7 @@ 检验 批量操作 - 批量操作 + { - if(item.number == that.wprInputText){ + let indexs = item.number.indexOf(that.wprInputText) + if(indexs>-1&&that.wprInputText !== ""){ + // console.log(item.number,that.wprInputText,indexs,indexs>-1); + // if(item.number == that.wprInputText){ let obj = Object.assign({},item); obj.isEdit = true; that.mlogbwlist.splice(index,1); From 51bcaa2dbbf81758dcdff5fcdedc2c95d23c257d Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 14 Jul 2025 15:18:10 +0800 Subject: [PATCH 09/83] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=AF=9B=E5=9D=AF?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=9C=AA=E5=AE=8C=E6=88=90=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=B8=ADwpr=E5=B1=95=E7=A4=BA=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 32ceca0b..b3b22769 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -230,6 +230,7 @@ width="120" > @@ -251,6 +252,13 @@ > + + + + + + + + + diff --git a/src/views/statistics/bxerp/lasi.vue b/src/views/statistics/bxerp/cpwgfj1.vue similarity index 60% rename from src/views/statistics/bxerp/lasi.vue rename to src/views/statistics/bxerp/cpwgfj1.vue index 659f0e3c..ac2313f3 100644 --- a/src/views/statistics/bxerp/lasi.vue +++ b/src/views/statistics/bxerp/cpwgfj1.vue @@ -3,26 +3,15 @@
+ - - 导出 + >导出
@@ -45,111 +35,114 @@ stripe > - + + - + @@ -171,7 +164,7 @@ @@ -185,15 +178,13 @@ export default { data() { return { params: { - ordering:'-create_time', - - querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]], + ordering:'data__成品外观复检一_批次号', + querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]], }, query:{ batch__contains:'', last_time__gte:'', last_time__lte:'', - }, apiObj: this.$API.wpm.wpr.query, options:[], @@ -203,7 +194,7 @@ export default { methods: { handleQuery(){ let that = this; - let querys = [],arr1=[],arr2=[]; + let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]]; let obj = {},obj1 = {},obj2 = {}; obj.field = 'batch__contains'; obj.value = that.query.batch__contains; @@ -217,26 +208,17 @@ export default { obj2.value = that.query.last_time__lte; obj2.compare = 'lte'; - if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){ - querys.push(obj); + if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ + querys[0].push(obj); } if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){ - arr1.push(obj1); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr1.push(obj); - } - querys.push(arr1) + querys[0].push(obj1); } if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){ - arr2.push(obj2); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr2.push(obj); - } - querys.push(arr2) + querys[0].push(obj2); } - let params = {}; - params.querys = querys; - this.$refs.table.queryData(params); + that.params.querys = querys; + this.$refs.table.queryData(that.params); }, getCountQt(data,type){ let count_qt = 0,count = 0; diff --git a/src/views/statistics/bxerp/cpwgfj2.vue b/src/views/statistics/bxerp/cpwgfj2.vue new file mode 100644 index 00000000..b327b9c9 --- /dev/null +++ b/src/views/statistics/bxerp/cpwgfj2.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/src/views/statistics/bxerp/cpwgnzcj.vue b/src/views/statistics/bxerp/cpwgnzcj.vue new file mode 100644 index 00000000..e019bb03 --- /dev/null +++ b/src/views/statistics/bxerp/cpwgnzcj.vue @@ -0,0 +1,472 @@ + + + + + diff --git a/src/views/statistics/bxerp/cpxnjy.vue b/src/views/statistics/bxerp/cpxnjy.vue new file mode 100644 index 00000000..4464e7f8 --- /dev/null +++ b/src/views/statistics/bxerp/cpxnjy.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/src/views/statistics/bxerp/cpzj.vue b/src/views/statistics/bxerp/cpzj.vue new file mode 100644 index 00000000..b6cf108f --- /dev/null +++ b/src/views/statistics/bxerp/cpzj.vue @@ -0,0 +1,376 @@ + + + + + diff --git a/src/views/statistics/bxerp/fenjian.vue b/src/views/statistics/bxerp/fenjian.vue new file mode 100644 index 00000000..a80915e6 --- /dev/null +++ b/src/views/statistics/bxerp/fenjian.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue index 2f4859cf..fc5a85fd 100644 --- a/src/views/statistics/bxerp/maopi.vue +++ b/src/views/statistics/bxerp/maopi.vue @@ -3,11 +3,16 @@
- + + + + - @@ -189,14 +196,13 @@ export default { data() { return { params: { - ordering:'create_time', + ordering:'data__毛坯检测_批次号', querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]], }, query:{ batch__contains:'', last_time__gte:'', last_time__lte:'', - }, apiObj: this.$API.wpm.wpr.query, options:[], @@ -206,7 +212,7 @@ export default { methods: { handleQuery(){ let that = this; - let querys = [],arr1=[],arr2=[]; + let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]]; let obj = {},obj1 = {},obj2 = {}; obj.field = 'batch__contains'; obj.value = that.query.batch__contains; @@ -220,26 +226,17 @@ export default { obj2.value = that.query.last_time__lte; obj2.compare = 'lte'; - if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){ - querys.push(obj); + if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ + querys[0].push(obj); } if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){ - arr1.push(obj1); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr1.push(obj); - } - querys.push(arr1) + querys[0].push(obj1); } if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){ - arr2.push(obj2); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr2.push(obj); - } - querys.push(arr2) + querys[0].push(obj2); } - let params = {}; - params.querys = querys; - this.$refs.table.queryData(params); + that.params.querys = querys; + this.$refs.table.queryData(that.params); }, getCountQt(data,type){ let count_qt = 0,count = 0; diff --git a/src/views/statistics/bxerp/niuzhuan.vue b/src/views/statistics/bxerp/niuzhuan.vue index 96018b8a..02fc6985 100644 --- a/src/views/statistics/bxerp/niuzhuan.vue +++ b/src/views/statistics/bxerp/niuzhuan.vue @@ -3,11 +3,16 @@
- + + + + @@ -56,24 +66,24 @@ @@ -81,51 +91,51 @@ @@ -133,28 +143,28 @@ @@ -162,39 +172,39 @@ @@ -208,9 +218,11 @@ export default { data() { return { params: { - ordering:'-create_time', - - querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭转检测_批次号"}]], + ordering:'data__扭后检测_批次号', + querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]], + }, + querys:{ + ordering:'-create_time' }, query:{ batch__contains:'', @@ -226,7 +238,7 @@ export default { methods: { handleQuery(){ let that = this; - let querys = [],arr1=[],arr2=[]; + let querys = []; let obj = {},obj1 = {},obj2 = {}; obj.field = 'batch__contains'; obj.value = that.query.batch__contains; @@ -240,31 +252,19 @@ export default { obj2.value = that.query.last_time__lte; obj2.compare = 'lte'; - if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){ - querys.push(obj); + querys=[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]] + if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ + querys[0].push(obj); } if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){ - arr1.push(obj1); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr1.push(obj); - } - querys.push(arr1) + querys[0].push(obj1) } if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){ - arr2.push(obj2); - if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ - arr2.push(obj); - } - querys.push(arr2) + querys[0].push(obj2) } - let params = {}; - params.querys = querys; - this.$refs.table.queryData(params); + that.querys.querys = querys; + this.$refs.table.queryData(that.querys); }, - getCountQt(data,type){ - let count_qt = 0,count = 0; - - } }, }; diff --git a/src/views/statistics/bxerp/shenjiagong.vue b/src/views/statistics/bxerp/shenjiagong.vue deleted file mode 100644 index 7748a8e2..00000000 --- a/src/views/statistics/bxerp/shenjiagong.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - - - diff --git a/src/views/statistics/bxerp/zhongjian1.vue b/src/views/statistics/bxerp/zhongjian1.vue new file mode 100644 index 00000000..0d3caaf3 --- /dev/null +++ b/src/views/statistics/bxerp/zhongjian1.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/views/statistics/bxerp/zhongjian2.vue b/src/views/statistics/bxerp/zhongjian2.vue new file mode 100644 index 00000000..d5d8a07f --- /dev/null +++ b/src/views/statistics/bxerp/zhongjian2.vue @@ -0,0 +1,316 @@ + + + + + From e690a109519e8395d82137166d3eb6e48fb8551e Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 15 Jul 2025 16:36:21 +0800 Subject: [PATCH 12/83] =?UTF-8?q?fix:=E6=B5=81=E7=A8=8B=E5=9B=BE=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9B=B8=E5=90=8C=E4=B8=A4=E4=B8=AA=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=97=B4=E5=A4=9A=E6=9D=A1=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scDegra.vue | 5 +++-- src/views/template/degraD3.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/scDegra.vue b/src/components/scDegra.vue index a1a538e4..fb7def1d 100644 --- a/src/components/scDegra.vue +++ b/src/components/scDegra.vue @@ -60,7 +60,7 @@ export default { if(that.g!==null){ that.updateGraph(); }else{ - that.g = new dagreD3.graphlib.Graph().setGraph({ + that.g = new dagreD3.graphlib.Graph({multigraph: true}).setGraph({ rankdir: that.rankdir, nodesep: 40, edgesep: 25, //两条线之间的距离 @@ -89,8 +89,9 @@ export default { that.edges.forEach((transition0) => { that.g.setEdge(transition0.source,transition0.target,{ label: transition0.label,// 边标签 + id: transition0.id, style: "fill:#ffffff;stroke:#c0c1c3;stroke-width:1.5px", // 根据后台数据来改变连线的颜色 - }); + },transition0.id); }); // 创建渲染器 let render = new dagreD3.render(); diff --git a/src/views/template/degraD3.vue b/src/views/template/degraD3.vue index 8c245af7..b613ac6d 100644 --- a/src/views/template/degraD3.vue +++ b/src/views/template/degraD3.vue @@ -60,7 +60,7 @@ export default { if(that.g!==null){ that.updataGraph(); }else{ - that.g = new dagreD3.graphlib.Graph().setGraph({ + that.g = new dagreD3.graphlib.Graph({multigraph: true,}).setGraph({ rankdir: that.rankdir, nodesep: 40, edgesep: 25, //两条线之间的距离 @@ -89,8 +89,9 @@ export default { that.edges.forEach((transition0) => { that.g.setEdge(transition0.source,transition0.target,{ label: transition0.label,// 边标签 + id: transition0.id, style: "fill:#ffffff;stroke:#c0c1c3;stroke-width:1.5px", // 根据后台数据来改变连线的颜色 - }); + }, transition0.id); }); // 创建渲染器 let render = new dagreD3.render(); From 3c96b563c2ddcbb8d9ae7082ddec598944dcf019 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 15 Jul 2025 16:36:58 +0800 Subject: [PATCH 13/83] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/routepack.vue | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/views/mtm/routepack.vue b/src/views/mtm/routepack.vue index cf66411b..c0bc47c6 100644 --- a/src/views/mtm/routepack.vue +++ b/src/views/mtm/routepack.vue @@ -190,27 +190,15 @@ ref="showDialog" @closed="dialog.show = false" > - diff --git a/src/views/bigScreen/bxerp/niuzhuandept.vue b/src/views/bigScreen/bxerp/niuzhuandept.vue index dcff9fd4..b11900cb 100644 --- a/src/views/bigScreen/bxerp/niuzhuandept.vue +++ b/src/views/bigScreen/bxerp/niuzhuandept.vue @@ -74,7 +74,7 @@
-
车间各工段生产产品数
+
本月各工段生产产品数
@@ -392,7 +392,7 @@ export default { headerBGC: 'rgba(47,102,107,.34)', oddRowBGC: 'rgba(0,0,0,0)', evenRowBGC: 'rgba(0,0,0,0)', - header:['批次号','物料名称', '当前工序', '状态', '数量'], + header:['批次号','物料名称', '当前工序', '当前状态', '当前数量'], data: [] }, config_middle_bottom:{ @@ -425,20 +425,15 @@ export default { this.dayInterval = setInterval(() => { this.showTime(); }, 1000); - that.$API.system.dept.list.req({name:that.deptName,page:0}).then((res) => { - if(res.length > 0){ - that.deptId = res[0].id; - that.getMgroups(); - //设备列表：各个工段的设备列表 - that.getEquipment(); - //每个人日生产量：个人绩效 - that.getEveryoneCount(); - //车间库存 - that.getInms(); - } - }) + that.getMgroups(); + //设备列表：各个工段的设备列表 + that.getEquipment(); + //每个人日生产量：个人绩效 + that.getEveryoneCount(); //车间整体产品统计 that.materialAll(); + //车间各工段生产产品数 + that.getmgroupMaterial(); }, methods: { getMondayOfCurrentWeek() { @@ -482,13 +477,12 @@ export default { that.$API.mtm.mgroup.list.req({belong_dept__name:that.deptName,page:0}).then((res) => { if(res.length > 0){ res.forEach((item)=>{ - that.mgroupsId += item.id + ','; - let obj = {}; + that.mgroupsId += item.id + ','; + let obj = {}; obj.name = item.name; obj.value = 0; that.config_left1.data.push(obj); - that.getmgroupMaterial(); - that.getInms(item); + that.getInms(item); }) } }); @@ -514,10 +508,16 @@ export default { //车间各工段生产产品数 getmgroupMaterial() { let that = this; - let date = that.$TOOL.dateFormat(new Date(), "yyyy-MM-dd"); + let date = new Date(); + let year = date.getFullYear(); + let month = date.getMonth() + 1; + month = month < 10 ? "0" + month : month; + let days = new Date(year, month, 0).getDate(); + let start_date = year + "-" + month + "-01"; + let end_date = year + "-" + month + "-" + days; + // let date = that.$TOOL.dateFormat(new Date(), "yyyy-MM-dd"); let params = { - // query: {start_date:date,end_date:date,mgroup_name:item.name}, - query: {start_date:date,end_date:date,dept_name:that.deptName}, + query: {start_date:start_date,end_date:end_date,dept_name:that.deptName}, }; this.$API.bi.dataset.exec.req("mlog_okrate", params).then((res) => { if(res.data2.ds0.length>0){ @@ -536,8 +536,8 @@ export default { getEquipment() { let that = this; let params = { - page: 0, belong_dept:that.deptId, - // query: " { id, name, number, model, state ,mgroup_name }" + page: 0, belong_dept__name:that.deptName, + query: " { id, name, number, model, state ,mgroup_name,running_state }" }; that.config_middle_bottom.data = []; that.$API.em.equipment.list.req(params).then((res) => { @@ -563,7 +563,6 @@ export default { let date = that.$TOOL.dateFormat(new Date(), "yyyy-MM-dd"); let params = { query: {start_date:date,end_date:date,dept_name:that.deptName}, - // query: {start_date:'2025-05-04',end_date:'2025-05-04',dept_name:that.deptName}, }; this.$API.bi.dataset.exec.req("performance", params).then((res) => { if(res.data2.ds0.length>0){ @@ -619,28 +618,6 @@ export default { } }); }, - //任务进度 - getMtask1() { - let that = this; - let params = { - state: 20,mgroup__belong_dept: that.deptId,page:0, - query: " { id, material_out_name, number, count, count_ok }" - }; - that.config_middle_top.data = []; - that.$API.pm.mtask.list.req(params).then((res) => { - if(res.length>0){ - res.forEach((item) => { - let arr = []; - arr[0] = item.number; - arr[1] = item.material_out_name; - arr[2] = item.count; - arr[3] = item.count_ok; - // arr[4] = item.count_ok/item.count*100+'%'; - that.config_middle_top.data.push(arr); - }) - } - }); - }, }, }; diff --git a/src/views/bigScreen/bxerp/reyadept.vue b/src/views/bigScreen/bxerp/reyadept.vue index 9d0f022b..d2f3246f 100644 --- a/src/views/bigScreen/bxerp/reyadept.vue +++ b/src/views/bigScreen/bxerp/reyadept.vue @@ -74,7 +74,7 @@
-
车间各工段生产产品数
+
本月各工段生产产品数
@@ -392,7 +392,7 @@ export default { headerBGC: 'rgba(47,102,107,.34)', oddRowBGC: 'rgba(0,0,0,0)', evenRowBGC: 'rgba(0,0,0,0)', - header:['批次号','物料名称', '当前工序', '状态', '数量'], + header:['批次号','物料名称', '当前工序', '当前状态', '当前数量'], data: [] }, config_middle_bottom:{ @@ -425,18 +425,11 @@ export default { this.dayInterval = setInterval(() => { this.showTime(); }, 1000); - that.$API.system.dept.list.req({name:that.deptName,page:0}).then((res) => { - if(res.length > 0){ - that.deptId = res[0].id; - that.getMgroups(); - //设备列表：各个工段的设备列表 - that.getEquipment(); - //每个人日生产量：个人绩效 - that.getEveryoneCount(); - //车间库存 - that.getInms(); - } - }) + that.getMgroups(); + //设备列表：各个工段的设备列表 + that.getEquipment(); + //每个人日生产量：个人绩效 + that.getEveryoneCount(); //车间整体产品统计 that.materialAll(); }, @@ -515,10 +508,16 @@ export default { //车间各工段生产产品数 getmgroupMaterial() { let that = this; - let date = that.$TOOL.dateFormat(new Date(), "yyyy-MM-dd"); + let date = new Date(); + let year = date.getFullYear(); + let month = date.getMonth() + 1; + month = month < 10 ? "0" + month : month; + let days = new Date(year, month, 0).getDate(); + let start_date = year + "-" + month + "-01"; + let end_date = year + "-" + month + "-" + days; + // let date = that.$TOOL.dateFormat(new Date(), "yyyy-MM-dd"); let params = { - // query: {start_date:date,end_date:date,mgroup_name:item.name}, - query: {start_date:date,end_date:date,dept_name:that.deptName}, + query: {start_date:start_date,end_date:end_date,dept_name:that.deptName}, }; this.$API.bi.dataset.exec.req("mlog_okrate", params).then((res) => { if(res.data2.ds0.length>0){ @@ -537,8 +536,8 @@ export default { getEquipment() { let that = this; let params = { - page: 0, belong_dept:that.deptId, - // query: " { id, name, number, model, state ,mgroup_name }" + page: 0, belong_dept__name:that.deptName, + query: " { id, name, number, model, state ,mgroup_name,running_state }" }; that.config_middle_bottom.data = []; that.$API.em.equipment.list.req(params).then((res) => { @@ -563,8 +562,8 @@ export default { that.config_right_top.data = []; let date = that.$TOOL.dateFormat(new Date(), "yyyy-MM-dd"); let params = { - // query: {start_date:date,end_date:date,dept_name:that.deptName}, - query: {start_date:'2025-05-04',end_date:'2025-05-04',dept_name:that.deptName}, + query: {start_date:date,end_date:date,dept_name:that.deptName}, + // query: {start_date:'2025-05-04',end_date:'2025-05-04',dept_name:that.deptName}, }; this.$API.bi.dataset.exec.req("performance", params).then((res) => { if(res.data2.ds0.length>0){ From 251263d4846ae63e73f5bccd4d2c285478d7f012 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 22 Jul 2025 16:11:05 +0800 Subject: [PATCH 31/83] =?UTF-8?q?fix:=E5=86=B7=E5=8A=A0=E5=B7=A5=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E7=9C=8B=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/bxerp/lengjiagongdept.vue | 119 ++++++++++++++++-- 1 file changed, 112 insertions(+), 7 deletions(-) diff --git a/src/views/bigScreen/bxerp/lengjiagongdept.vue b/src/views/bigScreen/bxerp/lengjiagongdept.vue index e30a529c..e35e375e 100644 --- a/src/views/bigScreen/bxerp/lengjiagongdept.vue +++ b/src/views/bigScreen/bxerp/lengjiagongdept.vue @@ -12,7 +12,7 @@
本月各工段生产产品数
- +
@@ -332,6 +332,101 @@ export default { } ] }, + barOption2: { + grid: { + top: "1%", + left: "10%", + bottom: "5%", + containLabel: true + }, + xAxis: { + splitLine: { + show:false + }, + }, + yAxis: [ + { + axisLine: { + show: false + }, + axisTick: { + show: false + }, + axisLabel: { + color: "#fff" + }, + splitLine: { + show:false + }, + type: 'category', + inverse: true, // 反转坐标轴 + data: [] + }, + { + show: false, + axisLine: { + show: false + }, + axisTick: { + show: false + }, + splitLine: { + show:false + }, + axisLabel: { + textStyle: { + fontSize: 12, + color: "#fff" + } + }, + inverse: true, // 反转坐标轴 + data: [], + } + ], + series: [ + { + name: '柱状图', + type: 'bar', + data: [], + yAxisIndex: 0, + barCategoryGap: 50, + barWidth: 10, + itemStyle: { + normal: { + barBorderRadius: 5, + color: function (params) { + return myColor[params.dataIndex]; + } + }, + label: { + normal: { + position: "outside", + color: "#fff", + } + } + }, + }, + { + name: "框", + type: "bar", + barCategoryGap: 50, + barWidth: 12, + itemStyle: { + color: "none", + shadowColor: '#999', // 阴影颜色 + shadowBlur: 3, // 阴影模糊 + shadowOffsetX: 0, // 阴影水平偏移 + shadowOffsetY: 0, // 阴影垂直偏移 + borderColor: "rgba(153,153,153,0.6)", // 边框颜色 + borderWidth: 0.5, + barBorderRadius: 5, + + }, + yAxisIndex: 1, + data: [] + } + ] + }, barOption: { grid: { top: "1%", @@ -492,7 +587,7 @@ export default { top = top.substring(0,top.length-2); let topNumber = Number(top); let newTop = 0; - if(topNumber <= -20){ + if(topNumber <= -85){ newTop = 0; }else{ newTop =Number(top)-2.5; @@ -544,10 +639,12 @@ export default { if(res.length > 0){ res.forEach((item)=>{ that.mgroupsId += item.id + ','; - that.barOption.yAxis.data.push(item.name); - that.barOption.series.data.push(0); //车间库存 that.getInms(item); + that.barOption2.yAxis[0].data.push(item.name); + that.barOption2.yAxis[1].data.push(0); + that.barOption2.series[0].data.push(0); + that.barOption2.series[1].data.push(0); that.getmgroupMaterial(item.name); }) } @@ -581,11 +678,19 @@ export default { if(res.data2.ds0.length>0){ let data = res.data2.ds0; data.forEach((item) => { - let index2 = that.barOption.yAxis.data.indexOf(item.工段); - that.barOption.series.data[index2] = item.合格数; + // that.barOption2.yAxis[0].data.push(item.name); + let index2 = that.barOption2.yAxis[0].data.indexOf(mgroupName); + that.barOption2.yAxis[1].data[index2] = item.合格数; + that.barOption2.series[0].data[index2] = item.合格数; }) + let maxNum = that.barOption2.series[0].data.sort((a, b) => b - a)[0]+2; + let arr = []; + that.barOption2.series[1].data.forEach((item)=>{ + arr.push(maxNum) + }) + that.barOption2.series[1].data = arr; } - console.log(that.barOption); + console.log(that.barOption2); }); }, //车间设备列表 From ce34bc24dc816a4994f74a4aa68a6b0c5ee88759 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 22 Jul 2025 16:28:40 +0800 Subject: [PATCH 32/83] =?UTF-8?q?fix:=E5=86=B7=E5=8A=A0=E5=B7=A5=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E7=9C=8B=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/bxerp/lengjiagongdept.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/bigScreen/bxerp/lengjiagongdept.vue b/src/views/bigScreen/bxerp/lengjiagongdept.vue index e35e375e..7e92143f 100644 --- a/src/views/bigScreen/bxerp/lengjiagongdept.vue +++ b/src/views/bigScreen/bxerp/lengjiagongdept.vue @@ -690,7 +690,6 @@ export default { }) that.barOption2.series[1].data = arr; } - console.log(that.barOption2); }); }, //车间设备列表 From e5b8552284d68998d0740bf24789275b14d35854 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 23 Jul 2025 14:49:41 +0800 Subject: [PATCH 33/83] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E5=90=8E=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/mlog_detail.vue | 6 +++--- src/views/wpm_gx/mlogs.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index 06781730..408fb848 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -142,13 +142,13 @@ link type="primary" @click="table_in_edit(scope.row)" - :disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1)" + :disabled="mlogItem.submit_time !== null||(mlogItem.ticket!==null&&mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1)" > 编辑 @@ -302,7 +302,7 @@ 检验 diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue index 1ae58329..4cfd2043 100644 --- a/src/views/wpm_gx/mlogs.vue +++ b/src/views/wpm_gx/mlogs.vue @@ -143,7 +143,7 @@ size="small" v-auth="'mlog.delete'" type="danger" - v-if="scope.row.ticket== null&&scope.row.submit_time == null" + v-if="scope.row.submit_time == null&&(scope.row.ticket== null||(scope.row.ticket_&&scope.row.ticket_.state_.type==1))" @click.stop="table_del(scope.row, scope.$index)" >删除 Date: Wed, 23 Jul 2025 14:56:29 +0800 Subject: [PATCH 34/83] =?UTF-8?q?fix:=20=E5=85=89=E8=8A=AF=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_gx.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue index 491e9de3..435257ee 100644 --- a/src/views/bigScreen/index_gx.vue +++ b/src/views/bigScreen/index_gx.vue @@ -703,7 +703,7 @@ export default { let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth; let day = that.currentDay>9?that.currentDay:'0'+that.currentDay; let current_date = that.currentYear+'-'+month+'-'+day; - let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'二次超洗'}}; + let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'一次超洗'}}; that.$API.bi.dataset.exec.req('lineDay_m2', objDay).then((res0) => { if(res0.data2.ds0&&res0.data2.ds0.length>0){ that.count_day = res0.data2.ds0[0].生产数; @@ -717,7 +717,7 @@ export default { let first = that.$TOOL.dateFormat2(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一 let last = that.$TOOL.dateFormat2(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日 let objWeek = {query:{ - start_date:first,end_date:last,mgroup_name:'二次超洗', + start_date:first,end_date:last,mgroup_name:'一次超洗', group_bys_date:',月,周',order_bys_date:',月,周', select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月,EXTRACT(WEEK FROM mlog.handle_date) AS 周' }}; @@ -729,7 +729,7 @@ export default { let start_month = that.currentYear+'-'+month+'-01'; let end_month = that.currentYear+'-'+month+'-'+new Date(that.currentYear, month, 0).getDate(); let objMonth = {query:{ - start_date:start_month,end_date:end_month,mgroup_name:'二次超洗', + start_date:start_month,end_date:end_month,mgroup_name:'一次超洗', group_bys_date:',月',order_bys_date:',月', select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月' }}; From b7cc7913a6c61b807b296c9f440d02ac3edaa813 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 23 Jul 2025 16:55:05 +0800 Subject: [PATCH 35/83] =?UTF-8?q?fix:=E6=9C=AC=E6=9C=88=E5=90=84=E5=B7=A5?= =?UTF-8?q?=E6=AE=B5=E7=94=9F=E4=BA=A7=E4=BA=A7=E5=93=81=E6=95=B0=E6=9F=B1?= =?UTF-8?q?=E7=8A=B6=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/bxerp/jiejingdept.vue | 10 +- src/views/bigScreen/bxerp/jiejingdept2.vue | 10 +- src/views/bigScreen/bxerp/lengjiagongdept.vue | 196 ++---------------- src/views/bigScreen/bxerp/niuzhuandept.vue | 10 +- src/views/bigScreen/bxerp/reyadept.vue | 10 +- 5 files changed, 55 insertions(+), 181 deletions(-) diff --git a/src/views/bigScreen/bxerp/jiejingdept.vue b/src/views/bigScreen/bxerp/jiejingdept.vue index 5a7ecea7..b36e5bb5 100644 --- a/src/views/bigScreen/bxerp/jiejingdept.vue +++ b/src/views/bigScreen/bxerp/jiejingdept.vue @@ -318,11 +318,16 @@ export default { yAxisIndex: 0, barCategoryGap: 50, barWidth: 10, + label: { + show: true, + position: "right", + color: "#fff", + }, itemStyle: { normal: { barBorderRadius: 5, color: function (params) { - return myColor[params.dataIndex]; + return myColor[params.dataIndex%5]; } }, label: { @@ -391,7 +396,8 @@ export default { {name:'一次复丝',value:0}, {name:'捆二次棒',value:0}, {name:'二次复丝',value:0}, - ] + ], + showValue: true } , config_left2:{ data:[] diff --git a/src/views/bigScreen/bxerp/jiejingdept2.vue b/src/views/bigScreen/bxerp/jiejingdept2.vue index 45cda5fb..ab18edb4 100644 --- a/src/views/bigScreen/bxerp/jiejingdept2.vue +++ b/src/views/bigScreen/bxerp/jiejingdept2.vue @@ -318,11 +318,16 @@ export default { yAxisIndex: 0, barCategoryGap: 50, barWidth: 10, + label: { + show: true, + position: "right", + color: "#fff", + }, itemStyle: { normal: { barBorderRadius: 5, color: function (params) { - return myColor[params.dataIndex]; + return myColor[params.dataIndex%5]; } }, label: { @@ -388,7 +393,8 @@ export default { {name:'排二次棒',value:0}, {name:'切丝',value:0}, {name:'排板',value:0}, - ] + ], + showValue: true } , config_left2:{ data:[] diff --git a/src/views/bigScreen/bxerp/lengjiagongdept.vue b/src/views/bigScreen/bxerp/lengjiagongdept.vue index 7e92143f..c00dbdd8 100644 --- a/src/views/bigScreen/bxerp/lengjiagongdept.vue +++ b/src/views/bigScreen/bxerp/lengjiagongdept.vue @@ -12,9 +12,9 @@
本月各工段生产产品数
- +
- +
@@ -294,11 +294,16 @@ export default { yAxisIndex: 0, barCategoryGap: 50, barWidth: 10, + label: { + show: true, + position: "right", + color: "#fff", + }, itemStyle: { normal: { barBorderRadius: 5, color: function (params) { - return myColor[params.dataIndex]; + return myColor[params.dataIndex%5]; } }, label: { @@ -332,154 +337,6 @@ export default { } ] }, - barOption2: { - grid: { - top: "1%", - left: "10%", - bottom: "5%", - containLabel: true - }, - xAxis: { - splitLine: { - show:false - }, - }, - yAxis: [ - { - axisLine: { - show: false - }, - axisTick: { - show: false - }, - axisLabel: { - color: "#fff" - }, - splitLine: { - show:false - }, - type: 'category', - inverse: true, // 反转坐标轴 - data: [] - }, - { - show: false, - axisLine: { - show: false - }, - axisTick: { - show: false - }, - splitLine: { - show:false - }, - axisLabel: { - textStyle: { - fontSize: 12, - color: "#fff" - } - }, - inverse: true, // 反转坐标轴 - data: [], - } - ], - series: [ - { - name: '柱状图', - type: 'bar', - data: [], - yAxisIndex: 0, - barCategoryGap: 50, - barWidth: 10, - itemStyle: { - normal: { - barBorderRadius: 5, - color: function (params) { - return myColor[params.dataIndex]; - } - }, - label: { - normal: { - position: "outside", - color: "#fff", - } - } - }, - }, - { - name: "框", - type: "bar", - barCategoryGap: 50, - barWidth: 12, - itemStyle: { - color: "none", - shadowColor: '#999', // 阴影颜色 - shadowBlur: 3, // 阴影模糊 - shadowOffsetX: 0, // 阴影水平偏移 - shadowOffsetY: 0, // 阴影垂直偏移 - borderColor: "rgba(153,153,153,0.6)", // 边框颜色 - borderWidth: 0.5, - barBorderRadius: 5, - - }, - yAxisIndex: 1, - data: [] - } - ] - }, - barOption: { - grid: { - top: "1%", - left: "10%", - bottom: "5%", - containLabel: true - }, - xAxis: { - splitLine: { - show:false - }, - }, - yAxis: { - axisLine: { - show: false - }, - axisTick: { - show: false - }, - axisLabel: { - color: "#fff" - }, - splitLine: { - show:false - }, - type: 'category', - inverse: true, // 反转坐标轴 - data: [] - }, - series:{ - name: '柱状图', - type: 'bar', - data: [], - barCategoryGap: 50, - barWidth: 10, - itemStyle: { - normal: { - barBorderRadius: 5, - color: function (params) { - return myColor[params.dataIndex]; - } - }, - label: { - normal: { - show: true, - position: "outside", - color: "#fff", - formatter: "{a}" - } - } - }, - } - }, tableHeight: 100, speed: 2000, time: null, @@ -507,7 +364,8 @@ export default { data:[] }, config_left1:{ - data:[] + data:[], + showValue: true } , config_left2:{ data:[] @@ -562,8 +420,10 @@ export default { that.start_date = year + "-" + month + "-01"; that.end_date = year + "-" + month + "-" + days; that.materialAll(); - that.barOption.yAxis.data=[]; - that.barOption.series.data=[]; + that.getmgroupMaterial(that.deptName1); + that.getmgroupMaterial(that.deptName2); + that.getmgroupMaterial(that.deptName3); + that.getmgroupMaterial(that.deptName4); that.getMgroups(that.deptName1); that.getMgroups(that.deptName2); that.getMgroups(that.deptName3); @@ -587,7 +447,7 @@ export default { top = top.substring(0,top.length-2); let topNumber = Number(top); let newTop = 0; - if(topNumber <= -85){ + if(topNumber <= -90){ newTop = 0; }else{ newTop =Number(top)-2.5; @@ -641,11 +501,7 @@ export default { that.mgroupsId += item.id + ','; //车间库存 that.getInms(item); - that.barOption2.yAxis[0].data.push(item.name); - that.barOption2.yAxis[1].data.push(0); - that.barOption2.series[0].data.push(0); - that.barOption2.series[1].data.push(0); - that.getmgroupMaterial(item.name); + // that.getmgroupMaterial(item.name); }) } }); @@ -669,26 +525,20 @@ export default { }) }, //车间各工段生产产品数 - getmgroupMaterial(mgroupName) { + getmgroupMaterial(deptName) { let that = this; let params = { - query: {start_date:that.start_date,end_date:that.end_date,mgroup_name:mgroupName} + query: {start_date:that.start_date,end_date:that.end_date,dept_name:deptName} }; this.$API.bi.dataset.exec.req("mlog_okrate", params).then((res) => { if(res.data2.ds0.length>0){ let data = res.data2.ds0; - data.forEach((item) => { - // that.barOption2.yAxis[0].data.push(item.name); - let index2 = that.barOption2.yAxis[0].data.indexOf(mgroupName); - that.barOption2.yAxis[1].data[index2] = item.合格数; - that.barOption2.series[0].data[index2] = item.合格数; + data.forEach((item)=>{ + let obj = {}; + obj.name = item.工段; + obj.value = item.合格数; + that.config_left1.data.push(obj); }) - let maxNum = that.barOption2.series[0].data.sort((a, b) => b - a)[0]+2; - let arr = []; - that.barOption2.series[1].data.forEach((item)=>{ - arr.push(maxNum) - }) - that.barOption2.series[1].data = arr; } }); }, diff --git a/src/views/bigScreen/bxerp/niuzhuandept.vue b/src/views/bigScreen/bxerp/niuzhuandept.vue index b11900cb..458a5b3f 100644 --- a/src/views/bigScreen/bxerp/niuzhuandept.vue +++ b/src/views/bigScreen/bxerp/niuzhuandept.vue @@ -317,11 +317,16 @@ export default { yAxisIndex: 0, barCategoryGap: 50, barWidth: 10, + label: { + show: true, + position: "right", + color: "#fff", + }, itemStyle: { normal: { barBorderRadius: 5, color: function (params) { - return myColor[params.dataIndex]; + return myColor[params.dataIndex%5]; } }, label: { @@ -382,7 +387,8 @@ export default { data:[] }, config_left1:{ - data:[] + data:[], + showValue: true } , config_left2:{ data:[] diff --git a/src/views/bigScreen/bxerp/reyadept.vue b/src/views/bigScreen/bxerp/reyadept.vue index d2f3246f..e05a1db0 100644 --- a/src/views/bigScreen/bxerp/reyadept.vue +++ b/src/views/bigScreen/bxerp/reyadept.vue @@ -317,11 +317,16 @@ export default { yAxisIndex: 0, barCategoryGap: 50, barWidth: 10, + label: { + show: true, + position: "right", + color: "#fff", + }, itemStyle: { normal: { barBorderRadius: 5, color: function (params) { - return myColor[params.dataIndex]; + return myColor[params.dataIndex%5]; } }, label: { @@ -382,7 +387,8 @@ export default { data:[] }, config_left1:{ - data:[] + data:[], + showValue: true } , config_left2:{ data:[] From f90e9524f155a4517709a7886fe38bc480b81852 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Jul 2025 13:33:58 +0800 Subject: [PATCH 36/83] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=B7=A6=E4=B8=8A=E8=A7=92=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_gx.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue index 435257ee..d20ca728 100644 --- a/src/views/bigScreen/index_gx.vue +++ b/src/views/bigScreen/index_gx.vue @@ -3,7 +3,8 @@
{{ bigScreenName }}
- {{ currentYear }}年{{ currentMonth }}月{{ currentDay }}日{{currentWeek}} + + {{ currentDate }}{{currentWeek}}
{{ currentTime }} @@ -617,6 +618,10 @@ export default { that.getTaskNumber(); that.getArticles(); that.getpurinrate(); + let nowDate = new Date(); + that.currentYear = nowDate.getFullYear(); + that.currentMonth = nowDate.getMonth() + 1; + that.currentDay = nowDate.getDate(); }, 300000); }, //获取公告和视频 From 3506255b92661d0d5bed2a136da63ce294e09422 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 25 Jul 2025 13:35:42 +0800 Subject: [PATCH 37/83] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=B7=A6=E4=B8=8A=E8=A7=92=E4=BB=BB=E5=8A=A1=E4=BA=A7=E9=87=8F?= =?UTF-8?q?=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_gx.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue index d20ca728..dfa96078 100644 --- a/src/views/bigScreen/index_gx.vue +++ b/src/views/bigScreen/index_gx.vue @@ -41,7 +41,7 @@
- 日产量 + 今日产量 {{ count_day }}
@@ -49,7 +49,7 @@
- 周产量 + 本周产量 {{ count_week }}
@@ -57,7 +57,7 @@
- 月产量 + 本月产量 {{ count_month }}
From 29546b71e7a69bb5c9ab54f0d57bdea1d1ae83ad Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 25 Jul 2025 13:37:40 +0800 Subject: [PATCH 38/83] =?UTF-8?q?fix:xtSelect=E4=B8=ADcount=5Fcanhandover?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=A4=A7=E4=BA=8E=E9=9B=B6=E6=89=8D=E8=83=BD?= =?UTF-8?q?=E8=A2=AB=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/xtSelect/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/xtSelect/index.vue b/src/components/xtSelect/index.vue index 8b47e54d..c6cd0080 100644 --- a/src/components/xtSelect/index.vue +++ b/src/components/xtSelect/index.vue @@ -56,6 +56,7 @@ v-if="multiple" type="selection" width="40" + :selectable="selectable" :reserve-selection="true" > @@ -89,7 +90,7 @@ const props = defineProps({ }); const emit = defineEmits(["update:modelValue", "update:obj", "update:label", "change"]); - +const selectable = (row) => row.count_canhandover?row.count_canhandover>0:true; // 控制 popover 显示与隐藏的状态 const showPopover = ref(false); const inputRef = ref(); From 6696bf3f9a80b2dbe05e5744ecd8d11e747f0ca6 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 25 Jul 2025 13:38:18 +0800 Subject: [PATCH 39/83] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E9=9B=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bi/dataset.vue | 5 +++++ src/views/bi/dataset_form.vue | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/bi/dataset.vue b/src/views/bi/dataset.vue index d8b8587f..0e90b76f 100644 --- a/src/views/bi/dataset.vue +++ b/src/views/bi/dataset.vue @@ -18,6 +18,11 @@ + + + diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue index a519a763..55d75691 100644 --- a/src/views/mtm/materials_form_gx.vue +++ b/src/views/mtm/materials_form_gx.vue @@ -49,6 +49,23 @@ /> + + + + + + + - + - + @@ -139,23 +154,26 @@ - - - - - + + + + + + + + + + - 保存 + 保存 取消 @@ -189,6 +207,13 @@ export default { trigger: "blur", }, ], + cate: [ + { + required: true, + message: "请选择辅料类别", + trigger: "blur", + }, + ], number: [ { required: true, @@ -220,6 +245,7 @@ export default { { id: 30, name: "主要原料" }, // { id: 40, name: "辅助材料" }, ], + cateOptions: ['主要辅材','办公辅料','设备维护辅料','包装辅材','标识辅材','防护辅材','其他辅材'], handle_user: [], selectionFilters: [], materialOptions: [], From cb0c6cfadbdd983bcdcff6224b30e30ded998fb8 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 25 Jul 2025 13:40:42 +0800 Subject: [PATCH 41/83] =?UTF-8?q?fix:=E9=80=80=E7=81=AB=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=AE=A1=E6=89=B9=EF=BC=8C=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wf/ticketdetail.vue | 46 +++++- src/views/wpm_gx/handover_form.vue | 67 ++++++++- src/views/wpm_gx/mlog_detail.vue | 217 +++++------------------------ 3 files changed, 143 insertions(+), 187 deletions(-) diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue index eaf9256f..740bb269 100644 --- a/src/views/wf/ticketdetail.vue +++ b/src/views/wf/ticketdetail.vue @@ -103,7 +103,7 @@ @@ -209,6 +209,36 @@ + + + + {{handoverItem.send_dept_name}} + + + {{ handoverItem.send_mgroup_name }} + + + {{handoverItem.recive_dept_name}} + + + {{ handoverItem.recive_mgroup_name }} + + + + + {{item.batch}} + + + {{ item.count }} + + + 交接文件： + {{ticketDetail.test_file}} + { + that.handoverItem = res1; + that.ticketDetail.routepack_name = res1.routepack_name; + that.ticketDetail.handoverb = res1.handoverb; + that.ticketDetail.material_in_name = res1.material_in_name; + that.ticketDetail.material_out_name = res1.material_out_name; + that.ticketDetail.handle_user_name = res1.handle_user_name; + that.ticketDetail.test_file = res1.oinfo_json.test_file; + }) + } if (this.ticketDetail.state_.key == "opl_close") { // 如果是作业关闭,展示需要提交的表单 this.getCloseDos(); diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index 188e20a1..b443d227 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -176,10 +176,34 @@ + + + + + + + - - 确定 + + + 确定 取消 @@ -237,6 +261,7 @@ export default { recive_mgroup: null, handoverb:[], }, + initForm:{}, selectObjIds:[], apiObjM:null, paramsM:{}, @@ -294,7 +319,9 @@ export default { listParams:{}, totalCount: 0, deptID:'', + route_code:'', codeText: "", + fileList:[], userList: [], userList2: [], mgroupOptions: [], @@ -314,6 +341,7 @@ export default { that.materialObj = materialObj; that.form.handle_date = that.form.send_date = this.$TOOL.dateFormat2(new Date()); that.form.send_mgroup = that.mgroupId; + that.route_code = that.$route.path.split("/")[2]; //type 10:正常交接 ；20:返工交接 ；40:报废交接 //mtype 10:正常交接 ；20:分批操作 ；30:合批操作 //获取交接人员 @@ -347,8 +375,19 @@ export default { }else{ that.getMgroupOptions(); } + if(that.route_code=='tuihuo'){ + that.getInit(); + } }, methods: { + //渲染工单提交按钮 + getInit() { + let that = this; + that.$API.wf.workflow.initkey.req(" backfire").then((res) => { + that.initForm = res; + let transitions = res.transitions; + }); + }, //获取工段列表 getMgroupOptions() { let that = this; @@ -499,6 +538,30 @@ export default { that.totalCount = totalCount; } }, + fileUPSuccess(res) { + this.test_file = res.path; + }, + //提交退火交接单信息,创建工单 + submitTicketCreate(id) { + let that = this; + that.form.oinfo_json = {}; + that.form.oinfo_json.test_file = that.test_file; + that.$API.wpm.handover.create.req(that.form).then((res) => { + let ticket = {}; + that.isSaveing = true; + ticket.title = '退火交接审批单'; + ticket.workflow = that.initForm.workflow; + ticket.ticket_data = {t_id: res.id}; + ticket.transition = id; + that.$API.wf.ticket.create.req(ticket).then((res) => { + that.isSaveing = false; + that.visible = false; + that.$message.success("提交成功"); + }).catch((e) => { + that.isSaveing = false; + }); + }); + }, //提交 submit() { let that = this; diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index 408fb848..bb432d11 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -48,17 +48,14 @@ {{ mlogItem.work_end_time }} - - {{act_states[mlogItem.ticket_.act_state]}} - - + {{mlogItem.test_file}}
提交 - - 放行审批
@@ -311,30 +301,6 @@ - - - - - - - - - - - - - - min - - - - - - °C - - - - - - - - - - - - - - - - - - - - ：退火后直径23.5±0.2；黑圈内径：5.9±0.1；外径7.6-7.77 - - - - - - - - - @@ -535,14 +417,6 @@ export default { count_use: 0, count_pn_jgqbl: 0, }, - oinfo_json:{ - 退火炉号:'', - 退火时间:'', - 退火温度:'', - 抽检结果:'', - 抽检数:'', - 强度落球:'', - }, act_states: { 0: "草稿中", 1: "进行中", @@ -568,7 +442,7 @@ export default { mlogbdefect:[], mlogboutdefect:[], saveInDialog: false, - ticketDialog:false, + // ticketDialog:false, printVisible:false, setFiltersVisible: false, rules: { @@ -593,7 +467,7 @@ export default { this.paramsIn.mlog = this.mlogId; this.paramsOut.mlog = this.mlogId; this.apiObj = this.$API.wpm.mlogb.list; - this.getInit(); + // this.getInit(); that.$API.wpm.mlogb.list.req(that.paramsIn).then((res) => { that.tableData = res; }) @@ -632,7 +506,6 @@ export default { }) }); }, - getdefects(){ let that = this; that.$API.qm.qct.list.req({qctmat__material:that.mlogItem.material_in,page:0,tags:'process'}).then((res) => { @@ -651,7 +524,6 @@ export default { }) } }) - }, countChange() { let that = this; @@ -661,7 +533,6 @@ export default { that.saveInForm.count_pn_jgqbl += that.defectinform[item.defect_name]; } }) - // that.countCellChanges(); }, //表单注入数据 setData(data) { @@ -675,9 +546,6 @@ export default { this.$refs.editDialog.open("edit").setData(this.mlogItem); }); }, - // mlogUpdate(data) { - // this.$refs.editDialog.open().setData(data); - // }, table_add() { this.dialog.save = true; this.$nextTick(() => { @@ -698,7 +566,6 @@ export default { that.saveInDialog = true; } }, - //提交自检 saveInSubmit() { let that = this; @@ -752,7 +619,6 @@ export default { that.$refs.checkDialog.open(obj); }); }, - //表单提交方法 mlogSubmit() { let that = this; @@ -762,50 +628,35 @@ export default { that.$message.success("操作成功"); }); }, - //渲染工单提交按钮 - getInit() { - let that = this; - that.$API.wf.workflow.initkey.req(" backfire").then((res) => { - that.initForm = res; - }); - }, - //填写退火放行单信息 - createTicket(){ - if(this.mlogItem.work_end_time==null){ - this.$message.error("请先编辑日志并选择结束时间"); - }else{ - let sum = 0; - this.mlogItem.reminder_interval_list.forEach(item => { - sum+=item; - }); - this.oinfo_json.退火时间 = sum; - this.oinfo_json.退火炉号 =this.mlogItem.equipment_name!==null?this.mlogItem.equipment_name.split("|")[0]:''; - this.ticketDialog = true; - } - }, - //提交退火放行单信息,创建工单 - submitTicketCreate(id) { - let that = this; - let obj = {}; - obj.oinfo_json = that.oinfo_json; - obj.test_file = that.test_file; - that.$API.wpm.mlog.change.req(that.mlogItem.id, obj).then((res) => { - let ticket = {}; - that.isSaveing = true; - ticket.title = '退火放行审批单'; - ticket.workflow = that.initForm.workflow; - ticket.ticket_data = {t_id: that.mlogItem.id}; - ticket.transition = id; - that.$API.wf.ticket.create.req(ticket).then((res) => { - that.isSaveing = false; - that.ticketDialog = false; - that.visible = false; - that.$message.success("提交成功"); - }).catch((e) => { - that.isSaveing = false; - }); - }); - }, + // //渲染工单提交按钮 + // getInit() { + // let that = this; + // that.$API.wf.workflow.initkey.req(" backfire").then((res) => { + // that.initForm = res; + // }); + // }, + // //提交退火放行单信息,创建工单 + // submitTicketCreate(id) { + // let that = this; + // let obj = {}; + // obj.test_file = that.test_file; + // that.$API.wpm.mlog.change.req(that.mlogItem.id, obj).then((res) => { + // let ticket = {}; + // that.isSaveing = true; + // ticket.title = '退火放行审批单'; + // ticket.workflow = that.initForm.workflow; + // ticket.ticket_data = {t_id: that.mlogItem.id}; + // ticket.transition = id; + // that.$API.wf.ticket.create.req(ticket).then((res) => { + // that.isSaveing = false; + // that.ticketDialog = false; + // that.visible = false; + // that.$message.success("提交成功"); + // }).catch((e) => { + // that.isSaveing = false; + // }); + // }); + // }, codeTextChange(codeText){ this.codeText = codeText; this.dialog.save = true; From cb77e8fc9772d424a3efb961ef46e30f24ac39e4 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 25 Jul 2025 15:31:43 +0800 Subject: [PATCH 42/83] =?UTF-8?q?fix:=E8=BE=85=E6=96=99=E5=BA=93=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E9=80=80?= =?UTF-8?q?=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/helpso_mio.vue | 11 +++++++++-- src/views/inm/mioitem_form.vue | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/views/inm/helpso_mio.vue b/src/views/inm/helpso_mio.vue index 1f8cb145..e0cb812e 100644 --- a/src/views/inm/helpso_mio.vue +++ b/src/views/inm/helpso_mio.vue @@ -14,6 +14,12 @@ v-auth="'mio.pur'" >采购入库 + 退货 - + Date: Fri, 25 Jul 2025 17:02:09 +0800 Subject: [PATCH 43/83] =?UTF-8?q?fix:=E9=80=80=E7=81=AB=E4=BA=A4=E6=8E=A5?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/handover.vue | 6 +++--- src/views/wpm_gx/handover_form.vue | 25 ++++++++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue index 0060493c..18d1a561 100644 --- a/src/views/wpm_gx/handover.vue +++ b/src/views/wpm_gx/handover.vue @@ -178,7 +178,7 @@ size="small" @click="table_receive(scope.row)" type="primary" - v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time == null" + v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time == null&&(scope.row.ticket == null||(scope.row.ticket_&&scope.row.ticket_.state_&&scope.row.ticket_.state_.type== 2))" >接收 编辑 @@ -218,7 +218,7 @@ title="确定删除吗？" v-if=" (scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&& - scope.row.submit_time == null + scope.row.submit_time == null&&(scope.row.ticket == null||(scope.row.ticket_&&scope.row.ticket_.state_&&scope.row.ticket_.state_.type!== 0)) " @confirm="table_del(scope.row, scope.$index)" > diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index b443d227..b76b8913 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -192,9 +192,9 @@ - - + - + @@ -337,7 +338,12 @@ export default { mio_user: "", }, stateDict: {10: "创建中",20: "已提交",}, - typeDict:{'do_in':'生产入库','do_out':'生产领料'}, + typeDict:{ + 'do_in':'生产入库', + 'do_out':'生产领料', + 'borrow_out': "领用出库", + 'return_in': "退还入库" + }, apiworkerObj: null, materials: [], apiObj: null, @@ -362,6 +368,7 @@ export default { }; }, mounted() { + this.active = 0; this.isSaveing = false; this.form.mgroup = this.mgroupId; this.form.type = this.cate; @@ -413,6 +420,7 @@ export default { //车间人员 getDeptUsers() { let that = this; + that.userList = []; let userInfo = that.$TOOL.data.get("USER_INFO"); that.$API.system.user.list.req({ depts: that.deptId, page: 0 }).then((res) => { that.userOptions = res; diff --git a/src/views/wpm_gx/inm_record_form.vue b/src/views/wpm_gx/inm_record_form.vue index 54cc9fe2..e8ba3213 100644 --- a/src/views/wpm_gx/inm_record_form.vue +++ b/src/views/wpm_gx/inm_record_form.vue @@ -12,182 +12,273 @@ :rules="rules" label-width="120px" > - - - + + - {{ item.full_name }} - 隐 - - - - - - - {{item.material_.name}}|{{ item.batch }} - {{ item.defect_name }} - {{ item.count }} - - - - - - - - - - - {{ item.batch }} - {{ item.count }} -- {{ item.warehouse_name }} - - - - - - -