1.修复工单上料计划生成语句

2.当对应工序产能不存在时,按照文档日期计算规则设置默认计划期,自动生成抛丸日期和上料日期
3.修复bug

src/views/jhzx/qfqrGL.vue

@@ -92,6 +92,7 @@ export default {
         dcPl:'',
         dcFd:'',
         zjcz:true,
+        zt1:'04'
       },
     }
   },
@@ -110,6 +111,7 @@ export default {
       }
       yppQr(data).then(res=>{
         this.$message.success('成功');
+        this.initList()
       })
     },
     initList(){

src/views/jhzx/qfxqwh.vue

@@ -37,7 +37,7 @@
               </vxe-pulldown>
             </el-form-item>
             <el-form-item label="月份:">
-              <el-date-picker v-model="queryParam.db" value-format="yyyy/MM"  type="month"  style="width: 80%;" />
+              <el-date-picker v-model="queryParam.xzglxq" value-format="yyyy/MM"  type="month"  style="width: 80%;" />
             </el-form-item>
           </el-col>
           <el-col :span="2">
@@ -120,7 +120,8 @@ export default {
   data() {
     return {
       queryParam: {
-        db:'',
+        dcch:'',
+        xzglxq:'',
         zt:'0'
       },
       list: [],

src/views/jhzx/qfzxGL.vue

@@ -95,6 +95,7 @@ export default {
         dcPl:'',
         dcFd:'',
         zjcz:true,
+        zt1:'01'
       },
     }
   },

src/views/jhzx/symxCX.vue

@@ -80,6 +80,7 @@
                 show-overflow
                 show-header-overflow
                 @cell-dblclick="cellClickEvent_xb"
+                :scroll-y="{enabled: true}"
               >
                 <template #numMx5="{ items, _columnIndex }">
                   <span style="color: red">{{ items[_columnIndex] }}</span>
@@ -105,6 +106,7 @@
                 highlight-current-row
                 highlight-hover-row
                 show-overflow
+                :scroll-y="{enabled: true}"
               >
 
               </vxe-grid>
@@ -128,6 +130,7 @@
                 highlight-hover-row
                 show-overflow
                 show-header-overflow
+                :scroll-y="{enabled: true}"
               >
 
               </vxe-grid>
@@ -149,7 +152,7 @@
                 :data="list3"
                 :custom-config="{ storage: true }"
                 :span-method="rowspanMethod"
-                :scroll-y="{enabled: false}"
+                :scroll-y="{enabled: true}"
                 highlight-hover-row
                 show-overflow
                 show-header-overflow

src/views/jhzxgl/components/YppTq.vue

@@ -99,7 +99,8 @@ export default {
         dcCh:'',
         dcPl:'',
         dcFd:'',
-        zt:'2'
+        zt:'2',
+        fan:'1'
       },
       projectData:[],
       monthList:[],
@@ -349,15 +350,6 @@ export default {
         this.dictData = res.data
       })
     },
-    initList0() {
-      if (this.queryParam.dcCh) {
-        getQfxq(this.queryParam).then((res) => {
-          if (res.data){
-            this.list = res.data
-          }
-        })
-      }
-    },
     //初始化表1 数据
     initList() {
       if (this.queryParam.dcCh === '') {

src/views/jhzxgl/yppCX.vue

@@ -22,6 +22,8 @@
                     <vxe-grid
                       highlight-hover-row
                       height="auto"
+                      keep-source
+                      :custom-config="{ storage: true }"
                       :data="projectData"
                       :columns="projectColumns"
                       @cell-click="cellClickEvent"

src/views/jhzxgl/yppFK.vue

@@ -22,6 +22,8 @@
                     <vxe-grid
                       highlight-hover-row
                       height="auto"
+                      keep-source
+                      :custom-config="{ storage: true }"
                       :data="projectData"
                       :columns="projectColumns"
                       @cell-click="cellClickEvent"

src/views/jhzxgl/yppGL.vue

@@ -62,13 +62,38 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="2">
             <el-form-item label="在建船只:" label-width="105px">
               <el-checkbox v-model="request.zjcz" type="search" placeholder="合同号" ></el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="11" style="text-align: right">
+          <el-col :span="2">
-            <el-button type="primary" @click="initList()">查询</el-button>
+              <el-select v-model="pl.qy" placeholder="区域" clearable>
+                <el-option
+                  v-for="item in qyList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+          </el-col>
+          <el-col :span="2">
+              <el-select v-model="pl.dwh" placeholder="垛位" clearable>
+                <el-option
+                  v-for="item in dwList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+          </el-col>
+          <el-col :span="1" style="text-align: left">
+            <el-button type="primary" @click="plsr">批量</el-button>
+          </el-col>
+          <el-col :span="8" style="text-align: right">
+            <el-button type="primary" @click="initList">查询</el-button>
             <el-button type="primary" @click="tq">提取</el-button>
             <el-button type="success" @click="save">保存</el-button>
           </el-col>
@@ -83,8 +108,8 @@
               id="id"
               border
               ref="tableRef"
-              resizable
               keep-source
+              resizable
               :height="height"
               :auto-resize="true"
               :columns="tableColumn"
@@ -116,6 +141,10 @@ export default {
       yppTqShow:false,
       height: "500px",
       list:[],
+      pl:{
+        dwh:'',
+        qy:''
+      },
       projectColumns: [
         {field: 'cbbm', title: '船号',width: 110},
         { field: 'wgbs', title: '完工标识', width: 80,
@@ -135,6 +164,7 @@ export default {
         zjcz:true
       },
       tableColumn: [
+        {type: "checkbox", width: "50", align: "center", fixed: "left",},
         {type: "seq", width: "50", title: "序号", align: "center", fixed: "left",},
         { field: 'dcCh', title: '船只', width: 120,align: "center",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -268,6 +298,21 @@ export default {
         })
       }
     },
+    plsr(){
+      const data = this.$refs.tableRef.getCheckboxRecords();
+      if(data.length<=0){
+        this.$message.warning('请先选择要批量操作的数据')
+        return;
+      }
+      if (!this.pl.dwh||!this.pl.qy){
+        this.$message.warning('请选择摆放位置');
+        return;
+      }
+      data.forEach(item=>{
+        item.dwh=this.pl.dwh
+        item.qy=this.pl.qy
+      })
+    },
     bfwzChanged({row}){
       checkBfwz([row]).then(res=>{
         if (!res.data.success){