1.图纸计划派工单 取消分段 增加编制人编制日期记录

2.抛丸 增加 理料垛位 层数 批量选择
3.上料垮位查询条件 改为单据号 单据号查询逻辑未知
4.划线垛位 层数取消
5.按工序查看作业计划

pnpm-lock.yaml

@@ -69,8 +69,8 @@ dependencies:
     specifier: 2.4.0
     version: 2.4.0
   pdfjs-dist:
-    specifier: 2.0.943
-    version: 2.0.943(webpack@4.46.0)
+    specifier: ^2.0.943
+    version: 2.6.347
   pizzip:
     specifier: ^3.1.1
     version: 3.1.4
@@ -83,6 +83,9 @@ dependencies:
   qrcode:
     specifier: ^1.5.3
     version: 1.5.3
+  qrcodejs2:
+    specifier: 0.0.2
+    version: 0.0.2
   regenerator-runtime:
     specifier: ^0.13.9
     version: 0.13.11
@@ -129,7 +132,7 @@ dependencies:
     specifier: 3.1.0
     version: 3.1.0
   vxe-table:
-    specifier: ^3.7.5
+    specifier: 3.7.5
     version: 3.7.5(vue@2.6.10)(xe-utils@3.5.14)
   vxe-table-plugin-export-xlsx:
     specifier: ^2.3.1
@@ -138,7 +141,7 @@ dependencies:
     specifier: ^3.3.0
     version: 3.3.0(vxe-table@3.7.5)
   xe-utils:
-    specifier: ^3.5.14
+    specifier: 3.5.14
     version: 3.5.14
   xlsx:
     specifier: ^0.14.1
@@ -173,7 +176,7 @@ devDependencies:
     specifier: 2.3.3
     version: 2.3.3
   chalk:
-    specifier: 2.4.2
+    specifier: ^2.4.2
     version: 2.4.2
   chokidar:
     specifier: 2.1.5
@@ -5301,8 +5304,8 @@ packages:
       entities: 2.2.0
     dev: true
 
-  /dom-zindex@1.0.1:
-    resolution: {integrity: sha512-M/MERVDZ8hguvjl6MAlLWSLYLS7PzEyXaTb5gEeJ+SF+e9iUC0sdvlzqe91MMDHBoy+nqw7wKcUOrDSyvMCrRg==}
+  /dom-zindex@1.0.6:
+    resolution: {integrity: sha512-FKWIhiU96bi3xpP9ewRMgANsoVmMUBnMnmpCT6dPMZOunVYJQmJhSRruoI0XSPoHeIif3kyEuiHbFrOJwEJaEA==}
     dev: false
 
   /domain-browser@1.2.0:
@@ -9452,10 +9455,6 @@ packages:
       lodash: 4.17.21
     dev: true
 
-  /node-ensure@0.0.0:
-    resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==}
-    dev: false
-
   /node-forge@0.10.0:
     resolution: {integrity: sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==}
     engines: {node: '>= 6.0.0'}
@@ -10247,16 +10246,6 @@ packages:
       safe-buffer: 5.2.1
       sha.js: 2.4.11
 
-  /pdfjs-dist@2.0.943(webpack@4.46.0):
-    resolution: {integrity: sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==}
-    peerDependencies:
-      webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0
-    dependencies:
-      node-ensure: 0.0.0
-      webpack: 4.46.0
-      worker-loader: 2.0.0(webpack@4.46.0)
-    dev: false
-
   /pdfjs-dist@2.6.347:
     resolution: {integrity: sha512-QC+h7hG2su9v/nU1wEI3SnpPIrqJODL7GTDFvR74ANKGq1AFJW16PH8VWnhpiTi9YcLSFV9xLeWSgq+ckHLdVQ==}
     dev: false
@@ -10977,6 +10966,10 @@ packages:
       yargs: 15.4.1
     dev: false
 
