Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-web

# Conflicts:
#	src/view/pdm/product-code-change/index.vue

src/api/pages/pdm/molding-record.js

@@ -9,10 +9,13 @@ export default {
     prefix: '/mdm-server/mst/moldline/',
     searchMoldline:'select_moldline',
     selectMoldlineItem:'select_moldline_item',
+
   },
   moldingRecordService: {
     // 前缀
     prefix: '/mdm-server/pdm/molding/',
+    //查询产品型号变更
+    selectMoldingGiveCodeChange: 'select_molding_give_code_change',
   },
   moldingRecordItemService: {
     // 前缀
@@ -24,7 +27,7 @@ export default {
     //查询可替换绑定条码的产品
     selectProductByBindBarcode: 'select_product_by_bind_barcode',
     //查询可添加绑定条码的产品
-    selectProductCanBindBarcode: 'select_product_can_bind_barcode'
+    selectProductCanBindBarcode: 'select_product_can_bind_barcode',
 
   }
 }

src/api/pages/pdm/product.js

@@ -10,6 +10,8 @@ export default {
     insertBatch:'/mdm-server/pdm/product/insert_batch',
     //打印
     print: 'print_pdf',
+    //成行记录-绑定条码-撤销条码
+    undo:'undo'
   }
 }
 

src/components-app/business/dk-app-single-dropdown/dk-app-single-dropdown.vue

