修改bug

src/components/base/input-pop/input-pop.vue

@@ -151,7 +151,7 @@ export default {
     addTabInputFlag:{
       type:Boolean,
       default:false,
-    }
+    },
   },
   data() {
     const vm = window.vm;

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

@@ -1350,6 +1350,25 @@ export default {
           {field: 'opCreateTime', dataType: 'dateTime'}
         ]
       }
+      // 工号变更选择成型线
+      else if (self.type === self.$config.MagnifierType.jobNumberChangeMoldline) {
+        self.service = this.$service.commonService
+        self.methodsName = 'getMoldLinePage'
+        self.methodsNameDetail = 'getMoldLinePage'
+        self.searchContent = [
+          {itemCode: 'moldlineCode'},
+          {itemCode: 'moldlineName'},
+        ]
+        self.selectKey = 'moldlineId'
+        self.selectLabel = 'moldLineUniqueCode'
+        self.columns = [
+          {field: 'moldLineUniqueCode'},
+          {field: 'moldlineName'},
+          {field: 'moldingUsers'},
+          {field: 'moldlineKind'},
+          {field: 'opCreateTime', dataType: 'dateTime'}
+        ]
+      }
       // 用户
       else if (self.type === self.$config.MagnifierType.userAndClock) {
         self.service = this.$service.commonService
@@ -1461,8 +1480,8 @@ export default {
         self.selectKey = 'categoryId'
         self.selectLabel = 'categoryCode'
         self.columns = [
-          {field: 'categoryName', width: '200'},
           {field: 'categoryCode', width: '200'},
+          {field: 'categoryName', width: '200'},
           {field: 'modelKindName', width: '200'},
         ]
       }

src/config/index.js

@@ -884,6 +884,8 @@ export default {
     processNode: 'processNode',
     // 成型线
     moldline: 'moldline',
+    //工号变更选择成型线
+    jobNumberChangeMoldline:'jobNumberChangeMoldline',
     // 产品信息（条码变更）
     productNodeChange: 'productNodeChange',
     // 产品釉色设定

src/locale/lang/zh-CN.js

@@ -497,6 +497,7 @@ export const columns = {
   userBindKind: '工号绑定',
   userBindKindName: '工号绑定',
   moldingUsers: '成型工号',
+  moldStatus: '模具状态',
   moldingUserName: '成型工号',
   moldingUserNames: '成型工号',
   moldlineItemQty: '模具数量',
@@ -1091,6 +1092,7 @@ export const messages = {
   W_144: '当前保存数据中有未添加的明细，请添加后重新操作',
   W_145: '当前存在可变更产品名称为空数据，请添加后重新操作',
   W_146: '当前模具数量与分组序号1下模具数量不一致，请修改后重新操作',
+  W_147: '请输入长度为4位单据代码',
   E_001: '系统出现异常，请联系管理员。',
   Q_001: '当前页面的数据有过更改，请确认需要保存吗？',
   Q_002: '确定要进行{param}操作吗？',

src/view/core/factory/index.vue

@@ -62,9 +62,9 @@
         <DkFormItem prop="ftyName" :required="true">
           <InputPop v-model="formData.ftyName" ref="ftyName"/>
         </DkFormItem>
-        <!--  工厂名称  -->
+        <!--  单据代码  -->
         <DkFormItem prop="ftyDocNo" :required="true" :data-type="$config.dataType.str">
-          <InputPop v-model="formData.ftyDocNo" ref="ftyDocNo" maxlength="4"/>
+          <InputPop v-model="formData.ftyDocNo" ref="ftyDocNo"  maxlength="4"  />
         </DkFormItem>
         <!--   显示顺序  -->
         <DkFormItem prop="displayNo" :data-type="$config.dataType.number" :required="true">
@@ -181,9 +181,26 @@ export default {
      * @date   : 2022年12月13日10:56:56
      */
     setParams() {
+      //校验名称是否重复
+      if (!this.validData()) {
+        return
+      }
       this.params = {...this.formData}
     },
     /**
+     *   @desc   : 校验
+     *   @date   : 2023/5/5 9:54
+     *   @author : 寇珊珊
+     */
+    validData(){
+      // 判断是否变更信息
+      if(!this.formData.ftyDocNo || this.formData.ftyDocNo.length!=4) {
+        this.$Message.error(this.$t('W_147'))
+        return false;
+      }
+      return true;
+    },
+    /**
      * @desc   : 保存方法
      * @author : 周兴
      * @date   : 2023/1/4 9:25

src/view/core/system-setting/index.vue

@@ -29,7 +29,7 @@
             :freeze="false"
             :choose-flag="false"
             @current-change="currentChangeEvent($event)">
-            <DkTableColumn :title="$t('className')" field="className"
+            <DkTableColumn :title="$t('parameterClassification')" field="className"
                            width="auto" :filter=false :center-flag="true"></DkTableColumn>
           </DkTable>
         </div>
@@ -242,7 +242,7 @@ export default {
       if (list && list.length > 0) {
         for (let i = 0; i < list.length; i++) {
           if (list[i].valueChangeFlg && !(list[i].valueKind == 'BOOL' || list[i].valueKind == 'S-CHOICE') && !list[i].settingValue) {
-            this.$Message.error(this.$t('W_089', {'param1': (i + 1), 'param2': "参数值"}) + ';')
+            this.$Message.error(this.$t('W_089', {'param1': (i + 1), 'param2': "参数值"}) )
             return false;
           }
         }

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

@@ -250,11 +250,13 @@ export default {
         params = kindCode
       }
       // 查询数据
-      this.excute(this.$service.modelCategoryService, this.$service.modelCategoryService.selectByCond, params).then(res => {
+      let excute =this.excute(this.$service.modelCategoryService, this.$service.modelCategoryService.selectByCond, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.tableData = res.data.list
+          this.loading = false
         }
       })
+      return excute
     },
     /**
      * @desc   : 调用同一路由，需要使用这个方法去设置created的方法
@@ -411,13 +413,14 @@ export default {
      * @date   : 2022年12月13日10:13:23
      */
     edit(rows) {
+      let row =this.$refs['table-select'].$refs.table.getCurrentRecord()
       this.modalParams = {
         button: this.$config.formMode.edit,
         closeFlag: true,
       }
       this.modalTitle = this.setTitle(this.$config.formMode.edit, 'model-category')
-      if (rows.length > 0) {
-        this.detail(rows[0].categoryId)
+      if (row) {
+        this.detail(row.categoryId)
       }
       this.editAddModal = true
       // this.modelKindFlag = true

src/view/mst/molding/form.vue

@@ -1,13 +1,13 @@
 <!-- @desc:成型线form  @auth:洪旭东  @time:2023-02-06 -->
 <template>
   <div class="main-div" ref="mainDiv">
-    <div class="tab-fixed-class">
+    <div v-if="type !== $config.formMode.install" class="tab-fixed-class">
       <!--  选择tab区域  -->
       <DkTabs :options="tabsOptions" @on-click="changeElTabs"></DkTabs>
     </div>
     <DkCollapse @on-change="changeCollapse" ref="collapse">
       <!--为了补缺tab区域fixed-->
-      <div id="name1" style="height: 30px;"></div>
+      <div id="name1" style="height: 30px;" v-if="type !== $config.formMode.install"></div>
       <DkPanel ref="essentialInformation" prop="essentialInformation" v-if="type !== $config.formMode.install">
         <DkForm slot="content" ref="formInline" v-model="formData" :col-count="4" :label-max-words="7">
           <!--  成型线编码  -->
@@ -126,7 +126,6 @@
           ></EditTable>
         </DkSplit>
       </DkPanel>
-
       <DkPanel id="name3" prop="moldlineItem">
         <moldline-item-choose slot="content" @add="addItem" ref="itemChoose"/>
         <EditTable slot="content" ref="moldlineItemTable" :data="moldlineItemList" :show-setting-flag="false"
@@ -156,6 +155,9 @@ export default {
     groupId: {
       type: Number
     },
+    pdtGlueKind: {
+      type: String
+    },
   },
   data () {
     let self = this
@@ -257,7 +259,7 @@ export default {
     //监听模具列表可变更产品型号是否可用
     moldlineItemDisabledFlag(n,o){
       this.moldlineItemColumn[9].disabled=n
-    }
+    },
   },
   methods:{
     /**
@@ -862,6 +864,25 @@ export default {
     if (this.type === this.$config.formMode.install) {
       this._detail(this.moldlineId)
     }
+    //检测是否是从成型模具页面跳转过来并且粘接方式为分组粘接
+    if(this.pdtGlueKind && this.pdtGlueKind==this.$config.pdtGlueKind.fenZu){
+      //分组粘贴模具表格增加可变更产品型号
+      if (!this.moldlineItemColumn.some(s => s.field == 'repPdtModelName')) {
+        this.moldlineItemColumn.push({
+          field: 'repPdtModelName',
+          selectField: 'modelCode',
+          width: 150,
+          type: 'tableSelect',
+          param: () => {
+            return {}
+          },
+          sortBoolean: false,
+          dataType: this.$config.tableSelectType.product,
+          fieldUpdate: this.$updateColumns.moldlineGroupChooseMould,
+          searchDetailFlag: false,
+        },)
+      }
+    }
     this.resizeTableFlag = true;  // 计算表格高度
   }
 }

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

@@ -36,17 +36,17 @@
         <DkTableColumn field="moldingUserName" :title="$t('moldingUserNames')"></DkTableColumn>
         <DkTableColumn field="productCode"></DkTableColumn>
         <DkTableColumn field="productName"></DkTableColumn>
-        <DkTableColumn field="productName"></DkTableColumn>
-        <DkTableColumn field="itemKindName"></DkTableColumn>
+        <!--todo 隐藏 禅道4990-->
+<!--        <DkTableColumn field="itemKindName"></DkTableColumn>-->
         <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
-                       :switch-disabled="false"></DkTableColumn>
+                       :switch-disabled="false" :title="$t('moldStatus')"></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
       </DkTable>
     </div>
 
     <DkModal fullscreen v-model="installModal" :footer-flag="false" :title="$v('install')">
-      <MoldlineForm type="install" :moldline-id="currentMoldline"
-                    :group-id="searchCond && searchCond._value && searchCond._value.groupId ? searchCond._value.groupId:null"
+      <MoldlineForm type="install" :moldline-id="currentMoldline" :pdtGlueKind="pdtGlueKind"
+                     :group-id="searchCond && searchCond._value && searchCond._value.groupId ? searchCond._value.groupId:null"
                     v-if="installModal" @close="closeInstall"/>
     </DkModal>
   </div>
@@ -81,6 +81,8 @@ export default {
       installModal: false,
       // 当前成型线
       currentMoldline: null,
+      //当前成型线粘接方式
+      pdtGlueKind:null,
     }
   },
   methods: {
@@ -131,6 +133,9 @@ export default {
     install() {
       if (this.currentMoldline && this.searchCond && this.searchCond._value && this.searchCond._value.groupId) {
         this.installModal = true
+        let  row= this.$refs['table-select'].$refs.table.getCurrentRecord()
+        // if(row && row.){
+        // }
       } else {
         this.$Message.error(this.$t('W_017'))
       }
@@ -166,6 +171,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.searchCond._value.groupId = e.rows[0].groupId
         this.searchData()
       } else {

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

@@ -105,7 +105,7 @@ export default {
           itemCode: 'moldLineCode',
           valueFormat: {code: 'moldlineId'},
           valueKind: 'S-SEARCH',
-          magnifierType: self.$config.MagnifierType.moldline,
+          magnifierType: self.$config.MagnifierType.jobNumberChangeMoldline,
           required:true
         },
         {

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

@@ -22,7 +22,7 @@
                       @on-blur="onBarCode"/>
           </DkFormItem>
           <!--产品型号-->
-          <DkFormItem prop="modelCode">
+          <DkFormItem prop="modelCode" :label="$t('appMoldNo')" >
             <InputPop ref="modelCode" v-model="formData.modelCode" :readonly="true"/>
           </DkFormItem>
           <!--注浆日期-->
@@ -125,7 +125,7 @@
           // 产品条码
           { field: 'barCode', type: 'disabled', width: 'auto' },
           //产品型号
-          { field: 'modelCode', type: 'disabled', width: 'auto' },
+          { field: 'modelCode', type: 'disabled', title: self.$t('appMoldNo'), width: 'auto' },
           // 成型日期
           { field: 'moldingDate', type: 'disabled', width: 'auto' },
           //完成时间
@@ -167,7 +167,7 @@
               this.formData.logoName = res.data.logoName
               this.formData.colourName = res.data.colourName
               this.formData.moldingDate = res.data.moldingDate
-              this.formData.modelCode = res.data.modelMouldCode
+              this.formData.modelCode = res.data.moldlineItemCode
               this.formData.finishTime = res.data.finishTime
               this.formData.pdtFlowNodeName = res.data.pdtFlowNodeName
               this.formData.carrierCode = res.data.carrierCode

src/view/pdm/prod-defect/add.vue

@@ -23,7 +23,7 @@
                       @on-blur="onBarCode" @on-clear="clearFromData"/>
           </DkFormItem>
           <!--产品型号-->
-          <DkFormItem prop="modelCode">
+          <DkFormItem prop="modelCode" :label="$t('appMoldNo')">
             <InputPop ref="modelCode" v-model="formData.modelCode" :readonly="true"/>
           </DkFormItem>
           <!--成型线-->
@@ -38,10 +38,6 @@
           <DkFormItem prop="carrierCode" :label="$t('reasonCarrierCode')">
             <InputPop ref="carrierCode" v-model="formData.carrierCode" :readonly="true"/>
           </DkFormItem>
-          <!--编码-->
-          <DkFormItem prop="productCode">
-            <InputPop ref="productCode" v-model="formData.productCode" :readonly="true"/>
-          </DkFormItem>
           <!--商标-->
           <DkFormItem prop="logoName">
             <InputPop ref="logoName" v-model="formData.logoName" :readonly="true"/>
@@ -109,8 +105,8 @@
                    :show-setting-flag="false"
                    name="table">
             <DkTableColumn field="jobName" :title="$t('jobName')"></DkTableColumn>
-            <DkTableColumn field="staffName" :title="$t('staffName')"></DkTableColumn>
             <DkTableColumn field="staffCode" :title="$t('staffCode')" width="auto"></DkTableColumn>
+            <DkTableColumn field="staffName" :title="$t('staffName')"></DkTableColumn>
           </DkTable>
         </div>
       </DkPanel>
@@ -183,7 +179,7 @@
           // 产品条码
           { field: 'barCode', type: 'disabled', width: 'auto' },
           //产品型号
-          { field: 'modelCode', title: self.$t('modelMouldCode'), type: 'disabled', width: 'auto' },
+          { field: 'modelCode', title: self.$t('appMoldNo'), type: 'disabled', width: 'auto' },
           // 成型日期
           { field: 'moldingDate', type: 'disabled', width: 'auto' },
           //完成工序
@@ -251,7 +247,7 @@
               this.formData.logoName = res.data.logoName
               this.formData.colourName = res.data.colourName
               this.formData.moldingDate = res.data.moldingDate
-              this.formData.modelCode = res.data.modelMouldCode
+              this.formData.modelCode = res.data.moldlineItemCode
               this.formData.pdtFlowNodeName = res.data.pdtFlowNodeName
               this.formData.carrierCode = res.data.carrierCode
               this.formData.moldlineName = res.data.moldlineName

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

@@ -56,12 +56,8 @@
                name="table">
         <!-- 产品编码-->
         <DkTableColumn field="uniqueCode" :title="this.$t('productCode')"></DkTableColumn>
-        <!-- 产品种类-->
-        <DkTableColumn field="kindName"></DkTableColumn>
         <!-- 产品型号-->
         <DkTableColumn field="modelCode"></DkTableColumn>
-        <!-- 工位代码-->
-        <DkTableColumn field="stationCode"></DkTableColumn>
         <!-- 挂起工序-->
         <DkTableColumn field="nodeName" :title="this.$t('suspendNodeId')"></DkTableColumn>
         <!-- 当前工序-->

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

@@ -42,6 +42,8 @@
                        @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <!--员工编码-->
         <DkTableColumn field="staffCode" ></DkTableColumn>
+        <!--员工姓名-->
+        <DkTableColumn field="staffName" ></DkTableColumn>
         <!--报工类型-->
         <DkTableColumn field="workKindName" :title="$t('workKind')"></DkTableColumn>
         <!--报工数量-->