1.材质证件跟踪增加修正功能,防止未导入零件配套表时报工导致材质证件缺失问题

2.调整切割报工零件生成逻辑兼容后续零件作业报工状态,防止直接删除导致报工信息丢失

src/api/jhzx/ylxx.js

@@ -3,3 +3,5 @@ import request from '@/utils/request'
 export function getYlList(data) {return request({url: '/mpYlxxp/getYlList', method: 'post', data})}
 export function czzjList(data) {return request({url: '/mpYlxxp/czzjList', method: 'post', data})}
 
+//手动生成材质证件
+export function sdtbczzj(data) {return request({url: '/zyjh/sdtbczzj', method: 'post', data})}

src/views/zl/czzjgz.vue

@@ -61,6 +61,7 @@
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
               <el-button type="success" @click="exportXls">导出</el-button>
+              <el-button type="success" @click="recovery">重新生成</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,6 +120,9 @@
         </el-main>
       </el-container>
     </el-container>
+    <vxe-modal v-model="modalShow">
+      <vxe-form :data="formOptions.formData" :items="formOptions.formItems" titleColon @submit="submitEvent"/>
+    </vxe-modal>
   </el-container>
 </template>
 
@@ -127,7 +131,7 @@ import {
   getPgdBase,
 } from '@/api/jhzxgl/pgd'
 import {
-  getYlList,czzjList
+  getYlList, czzjList, sdtbczzj
 } from '@/api/jhzx/ylxx'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -141,6 +145,24 @@ export default {
   name:'Czzjgz',
   data() {
     return {
+      formOptions:{
+        formData:{
+          dcCh:'',
+          dcPl:'',
+          tzbh:''
+        },
+        formItems:[
+          {field: 'dcCh', title: '船号', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入船号' } }},
+          {field: 'dcPl', title: '批量', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入批量' } }},
+          {field: 'tzbh', title: '图号', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入图号' } }},
+          {align:'right',span:20,
+            itemRender: {name: '$button', props: {content:'保存',status:'primary'},events:{click:this.submitEvent}}
+          },
+          {align:'right',span:4,
+            itemRender: {name: '$button', props: {content:'取消'},events:{click:this.closeModal}}
+          },
+        ],
+      },
       queryParam: {
         dcch:'',
         dcpl1:'',
@@ -313,7 +335,8 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
-      ]
+      ],
+      modalShow:false,
     }
   },
   computed: {
@@ -323,10 +346,55 @@ export default {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
     this.initBase()
-
-
   },
   methods: {
+    //按船号、批次、图号重新生成材质证件,用于解决材质证件数据不完整的问题
+    recovery(){
+      const selectData=this.$refs.xGrid.getCheckboxRecords()
+      const tmp=[],data=[]
+      for (const item of selectData) {
+        const key=`${item.DC_CH}_${item.DC_PL}_${item.DC_TH}`
+        if (tmp.includes(key)){
+          continue
+        }
+        tmp.push(key)
+        data.push({
+          dcCh:item.DC_CH,
+          dcPl:item.DC_PL,
+          tzbh:item.DC_TH,
+        })
+      }
+
+      if (data.length>0){
+        sdtbczzj(data).then(res=>{
+          this.initList()
+        })
+      }else{
+        //手动生成
+        this.modalShow=true
+      }
+    },
+    submitEvent(){
+      const data=this.formOptions.formData
+      if (!data.dcCh){
+        this.$message.warning('请填写船号')
+        return
+      }
+      if (!data.dcPl){
+        this.$message.warning('请填写批次')
+        return
+      }
+      if (!data.tzbh){
+        this.$message.warning('请填写图号')
+        return
+      }
+      sdtbczzj([data]).then(res=>{
+        this.initList()
+      })
+    },
+    closeModal(){
+      this.modalShow=false
+    },
     exportXls(){
       const data=this.$refs.xGrid.getCheckboxRecords()
       if (data.length===0){