@@ -785,7 +785,8 @@ export default {
       }
 
       if (dataSourceCode === 'scrapReason') {
-        param.defectKind = '缺陷类别-开模'
+        this.$delete(param,'dictCode')
+        param.defectKind = '缺陷类别-损坯'
         return this.excute(this.$service.commonService, this.$service.commonService.getProductDefect, param)
       } else if (dataSourceCode === 'userByPage') { //责任员工
         param.currentPage = 1

src/components/base/dk-form/dk-form-item.vue

@@ -6,7 +6,7 @@
         <div style="position: relative;">
           <PrependTransparent :labelWidth="labelWidthFather"
                               :errorMessage="this.$refs['formItem']?this.$refs['formItem'].validateMessage:''"
-                              :label="labelData" :required="required">
+                              :label="labelData" :required="required" :info="info">
             <slot></slot>
           </PrependTransparent>
         </div>
@@ -50,6 +50,11 @@ export default {
       type: [String, Number],
       default: null
     },
+    // 提示信息
+    info:{
+      type: String,
+      default: null
+    }
   },
   watch: {
     prop(n, o) {

src/components/base/dk-modal/dk-modal.vue

@@ -315,7 +315,9 @@ export default {
           this.focus();   // 聚焦到第一个组件上
         })
       }else{
-        this.displayFlag = false;
+        this.$nextTick(()=>{
+          this.displayFlag = false;
+        })
       }
     },
     /**
@@ -332,7 +334,7 @@ export default {
      * @date   : 2022/7/23 17:35
      */
     handleCancel(e) {
-      // 清空form中的数据
+      // 清空form中的数据 resetFields(要求form表单中名称必须一致，有些值就清除不掉）
       if (this.$refs.modal && this.$refs.modal.$slots && this.$refs.modal.$slots.default
         && this.$refs.modal.$slots.default.length > 0
         && this.$refs.modal.$slots.default[0].componentInstance
@@ -369,8 +371,8 @@ export default {
      * @date   : 2022/7/24 10:52
      */
     modalCancel() {
-      // 清空form中的数据
-      if (this.autoClearFlag && this.$refs.modal && this.$refs.modal.$slots && this.$refs.modal.$slots.default
+      // 清空form中的数据 resetFields(要求form表单中名称必须一致，有些值就清除不掉）
+      if (this.$refs.modal && this.$refs.modal.$slots && this.$refs.modal.$slots.default
         && this.$refs.modal.$slots.default.length > 0
         && this.$refs.modal.$slots.default[0].componentInstance
         && this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName]
@@ -435,7 +437,13 @@ export default {
 }
 
 /deep/ .ivu-modal-body {
-  padding: 10px 10px 30px 10px !important;
+  padding: 0 10px 2px 10px !important;
+}
+
+/deep/.search-data-class {
+  .ivu-modal-body{
+    height: 500px !important;
+  }
 }
 
 /deep/ .ivu-modal-fullscreen {

src/components/base/dk-table/dk-table.vue

@@ -350,7 +350,12 @@ export default {
     seqTipContent: {
       type: String,
       default: null
-    }
+    },
+    // 自适应列宽
+    autoWidthFlag:{
+      type: Boolean,
+      default: true
+    },
   },
   provide() {
     return {
@@ -485,7 +490,7 @@ export default {
           }, 100)
         })
       }
-      if(n && n.length > 0){
+      if(this.autoWidthFlag && n && n.length > 0){
         // 自适应列宽
         this.$nextTick(()=>{
           this.autoWidthHandle();
@@ -750,8 +755,8 @@ export default {
           })
         }
         this.$nextTick(() => {
-          this.$refs[this.name].resetColumn({resizable: true})
-          this.$refs[this.name].recalculate()
+          this.$refs[this.name]?.resetColumn({resizable: true})
+          this.$refs[this.name]?.recalculate()
         })
       }
     },
@@ -1881,7 +1886,7 @@ export default {
     }
     // 记录原始数据
     this.dataFinal = this.data
-    this.dataSocial = [...this.data]
+    this.dataSocial = this.data?.copy();
     // 如果树形开启那么赋值查询子级节点
     if (this.treeFlag) {
       this.setMagnifierProperty();

src/components/base/edit-table/edit-table.vue

@@ -712,13 +712,20 @@ export default {
     copyValue(row, colItem) {
       let field = colItem.field;
       if (row && row[field]) {
-        this.$message.success(vm.$t('copySuccess') + '：' + row[field]);
+        let value = row[field];
+        // 如果是下拉，需要读取_Name字段的值
+        if(colItem.type === 'select'){
+          if(row[field + '_Name'] != undefined){
+            value = row[field + '_Name']
+          }
+        }
+        this.$message.success(vm.$t('copySuccess') + '：' + value);
         //创建一个input框
         const input = document.createElement("input");
         //将指定的DOM节点添加到body的末尾
         document.body.appendChild(input);
         //设置input框的value值为直播地址
-        input.setAttribute("value", row[field]);
+        input.setAttribute("value", value);
         //选取文本域中的内容
         input.select();
         //copy的意思是拷贝当前选中内容到剪贴板

src/components/base/prepend-transparent/prepend-transparent.vue

@@ -8,6 +8,9 @@
                 :disabled="!visible">
           <div :ref="'label'+ label" @mouseenter="checkDisplayTip" @mouseleave="visible=false" :class="this.required?null:'label-left'">{{ label }}</div>
         </Poptip>
+        <Poptip trigger="hover" transfer placement="top-start" :content="info" v-if="info">
+          <Icon type="ios-information-circle" style="cursor: pointer;font-size: 12px" color="#909399" ref="info-icon"/>
+        </Poptip>
       </div>
     </div>
     <slot></slot>
@@ -35,9 +38,15 @@ export default {
       type: Boolean,
       default: false
     },
+    // 错误信息
     errorMessage: {
       type: String,
       default: null
+    },
+    // 提示信息
+    info:{
+      type: String,
+      default: null
     }
   },
   watch: {

src/components/business/search-cond/index.vue

@@ -1134,7 +1134,7 @@ export default {
 .split-class {
   height: 2px;
   background: #E6ECF4;
-  margin-bottom: 10px;
+  margin-bottom: 3px;
 }
 
 /deep/ .ivu-form-inline .ivu-input-group {

src/components/business/select-magnifier/select-magnifier.vue

@@ -17,7 +17,7 @@
     <!--      <Icon slot="prefix" type="iconfont iconfont icon-clear" @click.stop="clearAll"/>-->
     <!--    </div>-->
     <DkModal
-      width="1100"
+      :width="modalWidth"
       ref="modal_search"
       v-model="showModal"
       :loading="loading"
@@ -39,8 +39,10 @@
       <!--        </DkFormItem>-->
       <!--      </DkForm>-->
 
-      <SearchCond id="search-cond-div" width="1000px" v-if="searchContent && searchContent.length > 0" ref="searchCond"
-                  v-model="searchCond" :setFlag="false" :searchContent="searchContent" :col-count="4"></SearchCond>
+      <SearchCond id="search-cond-div" :width="modalWidth - 100" v-if="searchContent && searchContent.length > 0"
+                  ref="searchCond"
+                  v-model="searchCond" :setFlag="false" :searchContent="searchContent"
+                  :col-count="colCount"></SearchCond>
 
       <div v-if="multiple">
         <DkTabs ref="tabs" :options="tabsOptions" @on-click="tabsClick" @on-clear="clearSelected"></DkTabs>
@@ -182,7 +184,7 @@ export default {
     // 表格高度
     tableHeight: {
       type: Number,
-      default: 360
+      default: 340
     },
     // 清空标识
     clearable: {
@@ -207,7 +209,9 @@ export default {
     const vm = window.vm
     let self = this
     return {
-      loading:false,
+      colCount: 4,
+      modalWidth: 980,
+      loading: false,
       tabIndex: 0,
       tabsOptions: [
         {label: '选择列表', name: 'name1', index: 0},
@@ -279,13 +283,21 @@ export default {
       this.selectedValue = n;
     },
     value(n, o) {
-      if (!this.inputReadOnlyData) {
-        // todo 如果赋值就会产生把id付给selectvalue的情况
-        // this.selectedValue = n
-      } else {
-        if (n == null) {
+      // if (!this.inputReadOnlyData) {
+      //   // todo 如果赋值就会产生把id付给selectvalue的情况
+      //   // this.selectedValue = n
+      // } else {
+      //   if (n == null) {
+      //     this.selectedValue = null;
+      //   }
+      // }
+      if (n == null) {
+        if (this.multiple) {
+          this.selectedValue = [];
+        } else {
           this.selectedValue = null;
         }
+        this.$emit('ok', null)
       }
       if (!n) {
         this.batchKeysPage = []
@@ -357,11 +369,12 @@ export default {
      * @date   : 2022/5/31 15:04
      */
     clearSelected() {
-      this.selectedKeys = []
-      this.selectedTable = []
-      this.batchKeysPage = []
-      this.batchRowsPage = []
-      this.$refs['table-select'].clearBatchKeys();
+      // this.selectedKeys = []
+      // this.selectedTable = []
+      // this.batchKeysPage = []
+      // this.batchRowsPage = []
+      // this.$refs['table-select'].clearBatchKeys();
+      this.clearAll();
     },
 
     /**
@@ -595,17 +608,19 @@ export default {
         if (tRow && tRow.length > 0) {
           // 删除掉去掉的勾选
           this.$refs['table-select'].setUnCheckedRow(tRow[0]);
-        } else {
-          // 删除掉去掉的勾选
-          if (this.batchKeysPage) {
-            this.batchKeysPage.splice(this.batchKeysPage.indexOf(key), 1)
-            let filterRows = this.$refs['table-select'].batchRows.filter(it => it[this.selectKey] == key)
-            if (filterRows && filterRows.length > 0) {
-              this.$refs['table-select'].batchRows.splice(this.$refs['table-select'].batchRows.indexOf(filterRows[0]), 1)
-            }
-            this.$refs['table-select'].batchKeys = this.batchKeysPage;
-          }
         }
+        // else {
+        //   // 删除掉去掉的勾选
+        //   if (this.batchKeysPage) {
+        //     this.batchKeysPage.splice(this.batchKeysPage.indexOf(key), 1)
+        //     let filterRows = this.$refs['table-select'].batchRows.filter(it => it[this.selectKey] == key)
+        //     if (filterRows && filterRows.length > 0) {
+        //       this.$refs['table-select'].batchRows.splice(this.$refs['table-select'].batchRows.indexOf(filterRows[0]), 1)
+        //     }
+        //     this.$refs['table-select'].batchKeys = this.batchKeysPage?.copy();
+        //     console.log('3342',tRow,this.tableData, this.batchRowsPage,JSON.stringify(this.batchKeysPage) )
+        //   }
+        // }
       }
     },
     /**
@@ -626,7 +641,7 @@ export default {
       }
       this.model = this.multiple ? this.batchKeysPage : row[this.selectKey]
       this.$emit('input-change', this.multiple ? this.batchKeysPage : this.batchKeysPage[0])
-      this.$emit('modelOk',this.multiple ? this.batchKeysPage : this.batchKeysPage[0])
+      this.$emit('modelOk', this.multiple ? this.batchKeysPage : this.batchKeysPage[0])
       this.$emit('ok', this.batchRowsPage)
       this.$emit('on-ok', this.multiple ? this.batchRowsPage : this.batchRowsPage[0])
       this.showModal = false;
@@ -639,10 +654,22 @@ export default {
     handleSelectChange(batchRows, row, checked) {
       if (row) {
         this.batchKeysPage = [...this.$refs['table-select'].batchKeys]
-        if( this.batchKeysPage){
-          // 根据id获取row
-          this.batchRowsPage = this.$refs['table-select'].dataFinal?.filter(it=>this.batchKeysPage.includes(it[this.selectKey]) )
-        }else{
+        if (this.batchKeysPage) {
+          let dataFinal = this.$refs['table-select'].dataFinal
+          let filters = []
+          this.batchKeysPage.forEach(it => {
+            filters = this.batchRowsPage.filter(item => item[this.selectKey] === it);
+            if (!filters || filters.length === 0) {
+              // 获取列
+              filters = dataFinal?.filter(item => item[this.selectKey] === it);
+              if(filters && filters.length > 0){
+                this.batchRowsPage.push({...filters[0]})
+              }
+            }
+          })
+          // // 根据id获取row
+          // this.batchRowsPage = this.$refs['table-select'].dataFinal?.filter(it => this.batchKeysPage.includes(it[this.selectKey]))
+        } else {
           this.batchRowsPage = []
         }
         this.$refs['table-select'].batchRows = [...this.batchRowsPage]
@@ -686,7 +713,7 @@ export default {
       if (this.$refs.searchCond) {
         this.$refs.searchCond.clearCondition();
       }
-      this.searchData() // 重新查询
+      // this.searchData() // 重新查询
     },
     /**
      * @desc   : 校验是否可以做查询
@@ -720,7 +747,7 @@ export default {
       }
       this.loading = true;
       let param = {...this.$refs['table-select'].pageInfo}
-      param.currentPage = this.pageInfo.currentPage?this.pageInfo.currentPage:1
+      param.currentPage = this.pageInfo.currentPage ? this.pageInfo.currentPage : 1
       param.pageSize = this.pageInfo.pageSize
       param.userId = this.$store.state.user.id
       param.ftyId = this.$store.state.user.ftyId
@@ -785,11 +812,10 @@ export default {
         return;
       }
       this.showModal = true
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         // 文本不可输入时（大多数放大镜组件使用）
         if (this.inputReadOnlyData) {
           if (this.multiple) {
-            console.log('tt',this.value)
             this.batchKeysPage = []
             this.$refs['table-select'].batchKeys = []
             if (this.value && Array.isArray(this.value)) {
@@ -832,8 +858,12 @@ export default {
             }
           }
         }
+        // 如果多选，页签回到第一个
+        if(this.multiple){
+          this.tabIndex = 0;
+        }
         // 查询数据
-        this.getDataTable();
+        // this.getDataTable();
       })
     },
     /**
@@ -877,7 +907,8 @@ export default {
      * @date   : 2022/3/7 15:44
      */
     checkBatch() {
-      if (this.$refs['table-select'].batchKeys.length <= 0) {
+      if (!this.batchKeysPage || this.batchKeysPage.length === 0) {
+      // if (this.$refs['table-select'].batchKeys.length <= 0) {
         this.$Message.error('请先选择数据')
         return false
       }
@@ -892,27 +923,31 @@ export default {
       if (this.checkBatch()) {
         this.showModal = false
         // 重新去keys，考虑到可能会有无效的数据
-        this.batchKeysPage = [...this.$refs['table-select'].batchKeys]
-        this.batchRowsPage = [...this.$refs['table-select'].batchRows]
-        // 判断放大镜获取的数据是否在下拉里有，如果没有就增加
-        this.batchRowsPage.forEach(it => {
-          if (this.multiple) {
-            let filter = this.options.filter(opt => opt[this.selectKey] == it[this.selectKey])
-            if (!filter || filter.length === 0) {
-              this.options.push(it);
-            }
-          }
-        })
+        // this.batchKeysPage = [...this.$refs['table-select'].batchKeys]
+        // this.batchRowsPage = [...this.$refs['table-select'].batchRows]
+        // // 判断放大镜获取的数据是否在下拉里有，如果没有就增加
+        // this.batchRowsPage.forEach(it => {
+        //   if (this.multiple) {
+        //     let filter = this.options.filter(opt => opt[this.selectKey] == it[this.selectKey])
+        //     if (!filter || filter.length === 0) {
+        //       this.options.push(it);
+        //     }
+        //   }
+        // })
         // 不显示下拉时
 
         if (!this.selectFlag) {
           let display = []
-          for (let i = 0; i < this.$refs['table-select'].batchRows.length; i++) {
-            display.push(this.$refs['table-select'].batchRows[i][this.selectLabel])
+          // for (let i = 0; i < this.$refs['table-select'].batchRows.length; i++) {
+          //   display.push(this.$refs['table-select'].batchRows[i][this.selectLabel])
+          // }
+          for (let i = 0; i < this.batchRowsPage.length; i++) {
+            display.push(this.batchRowsPage[i][this.selectLabel])
           }
           this.selectedValue = display.join(',')
         }
-        this.model = this.multiple ? this.$refs['table-select'].batchKeys : this.$refs['table-select'].batchKeys[0]
+        // this.model = this.multiple ? this.$refs['table-select'].batchKeys : this.$refs['table-select'].batchKeys[0]
+        this.model = this.multiple ? this.batchKeysPage : this.batchKeysPage[0]
         //光标切回select组件
         if (this.selectFlag) {
           this.$refs['select'].focus()
@@ -923,18 +958,35 @@ export default {
         this.batchKeysPage = this.batchKeysPage.filter(it => it != null); // 过滤掉null数据
         this.$emit('input-change', this.multiple ? this.batchKeysPage : this.batchKeysPage[0])
         this.$emit('ok', this.batchRowsPage)
-        this.$emit('modelOk',this.multiple ? this.batchKeysPage : this.batchKeysPage[0])
-        this.$emit('on-ok', this.multiple ? this.$refs['table-select'].batchRows : this.$refs['table-select'].batchRows[0])
+        this.$emit('modelOk', this.multiple ? this.batchKeysPage : this.batchKeysPage[0])
+        // this.$emit('on-ok', this.multiple ? this.$refs['table-select'].batchRows : this.$refs['table-select'].batchRows[0])
+        this.$emit('on-ok', this.multiple ? this.batchRowsPage : this.batchRowsPage[0])
         // 清空查询条件
         this.$refs['searchCond'].clearCondition();
+        // 清空表格
+        this.clearTable();
       }
     },
     /**
+     * @desc   : 清空表格数据
+     * @author : 周兴
+     * @date   : 2023/5/8 13:43
+     */
+    clearTable() {
+      this.tableData = []
+      // // 清空列表
+      // this.$refs['table-select'].clearTable();
+    },
+    /**
      * @desc   : 关闭点击事件
      * @author : 沈博
      * @date   : 2022/3/7 15:43
      */
     cancel() {
+      // 清空查询条件
+      this.$refs['searchCond'].clearCondition();
+      // 清空表格
+      this.clearTable();
       this.showModal = false
     },
     /**
@@ -990,7 +1042,7 @@ export default {
               e.returnValue = false
               if (self.$refs.modal_search.$refs[forIt.name]) {
                 self.$refs.modal_search.$refs[forIt.name].$el.click()
-              }else if (self.$refs[forIt.name]) {
+              } else if (self.$refs[forIt.name]) {
                 self.$refs[forIt.name].$el.click()
               }
             }
@@ -1043,6 +1095,8 @@ export default {
           {itemCode: 'userCode'},
           {itemCode: 'userName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'userId'
         self.selectLabel = 'userName'
         self.columns = [
@@ -1059,6 +1113,8 @@ export default {
           {itemCode: 'userCode'},
           {itemCode: 'userName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'userId'
         self.selectLabel = 'userName'
         self.columns = [
@@ -1075,12 +1131,14 @@ export default {
           {itemCode: 'orgCode'},
           {itemCode: 'orgName'},
         ]
+        self.modalWidth = 600
+        self.colCount = 2
         self.selectKey = 'orgId'
         self.selectLabel = 'orgName'
         self.columns = [
           {field: 'orgName'},
           {field: 'orgCode'},
-          {field: 'levelName', title:self.$t('orgLevelName'), width: 'auto'},
+          {field: 'levelName', title: self.$t('orgLevelName'), width: 'auto'},
         ]
       }
       //产品信息（条码变更）
@@ -1109,7 +1167,7 @@ export default {
           {field: 'moldingBatch', width: 'auto'},
           {field: 'moldingUser', width: 'auto'},
           {field: 'productUniqueCode', width: 'auto'},
-          {field: 'mouldUniqueCode', width: 'auto'},
+          {field: 'mouldUniqueCode', title: self.$t('moldingModelCode'), width: 'auto'},
           {field: 'mouldKind', width: 'auto'},
           {field: 'moldedNum', width: 'auto'},
           {field: 'manageUserName', width: 'auto'},
@@ -1126,6 +1184,8 @@ export default {
         self.searchContent = [
           {itemCode: 'pdtBarcode'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'itemId'
         self.selectLabel = 'pdtBarcode'
         self.columns = [
@@ -1143,6 +1203,8 @@ export default {
         self.searchContent = [
           {itemCode: 'pdtBarcode'},
         ]
+        self.modalWidth = 600
+        self.colCount = 2
         self.selectKey = 'itemId'
         self.selectLabel = 'pdtBarcode'
         self.columns = [
@@ -1161,6 +1223,8 @@ export default {
         self.searchContent = [
           {itemCode: 'pdtBarcode'},
         ]
+        self.modalWidth = 600
+        self.colCount = 2
         self.selectKey = 'itemId'
         self.selectLabel = 'pdtBarcode'
         self.columns = [
@@ -1176,6 +1240,8 @@ export default {
         self.searchContent = [
           {itemCode: 'nodeName'},
         ]
+        self.modalWidth = 800
+        self.colCount = 2
         self.selectKey = 'nodeId'
         self.selectLabel = 'nodeName'
         self.columns = [
@@ -1195,6 +1261,8 @@ export default {
           {itemCode: 'tagTypeName'},
           {itemCode: 'tagName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'tagId'
         self.selectLabel = 'tagName'
         self.columns = [
@@ -1210,6 +1278,8 @@ export default {
         self.searchContent = [
           {itemCode: 'roleName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'roleId'
         self.selectLabel = 'roleName'
         self.columns = [
@@ -1225,6 +1295,8 @@ export default {
         self.searchContent = [
           {itemCode: 'jobName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'jobId'
         self.selectLabel = 'jobName'
         self.columns = [
@@ -1240,6 +1312,8 @@ export default {
         self.searchContent = [
           {itemCode: 'postName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'postId'
         self.selectLabel = 'postName'
         self.columns = [
@@ -1255,6 +1329,8 @@ export default {
         self.searchContent = [
           {itemCode: 'channelName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'channelId'
         self.selectLabel = 'channelName'
         self.columns = [
@@ -1268,15 +1344,17 @@ export default {
         self.methodsName = 'getModelProduct'
         self.methodsNameDetail = 'getModelProductByPage'
         self.searchContent = [
-          {itemCode: 'appProductCodeB', valueFormat: {code: 'modelCode'}},
-          {itemCode: 'appProductName', valueFormat: {code: 'modelName'}},
+          {itemCode: 'modelCode'},
+          {itemCode: 'modelName'},
         ]
         self.selectKey = 'modelId'
         self.selectLabel = 'modelName'
+        self.modalWidth = 600
+        self.colCount = 2
         self.columns = [
-          {field: 'modelCode', title: self.$t('appProductCodeB'), width: '300'},
-          {field: 'modelName', title: self.$t('appProductName'), width: '300'},
-          {field: 'categoryName', width: '300'},
+          {field: 'modelCode', width: '300'},
+          {field: 'modelName', width: '300', title: self.$t('productModelName')},
+          {field: 'categoryName', width: '300', title: self.$t('modelCategory')},
         ]
       }
       //模具
@@ -1287,6 +1365,8 @@ export default {
         self.searchContent = [
           {itemCode: 'uniqueCode'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'uniqueId'
         self.selectLabel = 'uniqueCode'
         self.columns = [
@@ -1304,6 +1384,8 @@ export default {
         ]
         self.selectKey = 'modelId'
         self.selectLabel = 'modelName'
+        self.modalWidth = 800
+        self.colCount = 2
         self.columns = [
           {field: 'modelCategoryName', width: '200'},
           {field: 'modelCode', width: '200'},
@@ -1323,6 +1405,8 @@ export default {
           {itemCode: 'moldlineCode'},
           {itemCode: 'moldlineName'},
         ]
+        self.modalWidth = 700
+        self.colCount = 3
         self.selectKey = 'groupId'
         self.selectLabel = 'groupName'
         self.columns = [
@@ -1342,6 +1426,8 @@ export default {
           {itemCode: 'moldlineCode'},
           {itemCode: 'moldlineName'},
         ]
+        self.modalWidth = 800
+        self.colCount = 2
         self.selectKey = 'moldlineId'
         self.selectLabel = 'moldLineUniqueCode'
         self.columns = [
@@ -1362,6 +1448,8 @@ export default {
           {itemCode: 'moldlineCode'},
           {itemCode: 'moldlineName'},
         ]
+        self.modalWidth = 800
+        self.colCount = 2
         self.selectKey = 'moldlineId'
         self.selectLabel = 'moldLineUniqueCode'
         self.columns = [
@@ -1382,6 +1470,8 @@ export default {
         self.searchContent = [
           {itemCode: 'userCode'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'userId'
         self.selectLabel = 'userCode'
         self.columns = [
@@ -1397,6 +1487,8 @@ export default {
         self.searchContent = [
           {itemCode: 'modelKind'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'categoryId'
         self.selectLabel = 'categoryCode'
         self.columns = [
@@ -1413,6 +1505,8 @@ export default {
           {itemCode: 'kilnCode'},
           {itemCode: 'kilnName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'kilnId'
         self.selectLabel = 'kilnName'
         self.columns = [
@@ -1429,6 +1523,8 @@ export default {
           {itemCode: 'userCode'},
           {itemCode: 'userName'},
         ]
+        self.modalWidth = 700
+        self.colCount = 2
         self.selectKey = 'userId'
         self.selectLabel = 'userName'
         self.columns = [
@@ -1448,6 +1544,8 @@ export default {
           {itemCode: 'stationCode'},
           {itemCode: 'stationName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'stationId'
         self.selectLabel = 'stationName'
         self.columns = [
@@ -1464,6 +1562,8 @@ export default {
           {itemCode: 'flowCode'},
           {itemCode: 'flowName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'flowId'
         self.selectLabel = 'flowCode'
         self.columns = [
@@ -1480,6 +1580,8 @@ export default {
           {itemCode: 'categoryCode'},
           {itemCode: 'categoryName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'categoryId'
         self.selectLabel = 'categoryCode'
         self.columns = [
@@ -1497,6 +1599,8 @@ export default {
           {itemCode: 'categoryCode'},
           {itemCode: 'categoryName'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'categoryId'
         self.selectLabel = 'categoryCode'
         self.columns = [
@@ -1513,12 +1617,14 @@ export default {
           {itemCode: 'thmeterCode'},
           {itemCode: 'thmeterName'},
         ]
+        self.modalWidth = 600
+        self.colCount = 2
         self.selectKey = 'thmeterId'
         self.selectLabel = 'thmeterCode'
         self.columns = [
           {field: 'thmeterCode', width: '150'},
           {field: 'thmeterName', width: '150'},
-          {field: 'manageUserName',title: self.$t('blameStaffId'), width: '150'},
+          {field: 'manageUserName', title: self.$t('blameStaffId'), width: '150'},
           {field: 'modelKindName', width: '150'},
         ]
       }
@@ -1533,12 +1639,14 @@ export default {
             itemName: 'blameJobName',
           },
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'jobId'
         self.selectLabel = 'jobName'
         self.columns = [
-          {field: 'jobName', title:this.$t('blameJobName'), width: 'auto'},
-          {field: 'workKindName', title:this.$t('workKind'), width: 'auto'},
-          {field: 'workUnit',  width: 'auto'},
+          {field: 'jobName', title: this.$t('blameJobName'), width: 'auto'},
+          {field: 'workKindName', title: this.$t('workKind'), width: 'auto'},
+          {field: 'workUnit', width: 'auto'},
         ]
       }
       // 获取员工用于报工记录查询
@@ -1549,10 +1657,12 @@ export default {
         self.searchContent = [
           {itemCode: 'staffCode'},
         ]
+        self.modalWidth = 500
+        self.colCount = 2
         self.selectKey = 'staffId'
         self.selectLabel = 'staffName'
         self.columns = [
-          {field: 'jobName',width: '200'},
+          {field: 'jobName', width: '200'},
           {field: 'staffCode', width: '200'},
           {field: 'staffName', width: '200'},
         ]

src/components/business/table-select/table-select.vue

@@ -20,8 +20,8 @@
       <DkModal
         ref="modal_search"
         id="search-data-class"
-        class="search-data-class"
-        width="1050px"
+        class-name="search-data-class"
+        :width="modalWidth"
         :loading="loading"
         v-model="showModal"
         @modalOk="modalOk"
@@ -34,8 +34,8 @@
                              @click="$refs['searchCond'].clearCondition()"></BaseIndexButton>
           </template>
         </BaseIndexButtonGroup>
-        <SearchCond id="search-cond-div" width="1000px" v-if="searchContent && searchContent.length > 0"
-                    ref="searchCond"
+        <SearchCond id="search-cond-div" :width="modalWidth-100" v-if="searchContent && searchContent.length > 0"
+                    ref="searchCond" :col-count="colCount"
                     v-model="searchCond" :type="this.$config.pageCode.goods"
                     :setFlag="false" :searchContent="searchContent"></SearchCond>
         <div style="width: 100%;height: 10px"></div>
@@ -286,6 +286,8 @@ export default {
     const vm = Window.vm
     return {
       vm: vm,
+      colCount: 4,
+      modalWidth: 980,
       existsFlag: true,
       loading: false,
       leftParams: {},  // 左侧的查询条件
@@ -349,7 +351,7 @@ export default {
       selectedKeys: [],
       split: 0.18,
       minSplit: 0.18,
-      tableHeight: 400, //modal中列表的高度
+      tableHeight: 340, //modal中列表的高度
       tabsOptions: [
         {label: '选择列表', name: 'name1', index: 0},
         {label: '已选列表', name: 'name2', index: 1, clear: true},
@@ -373,9 +375,10 @@ export default {
     showModal(n, o) {
       if (n) {
         this.$refs['searchCond']?.clearCondition()
-        this.$nextTick(() => {
-          this.initData()
-        })
+        // 初始不加载
+        // this.$nextTick(() => {
+        //   this.initData()
+        // })
       }
     },
     text(n, o) {
@@ -768,7 +771,7 @@ export default {
             this.getDataLeft();
           }
         } else {
-          this.getDataTable();
+          // this.getDataTable();
         }
       } else {
         //还原快捷键
@@ -1106,6 +1109,8 @@ export default {
             valueKind: 'STR'
           }
         ]
+        this.modalWidth = 500
+        this.colCount = 2
         this.selectKey = 'orgId'
         this.selectLabel = 'orgName'
         this.columns = [
@@ -1134,6 +1139,8 @@ export default {
             valueFormat: {code: 'userName'},
           },
         ]
+        this.modalWidth = 500
+        this.colCount = 2
         this.selectKey = 'userId'
         this.selectLabel = 'userName'
         this.columns = [
@@ -1165,6 +1172,8 @@ export default {
             magnifierType: this.$config.MagnifierType.job
           },
         ]
+        this.modalWidth = 700
+        this.colCount = 2
         this.selectKey = 'staffId'
         this.selectLabel = 'staffName'
         this.columns = [
@@ -1191,6 +1200,8 @@ export default {
             valueFormat: {code: 'uniqueCode'},
           },
         ]
+        this.modalWidth = 500
+        this.colCount = 2
         this.selectKey = 'uniqueId'
         this.selectLabel = 'uniqueCode'
         this.columns = [
@@ -1216,6 +1227,8 @@ export default {
         ]
         this.selectKey = 'modelId'
         this.selectLabel = 'modelName'
+        this.modalWidth = 600
+        this.colCount = 2
         this.columns = [
           {field: 'modelCode', width: '120'},
           {field: 'modelName', width: 'auto'},
@@ -1238,6 +1251,8 @@ export default {
             valueFormat: {code: 'placeCode'},
           },
         ]
+        this.modalWidth = 500
+        this.colCount = 2
         this.selectKey = 'placeId'
         this.selectLabel = 'placeCode'
         this.columns = [
@@ -1263,6 +1278,8 @@ export default {
             valueFormat: {code: 'modelName'},
           },
         ]
+        this.modalWidth = 600
+        this.colCount = 2
         this.selectKey = 'modelId'
         this.selectLabel = 'modelName'
         this.columns = [
@@ -1289,6 +1306,8 @@ export default {
             valueFormat: {code: 'defectName'},
           },
         ]
+        this.modalWidth = 600
+        this.colCount = 2
         this.selectKey = 'defectId'
         this.selectLabel = 'defectName'
         this.columns = [
@@ -1319,6 +1338,8 @@ export default {
         ]
         this.selectKey = 'nodeId'
         this.selectLabel = 'nodeName'
+        this.modalWidth = 900
+        this.colCount = 2
         this.columns = [
           {field: 'nodeName', width: 'auto'},
           {field: 'flowName', width: '120'},
@@ -1351,6 +1372,8 @@ export default {
         ]
         this.selectKey = 'jobId'
         this.selectLabel = 'jobName'
+        this.modalWidth = 500
+        this.colCount = 2
         this.columns = [
           {field: 'jobCode', title: this.$t('blameJobCode'), width: 'auto'},
           {field: 'jobName', title: this.$t('blameJobName'), width: 'auto'},
@@ -1376,6 +1399,8 @@ export default {
             itemName: 'blameUserName',
           },
         ]
+        this.modalWidth = 600
+        this.colCount = 2
         this.selectKey = 'userId'
         this.selectLabel = 'userName'
         this.columns = [
@@ -1425,8 +1450,10 @@ export default {
       if (this.searchDataFlag) {
         this.setMagnifierProperty() // 根据类型给属性赋值
       } else {
-        this.optionsData = this.options.copy();
-        this.setOptionsColumn()
+        if(this.options && this.options.length > 0){
+          this.optionsData = this.options.copy();
+          this.setOptionsColumn()
+        }
       }
     }
     this.inputModal = this.text
@@ -1466,10 +1493,6 @@ export default {
   background: #fff;
 }
 
-.search-data-class /deep/ .ivu-modal-wrap .ivu-modal .ivu-modal-content .ivu-modal-body {
-  height: 630px !important;
-}
-
 
 .clear-class {
   position: absolute;
@@ -1498,8 +1521,8 @@ export default {
   padding-right: 10px !important;
 }
 
-.ivu-poptip-body-content{
-  overflow:hidden !important;
+.ivu-poptip-body-content {
+  overflow: hidden !important;
 }
 
 

src/config/index.js

@@ -1836,6 +1836,18 @@ export default {
   },
 
   /**
+   *   @desc   : 成型线Info静态变量
+   *   @date   : 2023/5/8 14:29
+   *   @author : 寇珊珊
+   */
+  mlodingInfo:{
+    //绑定工序
+    flowNodeId:'未绑定工序，成型线无法注浆',
+    //绑定工位
+    stationId:'高压注浆设备读取生产工号使用',
+  },
+
+  /**
    * @desc   : 回收到达
    * @author : 周兴
    * @date   : 2023/3/15 16:40

src/locale/lang/zh-CN.js

@@ -123,6 +123,7 @@ export const button = {
   moldingUserReplace: '工号变更(E)',
   bindBarcode: '绑定条码(B)',
   clearBindBarcode: '清空条码(C)',
+  revokeBindBarcode: '撤销条码(R)',
   carryover: '结转(D)',
   reverseCarryover: '反结(U)',
   prodCheck: '条码盘点(P)',
@@ -615,6 +616,9 @@ export const columns = {
 
   defectKind: '缺陷类别',
   kindName: '缺陷类别',
+  kindQuality:'缺陷类别-质量',
+  kindDamagedBillet:'缺陷类别-损坯',
+  kindMoldOpening:'缺陷类别-开模',
 
   labelKind: '标签类型',
   labelCode: '标签编号',
@@ -659,6 +663,9 @@ export const columns = {
   modelMouldRelation: '绑定模具产出型号',
   repPdtModelCode: '可变更产品编号',
   repPdtModelName: '可变更产品名称',
+  modelAfterBonding: '粘接后型号',
+  modelAfterBondingCode: '粘接后型号编码',
+  modelAfterBondingName: '粘接后型号名称',
   dictCode: '字典项目',
   dataValue: '字典数据',
   carrierCode: '载具编号',
@@ -744,14 +751,14 @@ export const columns = {
   moldlineItemKindName: '成型线状态',
 
   //商标釉色设定
-  oldLogoName: '原商标',
+  oldLogoName: '原商标名称',
   setLogo: '商标设定',
   setColour: '釉色设定',
   setModel: '型号设定',
   oldColourName: '原釉色名称',
   defJobId: '默认工种',
   defJobName: '默认工种',
-  newPdtLogo: '新商标',
+  newPdtLogo: '新商标名称',
   newPdtColour: '新釉色名称',
   newModel: '新产品型号',
   hisTime: '变更时间',
@@ -1100,6 +1107,7 @@ export const messages = {
   W_147: '请输入长度为4位单据代码',
   W_148: '请同时选择开始与结束时间',
   W_149: '分组至少需要2条数据',
+  W_150: '至少选择1条数据进行撤销',
   E_001: '系统出现异常，请联系管理员。',
   Q_001: '当前页面的数据有过更改，请确认需要保存吗？',
   Q_002: '确定要进行{param}操作吗？',
@@ -1458,6 +1466,9 @@ export const appColumns = {
   appDefectInformation: '缺陷信息',
   appDefectInformationDetail: '明细',
   appResponsibleProcess: '责任工序',
+  appProductGroupName: '粘接后产品型号',
+  appProductGroupNo: '粘接后序号',
+  appMoldingNo: '成型线编号',
   appResponsibleJobNumber: '责任工号',
   appJobName: '工种名称',
   appPersonLiable: '责任人',

src/mixins/index.js

@@ -186,7 +186,6 @@ export const indexMixin = {
               if (name === 'save') {
                 chooseRows = null
               }
-              console.log('rr1',routeUrl.method)
               // 执行方法
               this[routeUrl.method](chooseRows);
             }

src/view-app/app/grouting-management/barcode-change/choose-barcode.vue

@@ -95,9 +95,9 @@ export default {
       },
       rows: [
         {name: 'pdtBarcode', title: this.$t('appProductCode')}, //产品条码
-        {name: 'hisPdtCodes', title: this.$t('appHisPdtCodes')}, //历史条码
-        {name: 'mouldUniqueCode', title: this.$t('appMouldUniqueCode')}, //模具编码
-        {name: 'productUniqueCode', title: this.$t('appProductCodeB')}, //产品编码
+        // {name: 'hisPdtCodes', title: this.$t('appHisPdtCodes')}, //历史条码
+        {name: 'mouldUniqueCode', title: this.$t('appMoldNo')}, //模具编码
+        {name: 'productUniqueCode', title: this.$t('appProductUniqueCode')}, //产品编码
         {name: 'moldLineCode', title: this.$t('appMoldingCode')}, //成型线编码
         {name: 'moldingUser', title: this.$t('appMoldingStationNo')},
         {name: 'manageUserName', title: this.$t('appMoldingBan')},  //成型班长

src/view-app/app/grouting-management/forming-loss-reporting/index.vue

@@ -107,7 +107,7 @@ export default {
 
       tableDropdownIndex: null, //列表侧拉 索引
       rows: [
-        {name: 'moldlineItemCode', title: this.$t('appModelGroup')}, //模具编码
+        {name: 'moldlineItemCode', title: this.$t('appModelCode')}, //模具编码
         {name: 'moldingUserName', title: this.$t('appMoldingStationNo'),}, //成型工号
         {name: 'moldingBatch', title: this.$t('appGroutingBatch'), fieldFlag: false}, //成型批次
 

src/view-app/app/grouting-management/grouting-bind-barcode/index.vue

@@ -94,7 +94,7 @@ export default {
       ],
       //组内字段
       rowsGroup: [
-        { name: 'repPdtModelName', title: this.$t('productName') }, //可变更产品型号
+        { name: 'repPdtModelName', title: this.$t('appProductGroupName') }, //可变更产品型号
         {
           name: 'productUniqueCode',
           title: this.$t('appBindBarcode'),
@@ -107,8 +107,8 @@ export default {
       ],
       //分组字段
       rowsGrouping: [
-        { name: 'moldlineItemNo', title: this.$t('moldlineGroupNo') }, //分组序号
-        { name: 'moldlineItemCode', title: this.$t('groupName') }, //分组名称
+        { name: 'moldlineItemNo', title: this.$t('appProductGroupName') },
+        // { name: 'moldlineItemCode', title: this.$t('groupName') }, //分组名称
         {
           name: 'productUniqueCode',
           title: this.$t('appBindBarcode'),

src/view-app/app/grouting-management/molding-registration/edit.vue

@@ -133,7 +133,7 @@ export default {
       tableDropdownIndex: null, //列表侧拉 索引
       rows: [
         {name: 'modelCode', title: this.$t('appProductUniqueCode')}, //产品编码
-        {name: 'moldlineItemCode', title: this.$t('appModelGroup')}, //模具编码
+        {name: 'moldlineItemCode', title: this.$t('appModelCode')}, //模具编号
         {name: 'moldingBatch', title: this.$t('appGroutingBatch'), fieldFlag: false}, //成型批次
         {
           name: 'unmoldedReasonName',

src/view-app/app/grouting-management/molding-registration/index.vue

@@ -122,7 +122,7 @@ export default {
       tableDropdownIndex: null, //列表侧拉 索引
       rows: [
         {name: 'modelCode', title: this.$t('appProductUniqueCode')}, //产品编码
-        {name: 'itemCode', title: this.$t('appModelGroup')}, //模具编码
+        {name: 'itemCode', title: this.$t('appModelCode')}, //模具编号
         {name: 'lastMoldingBatch', title: this.$t('appGroutingBatch'), fieldFlag: false}, //成型批次
         {
           name: 'unmoldedReasonName',

src/view-app/app/grouting-management/molding-user-change/index.vue

@@ -92,7 +92,7 @@ export default {
       moldingUsersFlag: false, //成型工号标识
       tableDropdownIndex: null, //列表侧拉 索引
       rows: [
-        {name: 'moldlineItemCode', title: this.$t('appModelGroup')}, //模具编码
+        {name: 'moldlineItemCode', title: this.$t('appModelCode')}, //模具编码
         {name: 'erpModelCode', title: this.$t('appProductUniqueCode')}, //产品编码
         {
           name: 'moldingUserName',

src/view-app/app/mold-management/molding-mold-management/index.vue

@@ -74,11 +74,11 @@ export default {
         }
       ],
       rows: [
-        {name: 'itemCode', title: this.$t('appItemCode')}, //成型线编码
+     //   {name: 'groupNo', title: this.$t('groupNo')}, //成型线编码
         {name: 'itemNo', title: this.$t('appItemNo')}, //成型线编码
-        {name: 'mouldCode', title: this.$t('appUniqueCode')}, //模具条码
-        {name: 'itemKind', title: this.$t('appItemKind')}, //成线状态
-        // {name: 'remarks', title: this.$t('appRemarks'), fieldFlag: false},
+        {name: 'itemCode', title: this.$t('appModelCode')}, //模具条码
+        {name: 'itemKindName', title: this.$t('appItemKindCopy')}, //模具状态
+  
       ],
       item: {},
       tableRowData: [] //数据列表
@@ -161,6 +161,9 @@ export default {
         if (res.code === this.$config.SUCCESS_CODE) {
           if (res.data[0]) {
             this.tableRowData = res.data[0].moldLineItemList ? res.data[0].moldLineItemList : []
+            this.tableRowData.forEach(item=>{
+              item['moldKindCode'] = item.moldLineKindName
+            })
             this.item = res.data[0] ? res.data[0] : {}
             this.rightIcon = true
           } else {

src/view-app/app/piecework-procedure/climb-kiln/index.vue

@@ -58,7 +58,7 @@
       </dk-app-table>
     </div>
     <!--  保存按钮-->
-    <div class="app_save_bottom-class">
+    <div class="app_save_bottom-class" > 
       <dk-app-button @click="save">{{ $t('appSave') }}
       </dk-app-button>
     </div>
@@ -119,11 +119,11 @@ export default {
       rows: [
         {name: 'uniqueCode', title: self.$t('appProductCodeB')},//产品编码
         {name: 'modelCode', title: self.$t('modelCode')},//型号编码
-        {name: 'modelName', title: self.$t('appmodelKindT')},//模具型号
+        {name: 'modelName', title: self.$t('productName')},//模具型号
         {name: 'logoName', title: self.$t('appLogoName')},//商标名称
         {name: 'moldingDate', title: self.$t('appFormingDate')},//成型日期
         {name: 'moldingUserCode', title: self.$t('appMoldingStationNo')},//成型工号
-        {name: 'modelMouldCode', title: self.$t('appMoldNo')},//模具编号
+        {name: 'moldlineItemCode', title: self.$t('appMoldNo')},//模具编号
         {name: 'colourName', title: self.$t('colourName')},//釉色名称
       ],//每一条的内容
       tableRowData: [],
@@ -150,6 +150,7 @@ export default {
       showCarrierRange: false,// 显示窑车位置选择控件
       userKind: null,//用户类型
       loading: false,
+      IsPieceSingleFlag: true,
     }
   },
   methods: {
@@ -191,6 +192,11 @@ export default {
           this.userKind = res.data.userKind //节点操作
 
           this.pieceKind = res.data.pieceKind  //节点计件
+          if (this.pieceKind == '节点计件-批量') {
+            this.IsPieceSingleFlag = false;
+          } else {
+            this.IsPieceSingleFlag = true;
+          }
           if (this.userKind == this.$config.operationUserType.produceUser) { //节点工号-生产'
             this.formData.prodUserCode = this.$store.state.user.userCode
             this.formData.prodUserId = this.$store.state.user.id

src/view-app/app/piecework-procedure/in-kiln/index.vue

@@ -41,7 +41,7 @@
       </dk-app-table>
     </div>
     <!--  保存按钮-->
-    <div class="app_save_bottom-class">
+    <div class="app_save_bottom-class"  v-if="!IsPieceSingleFlag">
       <dk-app-button @click="save">{{ $t('appSave') }}
       </dk-app-button>
     </div>
@@ -69,11 +69,11 @@ export default {
       rows: [
         {name: 'uniqueCode', title: self.$t('appProductCodeB')},//产品编码
         {name: 'modelCode', title: self.$t('modelCode')},//型号编码
-        {name: 'modelName', title: self.$t('appmodelKindT')},//模具型号
+        {name: 'modelName', title: self.$t('productName')},//模具型号
         {name: 'logoName', title: self.$t('appLogoName')},//商标名称
         {name: 'moldingDate', title: self.$t('appFormingDate')},//成型日期
         {name: 'moldingUserCode', title: self.$t('appMoldingStationNo')},//成型工号
-        {name: 'modelMouldCode', title: self.$t('appMoldNo')},//模具编号
+        {name: 'moldlineItemCode', title: self.$t('appMoldNo')},//模具编号
         {name: 'colourName', title: self.$t('colourName')},//釉色名称
       ],//每一条的内容
       tableRowData: [],
@@ -95,6 +95,7 @@ export default {
       userKind: null,//用户类型
       pieceKind: null,//计件模式
       carCodeList: [],//车码集合
+      IsPieceSingleFlag:true,
     }
   },
   methods: {
@@ -122,6 +123,11 @@ export default {
           this.userKind = res.data.userKind //节点操作
 
           this.pieceKind = res.data.pieceKind  //节点计件
+          if (this.pieceKind == '节点计件-批量') {
+            this.IsPieceSingleFlag = false;
+          } else {
+            this.IsPieceSingleFlag = true;
+          }
           if(this.userKind == this.$config.operationUserType.produceUser){ //节点工号-生产'
             this.formData.prodUserCode = this.$store.state.user.userCode
             this.formData.prodUserId = this.$store.state.user.id
@@ -282,8 +288,9 @@ export default {
       this.formData.kilnId = null
       this.formData.kilnCode = ""
       this.formData.KilnCarNumber = ""
+     
       //计件模式不是单品清空明细
-      if (this.pieceKind != this.$config.processType.singleProduct) {
+      if ( !this.IsPieceSingleFlag ) {
         this.tableRowData = []
       }
       this.carCodeList = []//车码集合

src/view-app/app/piecework-procedure/out-kiln/index.vue

@@ -41,7 +41,7 @@
       </dk-app-table>
     </div>
     <!--  保存按钮-->
-    <div class="app_save_bottom-class">
+    <div class="app_save_bottom-class"  v-if="!IsPieceSingleFlag">
       <dk-app-button @click="save">{{ $t('appSave') }}
       </dk-app-button>
     </div>
@@ -69,11 +69,11 @@ export default {
       rows: [
         {name: 'uniqueCode', title: self.$t('appProductCodeB')},//产品编码
         {name: 'modelCode', title: self.$t('modelCode')},//型号编码
-        {name: 'modelName', title: self.$t('appmodelKindT')},//模具型号
+        {name: 'modelName', title: self.$t('productName')},//模具型号
         {name: 'logoName', title: self.$t('appLogoName')},//商标名称
         {name: 'moldingDate', title: self.$t('appFormingDate')},//成型日期
         {name: 'moldingUserCode', title: self.$t('appMoldingStationNo')},//成型工号
-        {name: 'modelMouldCode', title: self.$t('appMoldNo')},//模具编号
+        {name: 'moldlineItemCode', title: self.$t('appMoldNo')},//模具编号
         {name: 'colourName', title: self.$t('colourName')},//釉色名称
       ],//每一条的内容
       tableRowData: [],
@@ -95,6 +95,7 @@ export default {
       userKind: null,//用户类型
       pieceKind: null,//计件模式
       carCodeList: [],//车码集合
+      IsPieceSingleFlag:true,
     }
   },
   methods: {
@@ -123,6 +124,11 @@ export default {
           this.userKind = res.data.userKind //节点操作
 
           this.pieceKind = res.data.pieceKind  //节点计件
+          if (this.pieceKind == '节点计件-批量') {
+            this.IsPieceSingleFlag = false;
+          } else {
+            this.IsPieceSingleFlag = true;
+          }
           if(this.userKind === this.$config.operationUserType.produceUser){ //节点工号-生产'
             this.formData.prodUserCode = this.$store.state.user.userCode
             this.formData.prodUserId = this.$store.state.user.id
@@ -285,7 +291,7 @@ export default {
       this.formData.kilnCode = null
       this.formData.KilnCarNumber = ""
       //计件模式不是单品清空明细
-      if (this.pieceKind != this.$config.processType.singleProduct) {
+      if ( !this.IsPieceSingleFlag) {
         this.tableRowData = []
       }
       this.carCodeList = []//车码集合

src/view-app/app/piecework-procedure/recover/index.vue

@@ -309,9 +309,7 @@ export default {
      */
     setParams() {
       this.params = {...this.formData}
-      if (this.IsPieceSingleFlag) {//单点
-       
-      }
+      
       this.params.barCodeList = this.barCodeList
     },
     /**

src/view-app/app/piecework-procedure/register/index.vue

@@ -102,11 +102,11 @@ export default {
       rows: [
         { name: 'uniqueCode', title: self.$t('appProductCodeB') },         //产品编码
         { name: 'modelCode', title: self.$t('modelCode') },                //型号编码
-        { name: 'modelName', title: self.$t('appmodelKindT') },            //模具型号
+        { name: 'modelName', title: self.$t('productName') },            //产品名称
         { name: 'logoName', title: self.$t('appLogoName') },               //商标名称
         { name: 'moldingDate', title: self.$t('appFormingDate') },         //成型日期
         { name: 'moldingUserCode', title: self.$t('appMoldingStationNo') },//成型工号
-        { name: 'modelMouldCode', title: self.$t('appMoldNo') },           //模具编号
+        { name: 'moldlineItemCode', title: self.$t('appMoldNo') },           //模具编号
         { name: 'colourName', title: self.$t('colourName') },              //釉色名称
       ],//每一条的内容
       tableRowData: [],

src/view-app/app/piecework-procedure/uninstall-kiln/index.vue

@@ -28,7 +28,7 @@
       placeholderType="scan"></dk-app-field>
     <!--    窑炉车号-->
     <dk-app-field
-      :label="$t('appKilnCarNumber')"ref="appKilnCarNumber"
+      :label="$t('appKilnCarNumber')" ref="appKilnCarNumber"
       v-model="formData.KilnCarNumber"
       @changeBarCode="queryCarCode"
       :readonly="!formData.kilnCode"
@@ -41,7 +41,7 @@
       </dk-app-table>
     </div>
     <!--  保存按钮-->
-    <div class="app_save_bottom-class">
+    <div class="app_save_bottom-class" >
       <dk-app-button @click="save">{{ $t('appSave') }}
       </dk-app-button>
     </div>
@@ -70,11 +70,11 @@ export default {
       rows: [
         {name: 'uniqueCode', title: self.$t('appProductCodeB')},//产品编码
         {name: 'modelCode', title: self.$t('modelCode')},//型号编码
-        {name: 'modelName', title: self.$t('appmodelKindT')},//模具型号
+        {name: 'modelName', title: self.$t('productName')},//模具型号
         {name: 'logoName', title: self.$t('appLogoName')},//商标名称
         {name: 'moldingDate', title: self.$t('appFormingDate')},//成型日期
         {name: 'moldingUserCode', title: self.$t('appMoldingStationNo')},//成型工号
-        {name: 'modelMouldCode', title: self.$t('appMoldNo')},//模具编号
+        {name: 'moldlineItemCode', title: self.$t('appMoldNo')},//模具编号
         {name: 'colourName', title: self.$t('colourName')},//釉色名称
       ],//每一条的内容
       tableRowData: [],
@@ -96,6 +96,7 @@ export default {
       showStation: false,// 显示工位选择控件
       userKind: null,//用户类型
       carCodeList: [],//车码集合
+      IsPieceSingleFlag:true,
     }
   },
   methods: {
@@ -121,6 +122,11 @@ export default {
           this.userKind = res.data.userKind //节点操作
 
           this.pieceKind = res.data.pieceKind  //节点计件
+          if (this.pieceKind == '节点计件-批量') {
+            this.IsPieceSingleFlag = false;
+          } else {
+            this.IsPieceSingleFlag = true;
+          }
           if(this.userKind == this.$config.operationUserType.produceUser){ //节点工号-生产'
             this.formData.prodUserCode = this.$store.state.user.userCode
             this.formData.prodUserId = this.$store.state.user.id

src/view-app/app/prod-management/product-loss-reporting/index.vue

@@ -66,8 +66,8 @@ export default {
       clockList: [],
       rows: [
         { name: 'uniqueCode', title: self.$t('appProductCode') },//产品条码
-        { name: 'modelCode', title: self.$t('appModelCodeB') },//型号编码
-        { name: 'moldlineName', title: self.$t('appMoldingName') },//成型线名称
+        { name: 'moldlineItemCode', title: self.$t('appModelCode') },
+        { name: 'moldlineNo', title: self.$t('appMoldingNo') },//成型线名称
         { name: 'pdtFlowNodeName', title: self.$t('appCompleteTheProcess') },//完成工序
         { name: 'finishTime', title: self.$t('appFinishTime') },//完成日期
         { name: 'carrierCode', title: self.$t('appReasonCarrierCode') },//所在载具
@@ -143,6 +143,8 @@ export default {
             productName: res.data.modelName, //产品名称
             modelCode: res.data.modelMouldCode, //型号编码
             moldlineName: res.data.moldlineName, //成型线名称
+            moldlineItemCode: res.data.moldlineItemCode,
+            moldlineNo: res.data.moldlineNo,
             pdtFlowNodeName: res.data.pdtFlowNodeName, //完成工序
             logoName: res.data.logoName, //商标名称
             colourName: res.data.colourName,//釉色

src/view-app/app/prod-management/product-pending/cancel.vue

@@ -41,10 +41,11 @@ export default {
         barCode: null,//产品条码
       },
       rows: [
-        {name: 'pdtBarcode', title: self.$t('productCode')},//产品编码
+        {name: 'pdtBarcode', title: self.$t('appProductCode')},//产品编码
+        {name: 'modelName', title: self.$t('appModelProduct')},//产品型号
         {name: 'suspendName', title: self.$t('suspendName')},// 挂起单名                                         //员工名称
         {name: 'nodeName', title: self.$t('suspendNode')},//挂起工序                                              //员工名称
-        {name: 'createTime', title: self.$t('appOpCreateTime')},//创建时间                                            //员工名称
+        // {name: 'createTime', title: self.$t('appOpCreateTime')},//创建时间                                            //员工名称
 
       ],//每一条的内容
       productionList: [],//产品挂起明细数据

src/view-app/app/prod-management/product-pending/index.vue

@@ -70,7 +70,7 @@ export default {
       },
       showSuspendNode: false,//挂起工序选择框的显隐
       rows: [
-        {name: 'uniqueCode', title: self.$t('productCode')},//产品编码
+        {name: 'uniqueCode', title: self.$t('appProductCode')},//产品编码
         {name: 'modelCode', title: self.$t('modelCode')},//型号编码                                             //员工名称
         {name: 'nodeName', title: self.$t('currentNode')},//当前工序                                             //员工名称
         {

src/view-app/app/prod-management/view-carrier/index.vue

@@ -38,7 +38,7 @@ export default {
     return {
       rows: [
         {name: 'pdtBarcode', title: this.$t('appProductBarcode')},//产品条码
-        {name: 'modelCode', title: this.$t('appProductCodeB')},//产品编码
+        {name: 'modelCode', title: this.$t('appProductUniqueCode')},//产品编码
         {name: 'modelName', title: this.$t('appProductName')},//产品名称
         {name: 'flowNodeName', title: this.$t('appCurrentNode')},//生产工序
         {name: 'prodUserCode', title: this.$t('appProductionJobNumber')},//生产工号

src/view-app/app/prod-management/working-procedure-undo/index.vue

@@ -37,13 +37,13 @@ export default {
       routeFlag:false,
       rows: [
         { name: 'uniqueCode', title: self.$t('appProductCodeB') },         //产品编码
-        { name: 'modelCode', title: self.$t('modelCode') },                //型号编码
+        { name: 'modelCode', title: self.$t('appProductUniqueCode') },                //型号编码
         { name: 'moldingDate', title: self.$t('appFormingDate') },         //成型日期
         { name: 'finishTime', title: self.$t('appFinishTime') },           //完成日期
-        { name: 'pdtFlowNodeName', title: self.$t('appCompleteTheProcess') }, //完成工序
+        { name: 'scrapAgoNodeName', title: self.$t('appCompleteTheProcess') }, //完成工序
         { name: 'moldingUserCode', title: self.$t('appMoldingStationNo') },//成型工号
-        { name: 'modelMouldCode', title: self.$t('appMoldNo') },           //模具编号
-        { name: 'modelCode', title: self.$t('appProductUniqueCode') },   //产品编码
+        { name: 'moldlineItemCode', title: self.$t('appMoldNo') },           //模具编号
+
         { name: 'logoName', title: self.$t('appLogoName') },               //商标名称
         { name: 'colourName', title: self.$t('colourName') },              //釉色名称
       ],//每一条的内容

src/view/core/factory/index.vue

@@ -55,7 +55,7 @@
     >
       <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--  工厂编码  -->
-        <DkFormItem prop="ftyCode" :required="true">
+        <DkFormItem prop="ftyCode" :required="true" >
           <InputPop v-model="formData.ftyCode" ref="ftyCode"/>
         </DkFormItem>
         <!--  工厂名称  -->

src/view/core/staff/index.vue

@@ -51,8 +51,6 @@
         <DkTableColumn field="jobName" :title="$t('jobName2')"></DkTableColumn>
         <DkTableColumn field="postName"></DkTableColumn>
         <DkTableColumn field="staffStatusName"></DkTableColumn>
-        <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
-                       :switch-disabled="false"></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
       </DkTable>
     </div>
@@ -107,6 +105,7 @@
         <DkFormItem prop="staffStatus" :required="true">
           <SelectPop v-model="formData.staffStatus" ref="staffStatus" :multiple="false"
                      :options="staffStatusList"
+                     :disabled="modalParams.button === $config.formMode.edit"
                      labelKey="kindName"
                      valueKey="kindCode">
           </SelectPop>
@@ -176,6 +175,7 @@ export default {
      * @date   : 2022年12月13日15:38:58
      */
     onSwitchChange(param) {
+      //todo 2023年5月8日13:14:53  有效标识这列去掉
       if (param.flgValid) {
         this.excuteNoParam(this.$service.staffService, this.$service.staffService.enable, [param.staffId])
       } else {

src/view/mst/equip-thmeter/index.vue

@@ -61,7 +61,7 @@
           <InputPop v-model="formData.thmeterName" ref="thmeterName"/>
         </DkFormItem>
         <!--    工厂区域    -->
-        <DkFormItem prop="spaceId" :required="true" data-type="number">
+        <DkFormItem prop="spaceId"  data-type="number">
           <SelectPop v-model="formData.spaceId" ref="spaceName" :multiple="false"
                      :treeFlag="true"
                      :tree-strict="false"

src/view/mst/model-product/index.vue

@@ -182,7 +182,13 @@ export default {
      */
     getData(params) {
       // 查询数据
-      return this.excute(this.$service.modelProductService, this.$service.modelProductService.selectByCond, params);
+      let excute = this.excute(this.$service.modelProductService, this.$service.modelProductService.selectByCond, params);
+      excute.then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.erpTableData = []
+        }
+      });
+      return excute
     },
     /**
      * @desc   : 缩放查询条件

src/view/mst/molding/form.vue

@@ -72,13 +72,13 @@
             </SelectPop>
           </DkFormItem>
           <!--  绑定工序  -->
-          <DkFormItem prop="flowNodeId">
+          <DkFormItem prop="flowNodeId" :info="$config.mlodingInfo.flowNodeId">
             <SelectMagnifier ref="flowNodeId" v-model="formData.flowNodeId" :type="this.$config.MagnifierType.processNode"
             :other-condition="{flowKind: $config.flowKind.start, nodeKind: $config.nodeKind.shaping}"
                              @ok="chooseNode" :multiple="false" :display-text="formData.flowNodeName"/>
           </DkFormItem>
           <!--  绑定工位  -->
-          <DkFormItem prop="stationId">
+          <DkFormItem prop="stationId" :info="$config.mlodingInfo.stationId">
             <SelectMagnifier ref="stationId" v-model="formData.stationId" :type="this.$config.MagnifierType.station"
                              :other-condition="{flowNodeId: formData.flowNodeId}" :disabled="!formData.flowNodeId" :multiple="false"
                              @on-ok="(val)=>formData.stationId=val.stationId" :display-text="formData.stationName"/>
@@ -409,6 +409,7 @@ export default {
         if (!this.moldlineGroupColumn.some(s => s.field == 'repPdtModelName')) {
           this.moldlineGroupColumn.push(        {
             field: 'repPdtModelName',
+            title: this.$t('modelAfterBonding'),
             selectField: 'modelCode',
             width: 150,
             type: 'tableSelect',
@@ -429,6 +430,7 @@ export default {
           if (!this.moldlineItemColumn.some(s => s.field == 'repPdtModelName')) {
             this.moldlineItemColumn.push({
               field: 'repPdtModelName',
+              title: this.$t('modelAfterBonding'),
               selectField: 'modelCode',
               width: 150,
               type: 'tableSelect',
@@ -908,6 +910,7 @@ export default {
       if (!this.moldlineItemColumn.some(s => s.field == 'repPdtModelName')) {
         this.moldlineItemColumn.push({
           field: 'repPdtModelName',
+          title: this.$t('modelAfterBonding'),
           selectField: 'modelCode',
           width: 150,
           type: 'tableSelect',

src/view/mst/molding/index.vue

@@ -65,8 +65,8 @@
             <DkTableColumn field="groupNo" data-type="number"></DkTableColumn>
             <DkTableColumn field="groupName"></DkTableColumn>
             <DkTableColumn field="moldingUserNameList" :title="$t('moldingUserNames')"></DkTableColumn>
-            <DkTableColumn field="repPdtModelCode"></DkTableColumn>
-            <DkTableColumn field="repPdtModelName"></DkTableColumn>
+            <DkTableColumn field="repPdtModelCode" :title="$t('modelAfterBondingCode')"></DkTableColumn>
+            <DkTableColumn field="repPdtModelName" :title="$t('modelAfterBondingName')"></DkTableColumn>
             <DkTableColumn field="remarks" width="auto"></DkTableColumn>
           </DkTable>
 
@@ -167,7 +167,14 @@ export default {
      */
     getData(params) {
       // 查询数据
-      return this.excute(this.$service.moldlineService, this.$service.moldlineService.selectByCond, params)
+      let excute = this.excute(this.$service.moldlineService, this.$service.moldlineService.selectByCond, params)
+      excute.then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.groupData = []
+          this.itemData = []
+        }
+      });
+      return excute
     },
     /**
      * @desc   : switch停用启用

src/view/mst/mould-carryover/index.vue

@@ -315,7 +315,13 @@ export default {
      */
     getData(params) {
       // 查询数据
-      return this.excute(this.$service.mouldCarryoverService, this.$service.mouldCarryoverService.selectByCond, params);
+      let excute = this.excute(this.$service.mouldCarryoverService, this.$service.mouldCarryoverService.selectByCond, params);
+      excute.then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.prodCarryoverItem = []
+        }
+      });
+      return excute
     },
     /**
      * @desc   : 给参数赋值

src/view/mst/mould-manager/index.vue

@@ -172,7 +172,7 @@ export default {
     chooseGroup (e) {
       if (e && e.rows && e.rows.length > 0) {
         this.currentMoldline = e.rows[0].moldlineId
-        this.pdtGlueKind= e.row[0].pdtGlueKind
+        this.pdtGlueKind= e.rows[0].pdtGlueKind
         this.searchCond._value.groupId = e.rows[0].groupId
         this.searchData()
       } else {

src/view/mst/mould/form.vue

@@ -161,6 +161,7 @@ export default {
         // 可变更型号
         {
           field: 'repPdtModelName',
+          title:self.$t('repPdtModelNames'),
           width: 255,
           sortBoolean: false,
           controlId: 'modelId',

src/view/mst/mould/index.vue

@@ -577,7 +577,14 @@ export default {
      */
     getData(params) {
       // 查询数据
-      return this.excute(this.$service.mouldService, this.$service.mouldService.selectByCond, params);
+      let excute = this.excute(this.$service.mouldService, this.$service.mouldService.selectByCond, params)
+      excute.then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.mouldOutput = []
+        }
+      });
+      return excute
+
     },
     // endregion
 

src/view/mst/product-defect-type/index.vue

@@ -21,62 +21,62 @@
 
     <!--  查询条件区域  -->
     <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
-      <SearchCond ref="searchCond" v-model="searchCond"
-                  @collapse-change="collapseChange" :set-flag="false"
-                  :search-content="searchContent"></SearchCond>
+      <SearchCond ref="searchCond" v-model="searchCond" @collapse-change="collapseChange" :set-flag="false"
+        :search-content="searchContent"></SearchCond>
     </div>
-    <div>
-      <DkTable :id="'table-'+$options.name" ref="table-select" :data="tableData"
-               :pageFlag="true"
-               :page-total="pageInfo.total"
-               :current-page="pageInfo.currentPage"
-               :choose-flag="false"
-               :height="this.tableHeight" primaryKey="typeId"
-               @pageChange="pageSizeChange">
-        <DkTableColumn field="typeCode" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-        <DkTableColumn field="typeName"></DkTableColumn>
-        <DkTableColumn field="kindName"></DkTableColumn>
-        <DkTableColumn field="displayNo"></DkTableColumn>
-        <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
-                       :switch-disabled="false"></DkTableColumn>
-        <DkTableColumn field="remarks" width="auto"></DkTableColumn>
-      </DkTable>
+    <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
+      <DkSplit v-model="split">
+
+        <!-- 左边部分   -->
+        <DkTable slot="left" ref="leftTable" :data="leftData" :height="this.tableHeight" :page-flag="false"
+          :page-total-flag="false" :show-setting-flag="false" :freeze="false" :choose-flag="false"
+          @current-change="currentChangeEvent($event)">
+          <DkTableColumn :title="$t('defectKind')" field="kindName" width="auto" :filter="false" :sortable="false">
+          </DkTableColumn>
+        </DkTable>
+
+        <!-- 右边部分   -->
+        <DkTable slot="right" :id="'table-' + $options.name" ref="table-select" :data="tableData" :pageFlag="true"
+          :page-total="pageInfo.total" :current-page="pageInfo.currentPage" :choose-flag="false"
+          :height="this.tableHeight" primaryKey="typeId" @pageChange="pageSizeChange">
+          <DkTableColumn field="typeCode" type="link" @on-link="handleLink(Object.assign($event, { button: 'edit' }))">
+          </DkTableColumn>
+          <DkTableColumn field="typeName"></DkTableColumn>
+          <DkTableColumn field="kindName"></DkTableColumn>
+          <DkTableColumn field="displayNo"></DkTableColumn>
+          <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange" :switch-disabled="false">
+          </DkTableColumn>
+          <DkTableColumn field="remarks" width="auto"></DkTableColumn>
+        </DkTable>
+      </DkSplit>
+
     </div>
     <!--新建编辑-->
-    <DkModal
-      :loading="loading"
-      v-model="editAddModal"
-      ref="modal_editAdd"
-      @on-visible-change="handleVisibleModal"
-      @modalOk="save"
-      :saveFlag="true"
-      :title=modalTitle
-    >
+    <DkModal :loading="loading" v-model="editAddModal" ref="modal_editAdd" @on-visible-change="handleVisibleModal"
+      @modalOk="save" :saveFlag="true" :title=modalTitle>
       <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--   分类代码     -->
         <DkFormItem prop="typeCode" :required="true">
-          <InputPop v-model="formData.typeCode" ref="typeCode"/>
+          <InputPop v-model="formData.typeCode" ref="typeCode" />
         </DkFormItem>
         <!--    分类名称    -->
-        <DkFormItem prop="typeName" :required="true">
-          <InputPop v-model="formData.typeName" ref="typeName"/>
+        <DkFormItem prop="typeName" :required="typeRequired">
+          <InputPop v-model="formData.typeName" ref="typeName" />
         </DkFormItem>
         <!--    缺陷类别   -->
         <DkFormItem prop="defectKind" :required="true">
-          <SelectPop v-model="formData.defectKind" ref="defectKind" :multiple="false"
-                     :options="defectKindList"
-                     labelKey="kindName"
-                     valueKey="kindCode">
+          <SelectPop v-model="formData.defectKind" ref="defectKind" :multiple="false" :options="defectKindList"
+            @on-select-label="selectPopChange" labelKey="kindName" valueKey="kindCode">
           </SelectPop>
         </DkFormItem>
+
         <!--    显示顺序    -->
-        <DkFormItem prop="displayNo" :required="true"
-                    :data-type="this.$config.dataType.number">
-          <InputNumberPop v-model="formData.displayNo" ref="displayNo" :min="1" :digits="0"/>
+        <DkFormItem prop="displayNo" :required="true" :data-type="this.$config.dataType.number">
+          <InputNumberPop v-model="formData.displayNo" ref="displayNo" :min="1" :digits="0" />
         </DkFormItem>
         <!--    备注    -->
         <DkFormItem prop="remarks">
-          <InputPop v-model="formData.remarks" textareaFlag/>
+          <InputPop v-model="formData.remarks" textareaFlag />
         </DkFormItem>
       </DkForm>
     </DkModal>
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-import {indexMixin} from '@/mixins'
+import { indexMixin } from '@/mixins'
 
 export default {
   name: 'product-defect-type',
@@ -113,11 +113,15 @@ export default {
         },
         {
           itemCode: 'defectKind',
-          valueFormat: {code: 'defectKinds', data: [], valueKey: 'kindName', labelKey: 'kindCode',},
+          valueFormat: { code: 'defectKinds', data: [], valueKey: 'kindName', labelKey: 'kindCode', },
           valueKind: self.$config.docUserInput.mChoice
         },
         self.$config.flgValidSearch //有效标识
-      ]
+      ],
+      split: 0.2,// 分区的默认
+      leftData: [],
+      kindCode: '',
+      typeRequired: true
     }
   },
   methods: {
@@ -135,11 +139,43 @@ export default {
       }
     },
     /**
+     *   @desc   : 缺陷类别选择事件
+     *   @date   : 2023/05/08
+     *   @author : 于继渤
+     */
+    selectPopChange(e) {
+      //开模损/产品缺陷/损坯原因  分类名称非必填
+      if (e && e.kindCode && (e.kindCode === this.$t('kindQuality') || e.kindCode === this.$t('kindDamagedBillet') || e.kindCode === this.$t('kindMoldOpening'))) {
+        this.typeRequired = false
+      } else {
+        this.typeRequired = true
+      }
+
+    },
+    /**
+       * @desc   : 左侧列表行变化事件
+       * @author : 于继渤
+       * @date   : 2023/5/6 9:23
+       */
+    currentChangeEvent({ row }) {
+      if (row != null) {
+        this.kindCode = row.kindCode
+        // 导出额外的条件
+        this.exportCondition = { kindCode: this.kindCode }
+        let params = this.params
+        params.kindCode = row.kindCode
+        //查询型号类别列表的数据-右侧列表
+        this.searchData(params)
+      }
+    },
+
+    /**
      *   @desc   : 获取数据
      *   @date   : 2022/12/21
      *   @author : 洪旭东
      */
     getData(params) {
+      params.defectKind = this.kindCode
       // 查询数据
       return this.excute(this.$service.productDefectTypeService, this.$service.productDefectTypeService.selectByCond, params);
     },
@@ -185,6 +221,12 @@ export default {
           let list = this.searchContent.filter(it => it.valueFormat.code == 'defectKinds')
           if (list.length > 0) {
             list[0].valueFormat.data = res.data
+            //左侧列表数据赋值
+            this.leftData = res.data
+            if (this.leftData && this.leftData.length > 0) {
+              this.kindCode = this.leftData[0].kindCode
+              this.exportCondition = { kindCode: this.kindCode }
+            }
           }
         }
       })
@@ -228,7 +270,7 @@ export default {
      *   @author : 洪旭东
      */
     setParams() {
-      this.params = {...this.formData}
+      this.params = { ...this.formData }
     },
     /**
      *   @desc   : 保存数据
@@ -248,20 +290,19 @@ export default {
     detail(id) {
       this.excuteNoParam(this.$service.productDefectTypeService, this.$service.productDefectTypeService.selectById,
         [id], false).then(res => {//调用api查询方法
-        if (res.code === this.$config.SUCCESS_CODE) {
-          this.formData = res.data
-        }
-      })
+          if (res.code === this.$config.SUCCESS_CODE) {
+            this.formData = res.data
+          }
+        })
     },
     // endregion
   },
   created() {
     this.primaryKey = 'typeId'  // 设置主键Id
     this.routeObjName = 'productDefectType'  // 设置路由名称
+    this.initSearchFlag = false;  // 初始不进行默认查询
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/view/mst/product-view/config/ProductView.js

@@ -822,7 +822,16 @@ export default class Product {
       shape: 'custom-circle',
       label: '',
     })
-    stencil.load([r1, r2, r3, r4, r5, r6], 'group')
+    const r7 = this.graph.createNode({
+      shape: 'custom-polygon',
+      attrs: {
+        body: {
+          refPoints: '10,10 0,40 50,40 40,10',
+        },
+      },
+      label: '',
+    })
+    stencil.load([r1, r2, r3, r4, r5, r6,r7], 'group')
 
     // endregion
 

src/view/pdm/data-collection/climbKiln.vue

@@ -37,7 +37,7 @@
                :height="this.tableHeight" primaryKey="prodId"
                :choose-flag="false">
         <!--产品条码-->
-        <DkTableColumn field="uniqueCode" :title="$t('appProductCode')"></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="$t('pdtBarcode')"></DkTableColumn>
         <!--窑炉编码-->
         <DkTableColumn field="kilnCode"></DkTableColumn>
         <!--窑车编码-->

src/view/pdm/data-collection/finishCheck.vue

@@ -40,7 +40,7 @@
                  @current-change="currentChange($event)"
                  name="table">
           <!--产品条码-->
-          <DkTableColumn field="uniqueCode" :title="$t('appProductCode')"></DkTableColumn>
+          <DkTableColumn field="uniqueCode" :title="$t('pdtBarcode')"></DkTableColumn>
           <!--产品等级-->
           <DkTableColumn field="opnGradeName" :title="$t('gradeKind')"></DkTableColumn>
           <!--产品编码-->

src/view/pdm/data-collection/halfCheck.vue

@@ -38,9 +38,9 @@
                  @current-change="currentChange($event)"
                  name="table">
           <!--产品条码-->
-          <DkTableColumn field="uniqueCode" :title="$t('appProductCode')"></DkTableColumn>
+          <DkTableColumn field="uniqueCode" :title="$t('pdtBarcode')"></DkTableColumn>
           <!--产品等级-->
-          <DkTableColumn field="opnGradeName" :title="$t('gradeKind')"></DkTableColumn>
+          <DkTableColumn field="opnGradeName" :title="$t('productGrade')"></DkTableColumn>
           <!--产品编码-->
           <DkTableColumn field="modelCode" :title="$t('productCode')"></DkTableColumn>
           <!--产品名称-->

src/view/pdm/data-collection/inKiln.vue

@@ -37,7 +37,7 @@
                :height="this.tableHeight" primaryKey="prodId"
                :choose-flag="false">
         <!--产品条码-->
-        <DkTableColumn field="uniqueCode" :title="$t('appProductCode')"></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="$t('pdtBarcode')"></DkTableColumn>
         <DkTableColumn field="kilnCode"></DkTableColumn>
         <!--窑车编码-->
         <DkTableColumn field="kilnCarCode" :title="$t('carCode')"></DkTableColumn>

src/view/pdm/data-collection/outKiln.vue

@@ -37,7 +37,7 @@
                :height="this.tableHeight" primaryKey="prodId"
                :choose-flag="false">
         <!--产品条码-->
-        <DkTableColumn field="uniqueCode" :title="$t('appProductCode')"></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="$t('pdtBarcode')"></DkTableColumn>
         <DkTableColumn field="kilnCode"></DkTableColumn>
         <!--窑车编码-->
         <DkTableColumn field="kilnCarCode" :title="$t('carCode')"></DkTableColumn>

src/view/pdm/data-collection/recover.vue

@@ -34,7 +34,7 @@
                :height="this.tableHeight" primaryKey="prodId"
                :choose-flag="false">
         <!--产品条码-->
-        <DkTableColumn field="uniqueCode" :title="$t('appProductCode')"></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="$t('pdtBarcode')"></DkTableColumn>
         <!--产品编码-->
         <DkTableColumn field="modelCode" :title="$t('productCode')"></DkTableColumn>
         <!--产品名称-->

src/view/pdm/data-collection/register.vue

@@ -34,7 +34,7 @@
                :height="this.tableHeight" primaryKey="prodId"
                :choose-flag="false">
         <!--产品条码-->
-        <DkTableColumn field="uniqueCode" :title="$t('appProductCode')"></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="$t('pdtBarcode')"></DkTableColumn>
         <!--产品编码-->
         <DkTableColumn field="modelCode" :title="$t('productCode')"></DkTableColumn>
         <!--产品名称-->

src/view/pdm/data-collection/uninstallKiln.vue

@@ -35,7 +35,7 @@
                :height="this.tableHeight" primaryKey="prodId"
                :choose-flag="false">
         <!--产品条码-->
-        <DkTableColumn field="uniqueCode" :title="$t('appProductCode')"></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="$t('pdtBarcode')"></DkTableColumn>
         <!--窑炉编码-->
         <DkTableColumn field="kilnCode"></DkTableColumn>
         <!--窑车编码-->

src/view/pdm/molding-record/bind-barcode-group.vue

@@ -26,9 +26,14 @@
                     @click="bindBarcodeButton" style="margin-right: 10px">{{ $v('bindBarcode') }}
           </DkButton>
           <!--    清空条码    -->
-          <DkButton :disabled="productUniqueCodeCount==moldingRecordList.length" @click="clearBindBarcode">{{
+          <DkButton :disabled="productUniqueCodeCount==moldingRecordList.length"
+                    @click="clearBindBarcode" style="margin-right: 10px">{{
             $v('clearBindBarcode') }}
           </DkButton>
+          <!--    撤销条码    -->
+          <DkButton :disabled="productUniqueCodeCount==0" @click="revokeBindBarcode">{{
+            $v('revokeBindBarcode') }}
+          </DkButton>
         </DkForm>
       </DkPanel>
 
@@ -79,9 +84,11 @@
         productUniqueCodeCount: 0,//绑定条码个数(如果长度和查询数据长度一致则不能进行绑定条码)
         //成型记录明细列表
         moldingRecordTreeColumns: [
+          { type: 'checkbox', },
           // 可变更产品名称
           {
             field: 'repPdtModelName',
+            title: self.$t('modelAfterBonding'),
             dataType: self.$config.tableSelectType.product, controlId: 'pdtModelId',
             treeNode: true, type: 'disabled', width: 'auto'
           },
@@ -272,6 +279,26 @@
         this.$refs.moldingRecord.reloadData(this.moldingRecordList)
       },
       /**
+       *   @desc   : 撤销条码
+       *   @date   : 2023/5/8 9:53
+       *   @author : 寇珊珊
+       */
+      revokeBindBarcode() {
+        let pdtUniqueIdList = this.$refs['moldingRecord'].$refs.xTable.getCheckboxRecords().map(map => map.pdtUniqueId)
+        if (pdtUniqueIdList.length == 0) {
+          this.$Message.error(this.$t('W_150'))
+          return
+        }
+        this.excute(this.$service.productService, this.$service.productService.undo, pdtUniqueIdList).then(res => {
+          if (res.code === this.$config.SUCCESS_CODE) {
+            this.$Message.success(res.message)
+            this.detail(this.$route.params.id)
+          } else {
+            this.$Message.error(res.message)
+          }
+        })
+      },
+      /**
        *   @desc   : 值改变
        *   @date   : 2023/2/28 11:23
        *   @author : 寇珊珊

src/view/pdm/molding-record/bind-barcode.vue

@@ -23,9 +23,14 @@
                     @click="bindBarcodeButton" style="margin-right: 10px">{{ $v('bindBarcode') }}
           </DkButton>
           <!--    清空条码    -->
-          <DkButton :disabled="productUniqueCodeCount==moldingRecordList.length" @click="clearBindBarcode">{{
+          <DkButton :disabled="productUniqueCodeCount==moldingRecordList.length"
+                    style="margin-right: 10px" @click="clearBindBarcode">{{
             $v('clearBindBarcode') }}
           </DkButton>
+          <!--    撤销条码    -->
+          <DkButton :disabled="productUniqueCodeCount==0" @click="revokeBindBarcode">{{
+            $v('revokeBindBarcode') }}
+          </DkButton>
         </DkForm>
       </DkPanel>
 
@@ -70,6 +75,7 @@
         moldingRecordList: [],// 成型记录明细信息
         // 成型记录明细列表
         moldingRecordColumns: [
+          { type: 'checkbox', },
           // 成型线编码
           { field: 'uniqueCode', title: self.$t('moldlineCode'), type: 'disabled', width: 'auto' },
           // 成型线名称
@@ -158,7 +164,7 @@
         let index = 0
         let zeroFlag = true
         let zeroStr = ''
-        if (lastNum.length>1 && lastNum.substring(0, 1) == '0') {
+        if (lastNum.length > 1 && lastNum.substring(0, 1) == '0') {
           zeroFlag = false
           for (let it of lastNum) {
             if (it == '0') {
@@ -232,6 +238,26 @@
         }
       },
       /**
+       *   @desc   : 撤销条码
+       *   @date   : 2023/5/8 9:53
+       *   @author : 寇珊珊
+       */
+      revokeBindBarcode() {
+        let pdtUniqueIdList = this.$refs['moldingRecord'].$refs.xTable.getCheckboxRecords().map(map => map.pdtUniqueId)
+        if (pdtUniqueIdList.length == 0) {
+          this.$Message.error(this.$t('W_150'))
+          return
+        }
+        this.excute(this.$service.productService, this.$service.productService.undo, pdtUniqueIdList).then(res => {
+          if (res.code === this.$config.SUCCESS_CODE) {
+            this.$Message.success(res.message)
+            this.detail(this.$route.params.id)
+          } else {
+            this.$Message.error(res.message)
+          }
+        })
+      },
+      /**
        *   @desc   : 值改变
        *   @date   : 2023/2/28 11:23
        *   @author : 寇珊珊
@@ -247,13 +273,13 @@
        */
       detail(id) {
         //绑定条码计数 每次查询之前要清零(因为保存后要重新调用）
-        this.productUniqueCodeCount=0
+        this.productUniqueCodeCount = 0
         let param = {
-          'moldlineId':parseInt(id),
+          'moldlineId': parseInt(id),
           'pdtGlueKind': this.$route.query.pdtGlueKind,
           'moldingBatch': this.$route.query.moldingBatch,
           'moldingDate': this.$route.query.moldingDate,
-          'ftyId' : this.$store.state.user.ftyId
+          'ftyId': this.$store.state.user.ftyId
         }
         return this.excute(this.$service.moldingRecordItemService, this.$service.moldingRecordItemService.selectByMoldineId, param).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
@@ -262,7 +288,7 @@
             this.moldingRecordList = list
             for (let i of  this.moldingRecordList) {
               i.moldingItemId = i.itemId
-              if (i.productUselectProductByBindBarcodeniqueCode) {
+              if (i.productUniqueCode) {
                 this.$set(i, 'readOnly', ['productUniqueCode'])
                 i.readOnlyUniqueCode = true
                 this.productUniqueCodeCount++
@@ -336,7 +362,7 @@
       },
     },
     created() {
-      this.resizeTableFlag = true;  // 计算表格高度
+      this.resizeTableFlag = true  // 计算表格高度
     },
     activated() {
       this.detail(this.$route.params.id)

src/view/pdm/molding-record/damage.vue

@@ -100,16 +100,6 @@ export default {
         {field: 'moldlineCode', type: 'disabled'},
         // 成型线名称
         {field: 'moldlineName', type: 'disabled'},
-        // 分组序号
-        {field: 'moldlineGroupNo', type: 'disabled'},
-        // 成型班长
-        {field: 'manageUserName', type: 'disabled'},
-        // 成型工号
-        {field: 'moldingUserName', type: 'disabled',width: '90'},
-        // 产品编码
-        {field: 'pdtModelCode', type: 'disabled'},
-        // 产品名称
-        {field: 'pdtModelName', type: 'disabled', title: self.$t('productName')},
         // 开模损标识
         {field: 'flgScrap', type: 'switch', controlId: 'flgScrap',width: '90'},
         // 开模损原因
@@ -121,10 +111,20 @@ export default {
           valueKey: 'defectId',
           width: '200'
         },
+        // 分组序号
+        {field: 'moldlineGroupNo', type: 'disabled'},
+        // 成型班长
+        {field: 'manageUserName', type: 'disabled'},
+        // 成型工号
+        {field: 'moldingUserName', type: 'disabled',width: '90'},
+        // 产品编码
+        {field: 'pdtModelCode', type: 'disabled'},
+        // 产品名称
+        {field: 'pdtModelName', type: 'disabled', title: self.$t('productName')},
         // 模具编号
-        {field: 'moldlineItemCode', type: 'disabled'},
+        {field: 'moldlineItemCode', type: 'disabled',title: self.$t('moldingModelCode')},
         // 模具状态
-        {field: 'moldlineItemKindName', type: 'disabled' ,width: '110'},
+        {field: 'moldlineItemKindName', type: 'disabled' ,title:self.$t('mouldKind'), width: '110'},
         // 成型批次
         {field: 'moldingBatch', type: 'disabled',number:true ,width: '90'},
         // 成型标识

src/view/pdm/molding-record/form.vue

@@ -77,6 +77,7 @@
         :freeze="false"
         :multiple="true"
         :clearCheckFlag="false"
+        :auto-width-flag="false"
         primaryKey="groupId"
         @current-change="currentChangeEvent">
         <DkTableColumn field="uniqueCode" :title="$t('moldlineCode')" width="100"></DkTableColumn>
@@ -479,6 +480,14 @@ export default {
             })
           }
           this.moldlineList = table
+          for(let it of this.moldlineList){
+            if (it.moldingUsersList && it.moldingUsersList.length === 1){
+              this.$nextTick(()=>{
+                it.moldingUserId = it.moldingUsersList[0].userId;
+                it['moldingUserId_Name'] = it.moldingUsersList[0].userCode
+              })
+            }
+          }
         } else {
           this.$Message.error(res.message)
           this.moldlineList = []

src/view/pdm/molding-user-change/index.vue

@@ -1,3 +1,4 @@
+<!-- @desc:工号变更  @auth:周兴  @time:2023/5/6 15:58 -->
 <template>
   <div class="main-div" ref="mainDiv">
     <!--加载中-->
@@ -41,9 +42,9 @@
         <!-- 产品编码-->
         <DkTableColumn :title="$t('productCode')" field="modelCode"></DkTableColumn>
         <!-- 产品编码-->
-        <DkTableColumn field="moldlineItemCode"></DkTableColumn>
+        <DkTableColumn field="moldlineItemCode" :title="$t('moldingModelCode')"></DkTableColumn>
         <!-- 模具状态-->
-        <DkTableColumn field="moldlineItemKindName"></DkTableColumn>
+        <DkTableColumn field="moldlineItemKindName" :title="$t('mouldKind')"></DkTableColumn>
         <!-- 成型标识-->
         <DkTableColumn field="flgMolding" type="switch"
                        :switch-disabled="true"></DkTableColumn>

src/view/pdm/process-node-reverse/index.vue

@@ -34,11 +34,11 @@
                :height="this.tableHeight" primaryKey="prodId"
                :choose-flag="false">
         <!--产品条码-->
-        <DkTableColumn field="uniqueCode" :title="$t('appProductCode')"></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="$t('pdtBarcode')"></DkTableColumn>
         <!--产品编码-->
         <DkTableColumn field="modelCode"></DkTableColumn>
         <!--产品名称-->
-        <DkTableColumn field="modelName"></DkTableColumn>
+        <DkTableColumn field="modelName" :title="$t('productName')"></DkTableColumn>
         <!--生产工号-->
         <DkTableColumn field="prodUserCode"></DkTableColumn>
         <!--成型线位置编码-->

src/view/pdm/prod-carryover/index.vue

@@ -334,7 +334,13 @@ export default {
      */
     getData(params) {
       // 查询数据
-      return this.excute(this.$service.prodCarryoverService, this.$service.prodCarryoverService.selectByCond, params);
+      let excute =  this.excute(this.$service.prodCarryoverService, this.$service.prodCarryoverService.selectByCond, params);
+      excute.then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.prodCarryoverItem = []
+        }
+      });
+      return excute
     },
     /**
      * @desc   : 给参数赋值

src/view/pdm/prod-check/index.vue

@@ -1,4 +1,4 @@
-<!-- @desc:在产盘点  @auth:寇珊珊  @time:2023年3月23日13:23:58 -->
+<!-- @desc:在制品盘点  @auth:寇珊珊  @time:2023年3月23日13:23:58 -->
 <template>
   <div class="main-div" ref="mainDiv">
     <!--加载中-->
@@ -86,7 +86,7 @@
                 <!-- 完成时间-->
                 <DkTableColumn field="finishTime" ></DkTableColumn>
                 <!-- 产品等级-->
-                <DkTableColumn field="pdtGradeKind" :title="$t('gradeKindName')" ></DkTableColumn>
+                <DkTableColumn field="pdtGradeKind" :title="$t('productGrade')" ></DkTableColumn>
                 <!-- 产品编码-->
                 <DkTableColumn field="modelCode" :title="$t('productCode')" ></DkTableColumn>
                 <!-- 产品名称-->

src/view/pdm/prod-code-change/index.vue

@@ -10,7 +10,8 @@
         <!--清空查询条件-->
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <!--更改-->
-        <BaseIndexButton right-button="productColourLogo-productLogoColour" ref="changeModel" name="changeModel" :is-must-choose-flag="false"></BaseIndexButton>
+        <BaseIndexButton right-button="productColourLogo-productLogoColour" ref="changeModel" name="changeModel"
+                         :is-must-choose-flag="false"></BaseIndexButton>
       </template>
     </BaseIndexButtonGroup>
     <!--  查询条件区域  -->
@@ -38,7 +39,7 @@
         <!-- 变更者-->
         <DkTableColumn :title="$t('changeUser')" field="opCreateUserName"></DkTableColumn>
         <!-- 变更时间-->
-        <DkTableColumn field="hisTime"></DkTableColumn>
+        <DkTableColumn field="hisTime" width="auto"></DkTableColumn>
       </DkTable>
     </div>
 
@@ -50,199 +51,281 @@
       @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
+      width="1000px"
       :title=modalTitle
     >
-      <DkForm ref="formInline" v-model="formData" :col-count="1" :label-max-words="5">
-        <!--   产品条码     -->
-        <DkFormItem prop="itemId" :required="true" :data-type="$config.dataType.number" :label="$t('pdtBarcode')">
-          <SelectMagnifier v-model="formData.itemId" :display-text="formData.pdtBarcode"
-                           :type="this.$config.MagnifierType.getProductModel"
-                           :multiple="false"
-                           :inputReadOnly="false"
-                           ref="pdtBarcode"
-                           @ok="chooseLogoColour"
-                           @modelOk="setPdtBarcode"
-          ></SelectMagnifier>
-        </DkFormItem>
-        <!-- 原型号 -->
-        <DkFormItem prop="oldModelName">
-          <InputPop v-model="formData.oldModelName" :readonly="true" ref="oldModelName"/>
-        </DkFormItem>
+      <BaseIndexButtonGroup id="ButtonGroup">
+        <template #left>
+          <BaseIndexButton ref="search" name="search" @click="selectProcudt"></BaseIndexButton>
+          <BaseIndexButton :finalFlag="true" ref="clear" name="clear"
+                           @click="$refs['searchCond'].clearCondition()"></BaseIndexButton>
+        </template>
+      </BaseIndexButtonGroup>
+      <SearchCond id="search-modal-cond-div" width="900px" v-if="searchModalContent && searchModalContent.length > 0"
+                  ref="searchCond"
+                  v-model="searchModalCond" :setFlag="false" :searchContent="searchModalContent"
+                  :col-count="4"></SearchCond>
+      <div style="width: 100%;height: 10px"></div>
+
+      <DkForm ref="formInline" v-model="formData" :col-count="2" :label-max-words="5">
         <!-- 新型号 -->
-        <DkFormItem :label="$t('newModel')" prop="pdtModelId">
+        <DkFormItem :label="$t('newModel')" prop="pdtModelId" :required="true">
           <SelectMagnifier v-model="formData.pdtModelId" :display-text="formData.pdtModelName"
                            :type="this.$config.MagnifierType.product"
                            :multiple="false"
                            :inputReadOnly="false"
-                           :disabled='newEnable'
                            ref="pdtModelId"
+                           @ok="chooseModel"
           ></SelectMagnifier>
         </DkFormItem>
       </DkForm>
+      <!--明细-->
+      <div>
+        <!--明细-->
+        <DkTable ref="detail-table-select" :data="detailList" multiple
+                 :height="tableHeight-400" primaryKey="moldingId"
+                 :pageFlag="true"
+                 :pageTotalFlag="false"
+                 @pageChange="pageSizeModalChange"
+                 :page-total="modalPageInfo.total"
+                 :current-page="modalPageInfo.currentPage"
+                 :linkClickChecked="true"
+                 :show-setting-flag="false"
+                 name="table">
+          <DkTableColumn field="moldlineCode"></DkTableColumn>
+          <DkTableColumn field="moldlineName"></DkTableColumn>
+          <DkTableColumn field="moldingDate"></DkTableColumn>
+          <DkTableColumn field="moldingBatch"></DkTableColumn>
+          <DkTableColumn field="productCode" :title="$t('pdtBarcode')"></DkTableColumn>
+          <DkTableColumn field="itemMoldingUserName" :title="$t('moldingUserId')"></DkTableColumn>
+          <DkTableColumn field="modelCode" :title="$t('productCode')"></DkTableColumn>
+          <DkTableColumn field="modelName" :title="$t('productName')"></DkTableColumn>
+          <DkTableColumn field="groupNo"></DkTableColumn>
+          <DkTableColumn field="groupName"></DkTableColumn>
+          <DkTableColumn field="moldlineItemCode" :title="$t('moldingModelCode')"></DkTableColumn>
+          <DkTableColumn field="moldlineItemKindName" :title="$t('moldStatus')"></DkTableColumn>
+          <DkTableColumn field="flgScrap" :switch-disabled=true type="switch"></DkTableColumn>
+          <DkTableColumn field="flgMolding" :switch-disabled=true type="switch"></DkTableColumn>
+          <DkTableColumn field="unmoldedReasonName"></DkTableColumn>
+          <DkTableColumn field="thisMoldedNum" :dataType="$config.dataType.number"></DkTableColumn>
+          <DkTableColumn field="opCreateTime"></DkTableColumn>
+          <DkTableColumn field="opCreateUserName" width="auto"></DkTableColumn>
+        </DkTable>
+      </div>
     </DkModal>
 
   </div>
 </template>
 
 <script>
-import {indexMixin} from "@/mixins";
-
-export default {
-  mixins: [indexMixin],
-  name: "prod-code-change",
-  data() {
-    return {
-      searchContent: [
-        {
-          itemCode: 'pdtBarcode',//成型线编码
-        }
-      ],
-      changeModal: false,//窗口显示
-      modalTitle: '',//窗口名称
-      formData: {
-        itemId: '',//成型明细id
-        pdtModelId: null,//型号id
-        pdtBarcode: '',//产品条码
-        oldModelName: '',//原型号名称
-      },
-      modelList: [],//型号
-      newEnable: true, //启用、禁用新型号，新型号（true 禁用 false 启用）
-    }
-  },
-  methods: {
-    //region 一览
-    /**
-     * @desc   : 设置查询条件
-     * @author : 夏常明
-     * @date   : 2023/1/12 11:24
-     */
-    setSearchParams(params) {
-      //成型记录履历类型
-      params.hisTypeList = [this.$config.moldingItemHisType.modelAfter];
-      return params
-    },
-    /**
-     * @desc   : 获取数据
-     * @author : 夏常明
-     * @date   : 2023/2/21 10:39
-     */
-    getData(params) {
-      // 查询数据
-      return this.excute(this.$service.moldingItemHisService, this.$service.moldingItemHisService.selectByCond, params);
-    },
-    /**
-     * @desc   : 放大镜控件绑定值
-     * @author : 洪旭东
-     * @date   : 2023-04-19 14:01
-     */
-    chooseLogoColour(rows) {
-      if (rows && rows.length > 0) {
-        this.formData.pdtBarcode = rows[0].pdtBarcode;
-        this.formData.itemId = rows[0].itemId;
-        this.formData.oldModelName = rows[0].modelName;
-        this.formData.productId = rows[0].productId;
-        this.newEnable = false;
-      }else{
-        this.formData.pdtBarcode = null;
-        this.formData.itemId = null;
-        this.formData.oldModelName = null;
-        this.formData.productId = null
+  import { indexMixin } from '@/mixins'
+
+  export default {
+    mixins: [indexMixin],
+    name: 'prod-code-change',
+    data() {
+      let self = this
+      return {
+        searchContent: [
+          {
+            itemCode: 'pdtBarcode',//成型线编码
+          }
+        ],
+        changeModal: false,//窗口显示
+        modalTitle: '',//窗口名称
+        formData: {
+          pdtModelId: null,//型号id
+          pdtModelName: null,//型号名称
+        },
+        detailList: [],//明细
+        modelList: [],//型号
+        modalPageInfo: {
+          total: 0,
+          pageSize: this.$config.pageSize,
+          currentPage: 1
+        },
+        // 变更型号弹窗查询条件
+        searchModalCond: {},
+        searchModalContent: [
+          //成型线
+          {
+            itemCode: 'moldlineName',
+            valueFormat: { code: 'moldlineId' },
+            itemName: 'appFormingLine',
+            valueKind: self.$config.docUserInput.sSearch, //单选/多选放大镜
+            magnifierType: self.$config.MagnifierType.moldline,
+          },
+          //成型分组
+          {
+            itemCode: 'groupName',
+            valueFormat: { code: 'groupId' },
+            itemName: 'groupName',
+            valueKind: self.$config.docUserInput.sSearch,//单选/多选放大镜
+            magnifierType: self.$config.MagnifierType.moldlineGroup,
+          },
+          //成型日期
+          {
+            itemCode: 'moldingDate',
+            valueFormat: { code: 'moldingDate', default: new Date().toDateStr() },
+            valueKind: 'DATE',
+            clearable: false
+          },
+          //成型批次
+          {
+            itemCode: 'moldingBatch',
+          },
+          //产品条码
+          {
+            itemCode: 'pdtBarcode',
+            valueFormat: { code: 'pdtUniqueId' },
+            itemName: 'pdtBarcode',
+            valueKind: self.$config.docUserInput.sSearch,//单选/多选放大镜
+            magnifierType: self.$config.MagnifierType.getProductModel,
+          },
+
+        ],
       }
     },
-    /**
-     * @desc   : 放大镜输入事件
-     * @author : 洪旭东
-     * @date   : 2023-04-19 14:00
-     */
-    setPdtBarcode(val) {
-      if (val) {
-        this.newEnable = false;
-      } else {
-        this.newEnable = true;
+    methods: {
+
+      //region 弹窗打开后选择事件和查询事件
+      /**
+       *   @desc   : 选择新的产品
+       *   @date   : 2023/5/6 15:30
+       *   @author : 寇珊珊
+       */
+      chooseModel(rows) {
+        if (rows) {
+          this.formData.pdtModelId = rows[0].pdtModelId
+          this.formData.pdtModelName = rows[0].pdtModelName
+        }
+      },
+      /**
+       *   @desc   : 弹窗分页
+       *   @date   : 2023/5/6 17:18
+       *   @author : 寇珊珊
+       */
+      pageSizeModalChange(pageInfo) {
+        this.modalPageInfo = pageInfo
+        this.selectProcudt()
+      },
+      /**
+       *   @desc   : 变更型号打开事件
+       *   @date   : 2023/5/6 15:09
+       *   @author : 寇珊珊
+       */
+      changeModel() {
+        this.modalTitle = this.setTitle('setModel')
+        this.changeModal = true
+      },
+      /**
+       *   @desc   : 弹窗打开后-查询型号设定
+       *   @date   : 2023/5/8 16:19
+       *   @author : 寇珊珊
+       */
+      selectProcudt() {
+        this.loading =true
+        let params = {
+          ftyId: this.$store.state.user.ftyId,
+          manageUser: this.$store.state.user.id,
+          currentPage: this.modalPageInfo.currentPage,
+          pageSize: this.modalPageInfo.pageSize
+        }
+        if (this.searchModalCond) {
+          params = Object.assign(params, this.searchModalCond._value)
+        }
+        this.excute(this.$service.moldingRecordService, this.$service.moldingRecordService.selectMoldingGiveCodeChange, params).then(res => {//调用api查询方法
+          if (res.code === this.$config.SUCCESS_CODE) {
+            this.loading = false
+            this.detailList = res.data.list
+            this.modalPageInfo.total = res.data.total
+          }
+        })
+      },
+
+      //endregion
+
+
+      //region 一览
+      /**
+       * @desc   : 设置查询条件
+       * @author : 夏常明
+       * @date   : 2023/1/12 11:24
+       */
+      setSearchParams(params) {
+        //成型记录履历类型
+        params.hisTypeList = [this.$config.moldingItemHisType.modelAfter]
+        return params
+      },
+      /**
+       * @desc   : 获取数据
+       * @author : 夏常明
+       * @date   : 2023/2/21 10:39
+       */
+      getData(params) {
+        // 查询数据
+        return this.excute(this.$service.moldingItemHisService, this.$service.moldingItemHisService.selectByCond, params)
+      },
+      /**
+       * @desc   : 清空数据
+       * @author : 洪旭东
+       * @date   : 2023-04-19 14:00
+       */
+      clear() {
         this.formData = {
-          oldModelName: '',//原型号名称
+          pdtUniqueId: '',//成型明细id
+          pdtModelId: null,//型号id
         }
-      }
-    },
-    /**
-     * @desc   : 放大镜控件绑定值--产品型号
-     * @author : 洪旭东
-     * @date   : 2023-04-19 14:00
-     */
-    chooseColour(rows) {
-      if (rows) {
-        this.formData.oldModelName = rows[0].modelName;
-        this.formData.pdtBarcode = rows[0].pdtBarcode;
-        this.formData.itemId = rows[0].itemId;
-      }
-    },
-    /**
-     * @desc   : 型号设定按钮事件
-     * @author : 夏常明
-     * @date   : 2023/2/21 13:14
-     */
-    changeModel() {
-      this.modalTitle = this.setTitle('setModel')
-      this.changeModal = true
-      this.$nextTick(()=>{
-        // 打开选择界面
-        this.$refs.pdtBarcode.magnifierClick();
-      })
-    },
-    /**
-     * @desc   : 清空数据
-     * @author : 洪旭东
-     * @date   : 2023-04-19 14:00
-     */
-    clear() {
-      this.formData = {
-        itemId: '',//成型明细id
-        pdtModelId: null,//型号id
-        pdtBarcode: '',//产品条码
-        oldModelName: '',//原型号名称
-      }
-      this.$refs.pdtModelId.clearAll()
-      this.newEnable = true;//新型号。型号下拉控件禁用
-    },
+        this.$refs.pdtModelId.clearAll()
+      },
 
-    //endregion
+      //endregion
 
-    //region 新建编辑
+      //region 新建编辑
 
-    /**
-     * @desc   : 保存数据
-     * @author : 洪旭东
-     * @date   : 2023-04-19 13:59
-     */
-    saveData() {
-      return this.excute(this.$service.prodCodeChangeService, this.$service.prodCodeChangeService.updateProductModel, this.params)
-    },
-    /**
-     * @desc   : 参数赋值
-     * @author : 夏常明
-     * @date   : 2023/2/20 16:08
-     */
-    setParams() {
-      this.params = {...this.formData}
-    },
-    /**
-     * @desc   : 保存校验
-     * @author : 洪旭东
-     * @date   : 2023-04-19 13:59
-     */
-    validData() {
-      if (!this.formData.pdtModelId) {
-        this.$Message.error(this.$t('W_139'))
-        return false;
+      /**
+       * @desc   : 保存数据
+       * @author : 洪旭东
+       * @date   : 2023-04-19 13:59
+       */
+      saveData() {
+        return this.excute(this.$service.prodCodeChangeService, this.$service.prodCodeChangeService.updateProductModel, this.params)
+      },
+      /**
+       * @desc   : 参数赋值
+       * @author : 夏常明
+       * @date   : 2023/2/20 16:08
+       */
+      setParams() {
+        this.params = { ...this.formData }
+        let list = []
+        let arr = this.$refs['detail-table-select'].$refs.table.getCheckboxRecords()
+        for (let i of arr) {
+          list.push({
+            productId: i.pdtUniqueId,
+            itemId: i.moldingItemId
+          })
+        }
+        this.params.list = list
+      },
+      /**
+       * @desc   : 保存校验
+       * @author : 洪旭东
+       * @date   : 2023-04-19 13:59
+       */
+      validData() {
+        if (!this.formData.pdtModelId) {
+          this.$Message.error(this.$t('W_139'))
+          return false
+        }
+        return true
       }
-      return true;
+      //endregion
+    },
+    created() {
+      this.routeObjName = 'prodCodeChange'  // 设置路由名称
     }
-    //endregion
-  },
-  created() {
-    this.routeObjName = 'prodCodeChange'  // 设置路由名称
   }
-}
 </script>
 
 <style scoped>

src/view/pdm/prod-logo-colour/index.vue

@@ -35,11 +35,11 @@
         <!-- 原商标-->
         <DkTableColumn field="oldLogoName"></DkTableColumn>
         <!-- 新商标-->
-        <DkTableColumn field="logoName"></DkTableColumn>
+        <DkTableColumn field="logoName" :title="$t('newPdtLogo')"></DkTableColumn>
         <!-- 原釉色-->
         <DkTableColumn field="oldColourName"></DkTableColumn>
         <!-- 新釉色-->
-        <DkTableColumn field="colourName"></DkTableColumn>
+        <DkTableColumn field="colourName" :title="$t('newPdtColour')"></DkTableColumn>
         <!-- 变更者-->
         <DkTableColumn :title="$t('changeUser')" field="opCreateUserName"></DkTableColumn>
         <!-- 变更时间-->

src/view/pdm/prod-suspend/form.vue

@@ -83,7 +83,7 @@ export default {
       //产品
       editTableProductColumn: [
         //产品编码
-        {field: 'uniqueCode', title: this.$t('productCode'), type: 'disabled'},
+        {field: 'uniqueCode', title: this.$t('pdtBarcode'), type: 'disabled'},
         //产品型号
         {field: 'modelCode', type: 'disabled'},
         //当前节点

src/view/pdm/prod-suspend/index.vue

@@ -55,7 +55,7 @@
                ref="prodSuspendItemTable-select"
                name="table">
         <!-- 产品编码-->
-        <DkTableColumn field="uniqueCode" :title="this.$t('productCode')"></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="this.$t('pdtBarcode')"></DkTableColumn>
         <!-- 产品型号-->
         <DkTableColumn field="modelCode"></DkTableColumn>
         <!-- 挂起工序-->
@@ -138,7 +138,13 @@ export default {
      */
     getData(params) {
       // 查询数据
-      return this.excute(this.$service.prodSuspendService, this.$service.prodSuspendService.selectByCond, params);
+      let excute =  this.excute(this.$service.prodSuspendService, this.$service.prodSuspendService.selectByCond, params);
+      excute.then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.prodSuspendItemTableData = []
+        }
+      });
+      return excute
     },
     // endregion
   },

src/view/pdm/product-code-change/index.vue

@@ -69,7 +69,6 @@
 
       </DkTable>
     </div>
-
     <!--新建编辑-->
     <DkModal
       :loading="loading"
@@ -143,7 +142,8 @@ export default {
           valueKind: 'DATE_RANGE'
         },
         {
-          itemCode: 'mouldUniqueCode',//模具编号(模具条码)
+          itemCode: 'mouldUniqueCode',//模具编号(模具条码) todo 这里要进行修改
+          itemName:'produceModelCode',// 模具编号
         },
         {
           itemCode: 'productUniqueCode',//产品编码
@@ -170,21 +170,20 @@ export default {
       changeModal: false,//窗口显示
       modalTitle: '',//窗口名称
       formData: {
-        pdtUniqueId: '',//产品唯一码
-        pdtCodeKind: '',//条码类型
-        moldingUser: '',//成型工号
-        productUniqueCode: '',//产品编码
-        oldPdtCode: '',//原产品条码
+        pdtUniqueId: null,//产品唯一码
+        pdtCodeKind: null,//条码类型
+        moldingUser: null,//成型工号
+        productUniqueCode: null,//产品编码
+        oldPdtCode: null,//原产品条码
         ftyId: this.$store.state.user.ftyId,
-        pdtCodeNew: '',//新产品条码
-        remarks: '',//备注
+        pdtCodeNew: null,//新产品条码
+        remarks: null,//备注
       },
     }
   },
   methods: {
 
     //region 一览操作
-
     /**
      *   @desc   : 获取数据
      *   @date   : 2022/12/21
@@ -262,13 +261,14 @@ export default {
      */
     clear() {
       this.formData = {
-        pdtUniqueId:'',//产品唯一码
-        pdtCodeKind:'',//条码类型
-        bindUserCode: '',//绑定工号
-        productUniqueCode: '',//产品编码
-        oldPdtCode:'',//原产品条码
-        pdtCode:'',//新产品条码
-        remarks:'',//备注
+        pdtUniqueId: null,//产品唯一码
+        pdtCodeKind: null,//条码类型
+        moldingUser: null,//成型工号
+        productUniqueCode: null,//产品编码
+        oldPdtCode: null,//原产品条码
+        ftyId: this.$store.state.user.ftyId,
+        pdtCodeNew: null,//新产品条码
+        remarks: null,//备注
       }
     },
     /**

src/view/pdm/work-station/index.vue

@@ -267,7 +267,14 @@ export default {
      */
     getData(params) {
       // 查询数据
-      return this.excute(this.$service.workStationService, this.$service.workStationService.selectByCond, params);
+      let excute =  this.excute(this.$service.workStationService, this.$service.workStationService.selectByCond, params);
+      excute.then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.workStationUser = []
+          this.workStationPrinter = []
+        }
+      });
+      return excute
     },
     // endregion
 

src/view/pdm/ws-clock/index.vue

@@ -105,6 +105,7 @@ export default {
         },
         {
           itemCode: 'clockTime',
+          itemName:'openTime',
           valueKind: 'DATE_RANGE'
         },
       ],
@@ -159,7 +160,13 @@ export default {
      */
     getData(params) {
       // 查询数据
-      return this.excute(this.$service.wsClockService, this.$service.wsClockService.selectByCond, params);
+      let excute =this.excute(this.$service.wsClockService, this.$service.wsClockService.selectByCond, params)
+      excute.then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.wsClockItemTableData = []
+        }
+      });
+      return excute
     },
     /**
      * @desc   : 加载数据