From f3e83de73fe034ba90b5c42b1948dbe3e65776b7 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 13 Nov 2025 11:09:09 +0800 Subject: [PATCH 01/33] =?UTF-8?q?fix:=E5=BA=93=E5=AD=98=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/stock_statistics.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue index e4f80cb1..c410c3da 100644 --- a/src/views/statistics/stock_statistics.vue +++ b/src/views/statistics/stock_statistics.vue @@ -98,7 +98,7 @@ :filters="specsFilters11" :filter-method="filterSpecs11" filter-placement="bottom-end"/> - + @@ -209,14 +220,23 @@ export default { methods: { getWfOptions() { let permissions = this.$TOOL.data.get("PERMISSIONS"); + const groups = {}; this.$API.wf.workflow.list.req({ page: 0 }).then((res) => { - let wfOptions = []; res.forEach((item) => { if(item.key && permissions.includes(item.key)) { - wfOptions.push(item) + let cate = item.cate; + if (!cate){cate="未分组"} + if (!groups[cate]) { + groups[cate] = []; + } + groups[cate].push(item); } }) - this.wfOptions = wfOptions; + // 转换为数组形式，便于模板遍历 + this.wfOptions = Object.keys(groups).map(category => ({ + category, + items: groups[category] + })); }); }, reStart(row) { diff --git a/src/views/wf/workflow.vue b/src/views/wf/workflow.vue index 1d62807d..a133cfae 100644 --- a/src/views/wf/workflow.vue +++ b/src/views/wf/workflow.vue @@ -38,6 +38,11 @@ prop="name" width="220" > + + + + From 0567d98b932dbbaab32709ff706899a9d0add091 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 18 Nov 2025 11:24:58 +0800 Subject: [PATCH 28/33] =?UTF-8?q?feat:=20base=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=88=86=E7=BB=84select?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/wf.js | 7 +++++++ src/views/wf/workflow.vue | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/api/model/wf.js b/src/api/model/wf.js index 0bd01bb7..dc51f6a8 100644 --- a/src/api/model/wf.js +++ b/src/api/model/wf.js @@ -10,6 +10,13 @@ export default { return await http.get(this.url, data); } }, + cates: { + url: `${config.API_URL}/wf/workflow/cates/`, + name: "工作流分类", + req: async function(data){ + return await http.get(this.url, data); + } + }, item: { name: "工作流详情", req: async function(id){ diff --git a/src/views/wf/workflow.vue b/src/views/wf/workflow.vue index a133cfae..769fe8dc 100644 --- a/src/views/wf/workflow.vue +++ b/src/views/wf/workflow.vue @@ -12,6 +12,15 @@ @click="batch_del" v-auth="'workflow.delete'"> -->
+ + + { + this.wfCateOptions = res + }) + }, + submitHandle() { let that = this; this.$refs.addForm.validate((valid) => { From 2d64e3baebdaa147bcfe79455d7d4267fef411b7 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 18 Nov 2025 13:41:24 +0800 Subject: [PATCH 29/33] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E6=B2=A1=E6=9C=89=E5=B8=A6?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check_table.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index cb5b9181..6f4b74f5 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -812,6 +812,7 @@ export default { that.equipmentOptions.forEach(item => { if(item.id == that.form.equipment){ that.form.equipment_name = item.name; + that.setForm.equipment_name = item.name; that.form.cd_req_addr = that.setForm.cd_req_addr = item.cd_req_addr; } }); From 98e610113c322069e6127b968095fa224fff2348 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 19 Nov 2025 09:06:10 +0800 Subject: [PATCH 30/33] =?UTF-8?q?feat:=E4=B8=8A=E7=9B=98=E5=B9=B3=E9=AD=94?= =?UTF-8?q?=E5=90=88=E6=89=B9=E6=97=B6=EF=BC=8Chandoverbw=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=A0=BC=E5=BC=8F=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form.vue | 42 +++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index a7224b5d..db96c0f7 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -96,7 +96,7 @@ controls-position="right" :min="0" :step="1" - :max="listItem.count_canhandover" + :max="Number(listItem.count_canhandover)" :disabled="mode==='show'||listItem.tracking==20" :step-strictly="true" style="width: 100%" @@ -110,15 +110,23 @@ - + -
- {{ item2.number }} - 删除 -
+ + + @@ -343,6 +351,7 @@ export default { is_hidde:true, }, wm_in:"", + route_code: "", materials:[], totalCount: 0, deptID:'', @@ -369,6 +378,8 @@ export default { that.form.mtype=30; that.change_batch = true; } + let arr = that.$route.path.split("/"); + that.route_code = arr[2]; let materialObj = that.$TOOL.data.get("MATERIAL_OBJECT"); that.materialObj = materialObj; that.form.handle_date =that.form.send_date =this.$TOOL.dateFormat2(new Date()); @@ -641,12 +652,18 @@ export default { res.forEach(wpritem=>{ let obj = {}; obj.wpr = wpritem.id; + obj.checked = true; obj.number = wpritem.number; handoverbw.push(obj); }) that.form.handoverb[index].handoverbw = handoverbw; }) }, + handleChange(index){ + let trueCount = this.form.handoverb[index].handoverbw.filter(item => item.checked === true).length; + this.form.handoverb[index].count = trueCount; + this.countChange(); + }, countChange(){ let that = this; let totalCount = 0; @@ -677,6 +694,17 @@ export default { that.form.recive_mgroup = that.form.send_mgroup; } that.form.mtype=that.mtype; + if(that.route_code=='shangpaipingmo'){ + that.form.handoverb.forEach(item=>{ + let handoverbw = []; + item.handoverbw.forEach(item1=>{ + if(item1.checked){ + handoverbw.push(item1); + } + }) + item.handoverbw = handoverbw; + }) + } //合批、分批、报废，这三个交接操作直接创建并提交 if(that.mtype==20||that.mtype==30||that.type==40){ that.$API.wpm.handover.createsubmit.req(that.form).then((res) => { From 10d651956858e68598831caa9d872a41238758fc Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 19 Nov 2025 09:07:50 +0800 Subject: [PATCH 31/33] =?UTF-8?q?feat:=E5=88=86=E6=89=B9=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=9D=BF=E6=AE=B5=E5=8F=B7=E8=BF=9B=E5=8E=BB?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=B0=86=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E6=9C=AC=E6=89=B9=E6=AC=A1=E7=9A=84=E5=8F=B7=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form2.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/handover_form2.vue b/src/views/wpm_bx/handover_form2.vue index 993d710e..d6d2c92b 100644 --- a/src/views/wpm_bx/handover_form2.vue +++ b/src/views/wpm_bx/handover_form2.vue @@ -209,8 +209,8 @@ export default { }, formWminChange(index,number){ let that = this; - // console.log('number',number.split(" ")); let arrs = number.split(" "); + let barchArrs = []; that.form.handoverb[index].wm_in = ""; if(arrs.length>1){ that.form.handoverb[index].wpr = ''; @@ -221,12 +221,17 @@ export default { let obj = {}; obj.number = item.number; obj.wpr = item.id; + barchArrs.push(arr); that.form.handoverb[index].handoverbw.push(obj); that.form.handoverb[index].count = that.form.handoverb[index].handoverbw.length; } }) }) - + //如果arrs里有不是这个批次的wpr,提示错误 + let diff = arrs.filter(item => !barchArrs.includes(item)); + if(diff.length>0){ + that.$confirm("物料"+diff.join(",")+"不在该批次中", "提示", {type: "warning",}).then(() => {}); + } }else{ //放入对应的行中的handoverb中，并且在列表中disabled that.wprOptions.forEach(item=>{ From 5718e20d7aaf7b989fb7e192b8c21c60cd8d53dd Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 19 Nov 2025 10:14:18 +0800 Subject: [PATCH 32/33] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=A4=96=E5=BE=84=E5=8F=91=E8=B4=A7=E7=89=87?= =?UTF-8?q?(B)=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/good_check_gx.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue index 9ba3e29f..5c8ad9e3 100644 --- a/src/views/statistics/good_check_gx.vue +++ b/src/views/statistics/good_check_gx.vue @@ -152,7 +152,7 @@ - + From 6186f8b2f89d627dff80576ec66c4f8904d79ed1 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 19 Nov 2025 11:08:54 +0800 Subject: [PATCH 33/33] =?UTF-8?q?feat:=E5=85=89=E8=8A=AF=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=85=B6=E4=BB=96=E8=BD=A6=E9=97=B4=E7=9C=8B?= =?UTF-8?q?=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/gxerp/index_daojiao.vue | 2 +- .../bigScreen/gxerp/index_duoxianqie.vue | 2 +- src/views/bigScreen/gxerp/index_jingdiao.vue | 2 +- src/views/bigScreen/gxerp/index_mopao.vue | 2 +- src/views/bigScreen/gxerp/index_saobian.vue | 44 ------------------- 5 files changed, 4 insertions(+), 48 deletions(-) diff --git a/src/views/bigScreen/gxerp/index_daojiao.vue b/src/views/bigScreen/gxerp/index_daojiao.vue index e60e8cab..9193611f 100644 --- a/src/views/bigScreen/gxerp/index_daojiao.vue +++ b/src/views/bigScreen/gxerp/index_daojiao.vue @@ -518,7 +518,7 @@ export default { //库存统计列表 getMaterials(page) { let that = this; - that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'倒角A,倒角B' }).then((res) => { + that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'倒角' }).then((res) => { if(res.results.length>0){ res.results.forEach((item) => { let arr = []; diff --git a/src/views/bigScreen/gxerp/index_duoxianqie.vue b/src/views/bigScreen/gxerp/index_duoxianqie.vue index 186fb101..0008ad5b 100644 --- a/src/views/bigScreen/gxerp/index_duoxianqie.vue +++ b/src/views/bigScreen/gxerp/index_duoxianqie.vue @@ -519,7 +519,7 @@ export default { //库存统计列表 getMaterials(page) { let that = this; - that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'减薄A,减薄B' }).then((res) => { + that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'多线切' }).then((res) => { if(res.results.length>0){ res.results.forEach((item) => { let arr = []; diff --git a/src/views/bigScreen/gxerp/index_jingdiao.vue b/src/views/bigScreen/gxerp/index_jingdiao.vue index 8679487c..0d6421f1 100644 --- a/src/views/bigScreen/gxerp/index_jingdiao.vue +++ b/src/views/bigScreen/gxerp/index_jingdiao.vue @@ -518,7 +518,7 @@ export default { //库存统计列表 getMaterials(page) { let that = this; - that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'减薄A,减薄B' }).then((res) => { + that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'精雕' }).then((res) => { if(res.results.length>0){ res.results.forEach((item) => { let arr = []; diff --git a/src/views/bigScreen/gxerp/index_mopao.vue b/src/views/bigScreen/gxerp/index_mopao.vue index df7dfa3c..38c4a47b 100644 --- a/src/views/bigScreen/gxerp/index_mopao.vue +++ b/src/views/bigScreen/gxerp/index_mopao.vue @@ -518,7 +518,7 @@ export default { //库存统计列表 getMaterials(page) { let that = this; - that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'减薄A,减薄B' }).then((res) => { + that.$API.wpm.wmaterial.list.req({ page: page,page_size:500,mgroup__name__in:'白片抛后超洗,平磨,磨抛一次抛,一次抛后超洗,成品抛,一次超洗,二次超洗,三次超洗' }).then((res) => { if(res.results.length>0){ res.results.forEach((item) => { let arr = []; diff --git a/src/views/bigScreen/gxerp/index_saobian.vue b/src/views/bigScreen/gxerp/index_saobian.vue index 5b18bfa9..e7beefd4 100644 --- a/src/views/bigScreen/gxerp/index_saobian.vue +++ b/src/views/bigScreen/gxerp/index_saobian.vue @@ -259,13 +259,6 @@ export default { data:[], waitTime:1000, }, - //交接记录 - configDataHandover:{ - headerBGC:'#0a3f44', - header:['物料','数量','交接类型','交接类别','交接日期'], - headerHeight:40, - data:[] - }, //设备 configDataEq:{ headerBGC:'#0a3f44', @@ -312,7 +305,6 @@ export default { that.daysList.push(dayitem); }) that.today = new Date().toISOString().split('T')[0] - // console.log('new Date', new Date().toISOString().split('T')) this.xAxisData = xAxisData; let startDate = new Date(daysArr[0]).getTime()-(1000*60*60*24); let endDate = new Date(daysArr[6]).getTime()+(1000*60*60*24); @@ -324,19 +316,12 @@ export default { this.$API.mtm.mgroup.list.req({page:0,belong_dept__name:'扫边车间'}).then((res) => { that.mgroups = res; that.configDataEq.data = []; - that.configDataHandover.data = []; res.forEach((item)=>{ //设备数据 that.getEqState(item.id); - //库存统计 - // this.getMaterials(item.id); - //交接列表 - // this.getHandover(item.id); }) }) this.getMaterials(that.page); - //任务进度 - // this.getMtask(); //投产/生产分析 this.getProductLine(); this.getCountnotok(); @@ -530,35 +515,6 @@ export default { } }); }, - //交接列表 - getHandover(id) { - let that = this; - let obj = {}; - obj.mgroup = id; - obj.page = 0; - obj.send_date = - that.$API.wpm.handover.list.req(obj).then((res) => { - res.forEach((item) => { - let arr = []; - arr[0] = item.material_name; - arr[1] = item.count; - arr[2] = item.material_out_.model; - if(item.state==10){ - arr[3]='正常'; - }else if(item.state==20){ - arr[3]='返工'; - }else if(item.state==30){ - arr[3]='检验'; - }else if(item.state==40){ - arr[3]='报废'; - } - arr[4] = item.send_user_name; - arr[5] = item.recive_user_name; - arr[6] = item.send_date; - that.configDataHandover.data.push(arr); - }); - }); - }, //库存统计列表 getMaterials(page) { let that = this;