From a6ac97a906406959615b8527cd065fe4148d4d25 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Dec 2025 14:15:16 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=E5=B7=A5=E5=BA=8F=E5=B8=A6=E6=9D=BF?= =?UTF-8?q?=E6=AE=B5=E5=8F=B7=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=87=E7=89=87=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 6 ++++-- src/views/wpm_bx/inmOut.vue | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 63331af3..7df7f0d0 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -557,9 +557,10 @@ export default { params.tid = row.id; let materialname = row.material_.name + '|' + row.material_.process_name; let specification = row.material_.specification; - if(that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){ + if(that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='tuomoceliang'){ params.label_template_name = '工序带板段号打印模板'; that.wprParams.wm = row.id; + let totalcount = 0; let numbers = ['','','','','','','']; this.$API.wpm.wpr.list.req(that.wprParams).then((res) => { let leng = res.length; @@ -571,6 +572,7 @@ export default { } } if(leng>0){ + totalcount = leng*slice_count; let nums = leng/3; for(let i=0;i { let obj = {}; obj.printer_commands = res.commands; diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index 6d75e000..1da2472c 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -586,10 +586,11 @@ export default { params.tid = row.id; let materialname = row.material_.name + '|' + row.material_.process_name; let specification = row.material_.specification; - if(that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'){ + if(that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='tuomoceliang'){ console.log('route_code',that.route_code); params.label_template_name = '工序带板段号打印模板'; that.wprParams.wm = row.id; + let totalcount = 0; let numbers = ['','','','','','','']; this.$API.wpm.wpr.list.req(that.wprParams).then((res) => { let leng = res.length; @@ -601,6 +602,7 @@ export default { } } if(leng>0){ + totalcount = leng*slice_count; let nums = leng/3; for(let i=0;i { let obj = {}; obj.printer_commands = res.commands; From 8142fbf43a84bb227f0060a50857108fd8aeafc3 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Dec 2025 14:15:52 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=E6=9C=AA=E5=AE=9A=E4=B9=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_form.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index 73f4385e..26582ebb 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -284,6 +284,7 @@ export default { type: "do_in", loading: false, mode: "add", + query: {}, titleMap: { do_out: "生产领料", sale_out: "销售发货", From c59c15167df5768baef58898339a42a90eb524b0 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Dec 2025 14:16:18 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=9F=E5=93=81?= =?UTF-8?q?=E5=BA=93=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/inmScrap.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/inm/inmScrap.vue b/src/views/inm/inmScrap.vue index 1c14032d..3faff3aa 100644 --- a/src/views/inm/inmScrap.vue +++ b/src/views/inm/inmScrap.vue @@ -110,7 +110,7 @@ export default { wmState, apiObj: null, params: { - state : 50, + state : 10, state_all: 1 }, dialog: { @@ -128,7 +128,7 @@ export default { let that = this; that.route_code = that.$route.path.split("/")[2]; if(that.route_code=='scrap'){ - that.params.material__type__in = 30; + that.params.material__type = 30; } that.apiObj = that.$API.wpm.wmaterial.list; that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => { From 46acc0af45646e3df7e9907b6466f483106467a7 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Dec 2025 17:06:03 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0Cesium.Ion.defaultAcc?= =?UTF-8?q?essToken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/cesiumtest.vue | 4 ++-- src/views/bigScreen/cesiumtest_ly.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue index a0318585..cd56da67 100644 --- a/src/views/bigScreen/cesiumtest.vue +++ b/src/views/bigScreen/cesiumtest.vue @@ -278,8 +278,8 @@ const loadCesium = async () => { if (Cesium) return; await import("cesium/Build/Cesium/Widgets/widgets.css"); Cesium = await import('cesium'); - Cesium.Ion.defaultAccessToken = - "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw"; + Cesium.Ion.defaultAccessToken ="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmMmNmMzhhOS0yMzI2LTQ4M2UtYjg2ZS0zZTM0ZWFlZDQ4MWQiLCJpZCI6MjAxODA0LCJpYXQiOjE3NjUxODMyNzR9.lJJBP_YxrRN8CngWtPQLnNhfk0NQGuBfxRsMW1mtAyk"; + // "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw"; } export default { name: "cesium", diff --git a/src/views/bigScreen/cesiumtest_ly.vue b/src/views/bigScreen/cesiumtest_ly.vue index 00b66d2c..187d6dbd 100644 --- a/src/views/bigScreen/cesiumtest_ly.vue +++ b/src/views/bigScreen/cesiumtest_ly.vue @@ -433,9 +433,9 @@ export default { }, mounted() { let that = this; - Cesium.Ion.defaultAccessToken = - "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw"; - + Cesium.Ion.defaultAccessToken ="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmMmNmMzhhOS0yMzI2LTQ4M2UtYjg2ZS0zZTM0ZWFlZDQ4MWQiLCJpZCI6MjAxODA0LCJpYXQiOjE3NjUxODMyNzR9.lJJBP_YxrRN8CngWtPQLnNhfk0NQGuBfxRsMW1mtAyk"; + // "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw"; + const viewer = new Cesium.Viewer("cesiumContainer", { animation: false, //动画小部件 baseLayerPicker: false, //地图图层组件 From c6110dd4894fc29f99d47e47abb4277062ae157e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 9 Dec 2025 15:39:18 +0800 Subject: [PATCH 5/9] =?UTF-8?q?feat:=20cesium=20token=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/cesiumtest.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue index a0318585..7e4868a0 100644 --- a/src/views/bigScreen/cesiumtest.vue +++ b/src/views/bigScreen/cesiumtest.vue @@ -279,7 +279,7 @@ const loadCesium = async () => { await import("cesium/Build/Cesium/Widgets/widgets.css"); Cesium = await import('cesium'); Cesium.Ion.defaultAccessToken = - "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw"; + "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2MjJiNDIxZS0wM2QzLTQ4ZDAtODI3Ny1lOWM5M2NlMDY3MDIiLCJpZCI6MzY3OTI4LCJpYXQiOjE3NjUyNjU3NDN9.DQPVOi6Iyre4L2pSEowtWydgX3EYPbBmkzQgeC-FTa4"; } export default { name: "cesium", From 066f1013c6d7045c102ebd24ea7c0c0f10ccc541 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 10 Dec 2025 14:07:09 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:checktable=E6=A3=80=E6=B5=8B=E9=A1=B9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check_table.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index bfee9585..8812269e 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -57,12 +57,18 @@ {{ row[item.testitem_name] }} + + From 413e5a8c1781e1844ecd959c88f1ce55de3e2005 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 10 Dec 2025 14:12:48 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=A6=85=E4=B8=8B=EF=BC=9A=E5=BA=9F?= =?UTF-8?q?=E5=93=81=E5=BA=93=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/inmScrap.vue | 56 ++++++++++++++++++++++---------------- src/views/wpm_bx/index.vue | 2 ++ 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/views/inm/inmScrap.vue b/src/views/inm/inmScrap.vue index 3faff3aa..9e026aa3 100644 --- a/src/views/inm/inmScrap.vue +++ b/src/views/inm/inmScrap.vue @@ -2,7 +2,8 @@
- 返工交接 + 清除 + 改版 合批报废
@@ -26,13 +27,15 @@ row-key="id" :params="params" :query="query" + @selection-change="selectionChange" > - - + + + @@ -98,20 +100,27 @@