+  /qrcodejs2@0.0.2:
+    resolution: {integrity: sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA==}
+    dev: false
+
   /qs@6.11.0:
     resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
     engines: {node: '>=0.6'}
@@ -13449,7 +13442,7 @@ packages:
       vue: ^2.6.0
       xe-utils: ^3.5.0
     dependencies:
-      dom-zindex: 1.0.1
+      dom-zindex: 1.0.6
       vue: 2.6.10
       xe-utils: 3.5.14
     dev: false

src/views/jhzxgl/tzjhD.vue

@@ -194,10 +194,10 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fd', title: '分段', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+        // { field: 'fd', title: '分段', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
 
         { field: 'lqbxfrq', title: '领取表下发日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],

src/views/jhzxgl/yppyz.vue

@@ -218,9 +218,20 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
-
-
-
+        {
+          field: 'ppch',
+          title: '配盘船号',editRender: { name: 'input' },
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'ypph',
+          title: '预配盘号',editRender: { name: 'input' },
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
       ]
     }
   },

src/views/zyjhzx/components/SliaoSearch.vue

@@ -2,7 +2,7 @@
   <div id="searchPl" ref="searchPl">
     <ProjectSelect ref="projectSelectRef" clearable :_style="{width:'115px'}"/>
     <VxeInput v-model="queryParam.dcPl" clearable placeholder="请输入批量"/>
-    <VxeInput v-model="queryParam.kw" clearable placeholder="请输入跨位"/>
+    <VxeInput v-model="queryParam.djh" clearable placeholder="单据号"/>
     <VxeInput v-if="ljbs" v-model="queryParam.fd" clearable placeholder="请输入分段"/>
     <VxeButton status="primary" content="查询" @click="search" />
     <VxeSelect v-if="ljbs" v-model="gylxSelectData" ref="gylxSelectRef" clearable :options="gylx" placeholder="选择工艺路线"/>
@@ -40,6 +40,7 @@ export default {
         dcCh:'',
         dcPl:'',
         dcFd:'',
+        djh:''
       },
       gylxSelectData:'',
       gylx:[

src/views/zyjhzx/hxianfkui/comps/pgdTable.js

@@ -43,8 +43,8 @@ export default function () {
     { type: 'checkbox', width: 40 },
     { type: 'seq',title:'序号', width: 50 },
     { field: 'djh',title:'派工单号', width: 120,},
-    {field: 'lldw', title: '垛位', width: 80,formatter: dwFormat},
-    {field: 'llcs', title: '层数', width: 60},
+    // {field: 'lldw', title: '垛位', width: 80,formatter: dwFormat},
+    // {field: 'llcs', title: '层数', width: 60},
     {field: 'dcCh', title: '船号', width: 80},
     {field: 'dcPl', title: '批量', width: 80},
     {field: 'dcFd', title: '分段', width: 80},

src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue

@@ -128,8 +128,14 @@ export default {
         return
       }
       if (checked){
-        const worker=this.$props.worker()
-        // this.paigong(worker)
+        const data=this.$refs.vxeGrid.getCheckboxRecords();
+        data.forEach(row=>{
+          row.zt='PG'
+          EventBus.$emit('pwpg', {
+            ...row
+          })
+        })
+        this.$refs.vxeGrid.removeCheckboxRow()
       }
     },
     checkboxChange({checked,row}){

src/views/zyjhzx/pwanpgong/comps/pgdTable.js

@@ -97,7 +97,9 @@ export default function (_height=0) {
     {field: 'kw', title: '垮位',width: 130,formatter: kwFormat},
     {field: 'zl', title: '组立', width: 70,formatter: zlFormat},
     {field: 'nbsbm', title: '入库批号',minWidth: 100,},
-    {field: '', title: '备注',width: 50,visible:false },
+    {field: 'lldw', title: '理料垛位',width: 50,visible:false },
+    {field: 'ceng', title: '层数',width: 50,visible:false },
+    {field: 'bz', title: '备注',width: 50,visible:false },
   ]
 
   return {