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

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

@@ -201,6 +201,10 @@ export default {
       type: Boolean,
       default: true
     },
+    // 校验多个form的ref名称
+    validFormRefList: {
+      type: Array,
+    }
   },
   watch: {
     value(n, o) {
@@ -351,18 +355,57 @@ export default {
      * @author : 周兴
      * @date   : 2022/7/23 17:36
      */
-    modalOk() {
+    async modalOk() {
       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]) {
-        this.$refs.modal.$slots.default[0].componentInstance.$refs[this.validFormName].validate().then(valid => {
-          if (!valid) {
-            return;
+        && this.$refs.modal.$slots.default[0].componentInstance) {
+        let componentInstance = this.$refs.modal.$slots.default[0].componentInstance;
+        let tag = componentInstance.$vnode.tag;
+        // 如果modal当中包括了collapse组件
+        if(tag?.endsWith('collapse') && componentInstance.formList && componentInstance.formList.length > 0){
+          // 多个form表单的校验
+          let flag = true;
+          await componentInstance.formList.forEach(it => {
+            it.validate().then(valid => {
+              if (!valid) {
+                flag = false;
+              }
+            })
+          })
+          // 通过校验,进行保存操作
+          if (flag) {
+            this.$emit('modalOk');
+          }
+        }
+        //如果校验开启，需要进行校验
+        else if (this.validFormRefList && this.validFormRefList.length > 0) {
+          // 多个form表单的校验
+          let flag = true;
+          await this.validFormRefList.forEach(it => {
+            if (componentInstance.$refs[it]) {
+              componentInstance.$refs[it].validate().then(valid => {
+                if (!valid) {
+                  flag = false;
+                }
+              })
+            }
+          })
+          // 通过校验,进行保存操作
+          if (flag) {
+            this.$emit('modalOk');
           }
+        } else if (componentInstance.$refs[this.validFormName]) {
+          // 单个form校验
+          componentInstance.$refs[this.validFormName].validate().then(valid => {
+            if (!valid) {
+              return;
+            }
+            this.$emit('modalOk');
+          })
+        } else {
           this.$emit('modalOk');
-        })
-      } else {
+        }
+      }else{
         this.$emit('modalOk');
       }
     },

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

@@ -920,7 +920,6 @@ export default {
      * @date   : 2022/4/16 15:31
      */
     cellStyle({row, rowIndex, column}) {
-      //序号居中
       if (column.type === 'seq') {
         return {textAlign: this.treeFlag ? 'left' : "center"}
       }

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

@@ -1,7 +1,11 @@
 <!-- @desc:编辑表格  @auth:周兴  @time:2022/11/15 13:06 -->
 <template>
   <div :style="{height: 100 + '%',width:divWidth,paddingRight:'3px'}" ref="edit-table-div" v-if="existsFlag">
-    <div v-if="title" class="table-title">{{ title }}</div>
+    <div v-if="title" class="table-title">{{ title }}
+      <Poptip trigger="hover" transfer placement="top-start" :content="titleInfo" v-if="titleInfo">
+        <Icon type="ios-information-circle" style="cursor: pointer;font-size: 12px" color="#909399" ref="info-icon"/>
+      </Poptip>
+    </div>
     <vxe-table
       border
       size="mini"
@@ -526,6 +530,32 @@
           </template>
         </vxe-column>
 
+        <!-- 文本按钮 -->
+        <vxe-column v-if="colItem.type === 'textButton'" :params="{type:'textButton'}"
+                    :title="colItem.title?colItem.title:$t(colItem.field)"
+                    :type="colItem.type"
+                    :width="colItem.width?colItem.width:vm.$config.columnWidth"
+                    :min-width="colItem.minWidth?colItem.minWidth:vm.$config.columnWidthMin"
+                    :field="$t(colItem.field)" :edit-render="{autofocus: '.vxe-input--inner'}">
+          <template #default="{ row,rowIndex }">
+            <div style="display: flex" v-show="setCellCanInput( row ,colItem)">
+              <vxe-input :ref="colItem.field+'_default_'+rowIndex" v-model="row[colItem.field]"
+                         :content="row[colItem.field]"
+                         :readonly="true"/>
+              <vxe-button class-name="text-button-class" content="测试"
+                          @click.native="buttonClick(colItem,rowIndex,row)"></vxe-button>
+            </div>
+          </template>
+          <template #edit="{ row,rowIndex }">
+            <div style="display: flex" v-show="setCellCanInput( row ,colItem)">
+              <vxe-input :ref="colItem.field+'_default_'+rowIndex" v-model="row[colItem.field]"
+                         :content="row[colItem.field]"
+                         :readonly="true"/>
+              <vxe-button class-name="text-button-class" content="测试" @click.native="buttonClick(colItem,rowIndex,row)"></vxe-button>
+            </div>
+          </template>
+        </vxe-column>
+
         <!--      checkbox-->
         <!--        <vxe-column type="checkbox" width="60" v-if="colItem.type === 'checkbox'"></vxe-column>-->
       </div>
@@ -559,6 +589,11 @@ export default {
       type: String,
       default: undefined,
     },
+    // 标题说明
+    titleInfo: {
+      type: String,
+      default: undefined,
+    },
     // 数据源
     data: {
       type: Array,
@@ -949,7 +984,7 @@ export default {
      * @date   : 2023/5/29 14:25
      */
     changeColumnTitle(field, title) {
-      if(this.$refs['title_' + field] && this.$refs['title_' + field].length > 0){
+      if (this.$refs['title_' + field] && this.$refs['title_' + field].length > 0) {
         this.$refs['title_' + field][0].innerText = title;
       }
     },
@@ -2702,12 +2737,12 @@ export default {
      * @date   : 2022/4/19 9:21
      */
     handleScroll(e) {
-      // if (!this.isScroll) {
-      //   if (e.isY) {
-      //     this.$refs[this.name].clearActived(); //关闭行激活状态
-      //   }
-      //   this.$refs[this.name].$el.click(); //关闭表头的pop
-      // }
+      if (!this.isScroll) {
+        if (e.isY) {
+          this.$refs[this.name].clearActived(); //关闭行激活状态
+        }
+        this.$refs[this.name].$el.click(); //关闭表头的pop
+      }
     },
     /**
      * @desc   : 移动行
@@ -3060,4 +3095,21 @@ export default {
   margin-top: 1px !important;
 }
 
+.text-button-class {
+  margin-left: 0 !important;
+  width: 65px !important;
+  background-color: #17a2b8 !important;
+  color: white !important;
+}
+
+.vxe-table--render-default .vxe-body--row.row--current .vxe-body--column .vxe-cell .text-button-class {
+  background-color: #17a2b8 !important;
+  color: white !important;
+}
+
+.vxe-table--render-default .vxe-body--row.row--checked, .vxe-table--render-default .vxe-body--row.row--radio .vxe-body--column .vxe-cell .text-button-class {
+  background-color: #17a2b8 !important;
+  color: white !important;
+}
+
 </style>

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

@@ -145,6 +145,11 @@ export default {
       type: String,
       default: '【主】'
     },
+    // 主业务列默认id
+    mainFieldId: {
+      type: Number,
+      default: undefined
+    },
   },
   data() {
     const vm = window.vm
@@ -391,6 +396,10 @@ export default {
                 }
                 //设置勾选
                 this.setCheckRow(it, filterRows[0]);
+                //如果传入值只是id的数组，并且传入了主业务id，将此id的行选中
+                if(this.mainFieldId&&filterRows[0][this.selectKey]===this.mainFieldId){
+                  this.$set(filterRows[0], this.mainField, true);
+                }
               }
             })
             // console.log('first',firstRow,this.value)
@@ -425,14 +434,25 @@ export default {
      * @date   : 2022/6/21 16:16
      */
     setCheckRow(it, row) {
-      console.log( 'setCheckRow',it, row)
-      if (!this.batchKeysPage.includes(it[this.selectKey])) {
-        this.batchKeysPage.push(it[this.selectKey]);
-        this.batchRowsPage.push(it)
-        this.$refs['table-select'].batchKeys = this.batchKeysPage;
-        this.$refs['table-select'].batchRows = [...this.batchRowsPage];
+      //传入值只有id的情况
+      if(typeof it !== 'object'){
+        if (!this.batchKeysPage.includes(it)) {
+          this.batchKeysPage.push(it);
+          this.batchRowsPage.push(row)
+          this.$refs['table-select'].batchKeys = this.batchKeysPage;
+          this.$refs['table-select'].batchRows = [...this.batchRowsPage];
+        }
+        this.$refs['table-select'].setCheckboxRow(row);
+      }else{
+        //传入行的情况
+        if (!this.batchKeysPage.includes(it[this.selectKey])) {
+          this.batchKeysPage.push(it[this.selectKey]);
+          this.batchRowsPage.push(it)
+          this.$refs['table-select'].batchKeys = this.batchKeysPage;
+          this.$refs['table-select'].batchRows = [...this.batchRowsPage];
+        }
+        this.$refs['table-select'].setCheckboxRow(row);
       }
-      this.$refs['table-select'].$refs['table'].setCheckboxRow(row, true);
     },
     /**
      * @desc   : 放大镜点击事件

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

@@ -1191,16 +1191,15 @@ export default {
         self.columns = [
           {field: 'pdtBarcode', width: 'auto'},
           {field: 'hisPdtCodes', width: 'auto'},
-          {field: 'moldLineCode', width: 'auto'},
-          {field: 'moldLineName', width: 'auto'},
+          {field: 'moldLineCode', width: 'auto',title: self.$t('moldlineCodeName')},
           {field: 'moldingDate', width: 'auto'},
           {field: 'moldingBatch', width: 'auto'},
-          {field: 'moldingUser', width: 'auto'},
-          {field: 'productUniqueCode', width: 'auto'},
+          {field: 'moldingUserCodeName', width: 'auto',title: self.$t('moldingUserName')},
+          {field: 'productUniqueCode', width: 'auto' ,title: self.$t('pdtModel')},
           {field: 'mouldUniqueCode', title: self.$t('moldingModelCode'), width: 'auto'},
           {field: 'mouldKind', width: 'auto'},
           {field: 'moldedNum', width: 'auto'},
-          {field: 'manageUserName', width: 'auto'},
+          {field: 'manageUserCodeName', width: 'auto',title: self.$t('manageUserName')},
           {field: 'renderMTime', width: 'auto'},
           {field: 'nodeName', width: 'auto'},
           {field: 'finishTime', width: 'auto'},
@@ -1617,7 +1616,7 @@ export default {
           {itemCode: 'categoryCode'},
           {itemCode: 'categoryName'},
         ]
-        self.modalWidth = 550
+        self.modalWidth = 650
         self.colCount = 2
         self.selectKey = 'categoryId'
         self.selectLabel = 'categoryCode'
@@ -1625,6 +1624,7 @@ export default {
           {field: 'categoryCode', width: '200'},
           {field: 'categoryName', width: '200'},
           {field: 'modelKindName', width: '200'},
+          {field: 'levelName', width: '200'},
         ]
       }
       // 模具类别（分页）

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

@@ -1169,12 +1169,10 @@ export default {
         this.selectKey = 'userId'
         this.selectLabel = 'userName'
         this.columns = [
-          {field: 'userCode', minWidth: '40'},
-          {field: 'userName', minWidth: '40'},
+          {field: 'userCodeName', minWidth: '40'},
         ]
         this.columnsDetail = [
-          {field: 'userCode', minWidth: '40'},
-          {field: 'userName', minWidth: '40'},
+          {field: 'userCodeName', minWidth: '40'},
         ]
       }
       //员工

src/config/index.js

@@ -76,6 +76,7 @@ export default {
   currentLang: 'zh-CN',   // 默认语言
   reportMenuUUid: 'd39c5119-bc0b-4f80-b118-cf539bd35bae',// 报表的菜单Id
   customReportUuid: '6e2286fd-14d1-4bbe-90c5-3749860db43a',// 动态报表的菜单Id
+  type:'分类',
 
   //语言类型
   languages: [

src/locale/lang/zh-CN.js

@@ -62,7 +62,7 @@ export const button = {
   leave: '下班打卡(L)',
   searchSet: '设置(T)',
   settingPivot: '设置透视表(T)',
-  deletePivot:'删除透视表(D)',
+  deletePivot: '删除透视表(D)',
   print: '打印(P)',
   disable: '停用(W)',
   save: '保存(S)',
@@ -230,9 +230,9 @@ export const formTitle = {
   'kiln-type': '窑炉类型',
   'molding-type': '成型线类型',
   'carrier-material': '模具原料',
-  'model-type-kiln':'窑炉类型',
-  'model-type-car':'窑车类型',
-  'model-type-moldline':'成型线类型',
+  'model-type-kiln': '窑炉类型',
+  'model-type-car': '窑车类型',
+  'model-type-moldline': '成型线类型',
   'work_team': '班组信息',
   'user_right': '用户权限',
   'mould_output': '模具产出',
@@ -269,6 +269,10 @@ export const formTitle = {
   'pic_list': '图片列表',
   'product_follow_item': '产品跟踪明细',
   'mould_follow_item': '模具跟踪明细',
+  'basic_info': '基本信息',
+  'defect_setting': '缺陷设置',
+  'advanced_attribute': '高级属性',
+  'flow_control': '流程设置',
 }
 
 /**
@@ -489,7 +493,7 @@ export const columns = {
 
   modelId: '型号',
   modelCode: '型号编号',
-  modelCName:'型号名称',
+  modelCName: '型号名称',
   modelName: '型号名称',
   modelCategory: '型号分类',
   modelCategoryName: '型号分类',
@@ -611,14 +615,14 @@ export const columns = {
   judgeGradeIds: '可判分级',
   flgAloneJudge: '独立检验',
   backGradeIds: '返回分级',
-  backNodeId: '返回完成工序',
+  backNodeId: '返回工序',
   recycledGradeIds: '可回收分级',
-  recycledKind: '回收后处理方式',
+  recycledKind: '回收后到达',
   packKind: '组装方式',
   flgCheckLabel: '验证标签',
   pdtLabelKinds: '标签类型',
   pdtGradeIds: '产品分级',
-  node1Id: '发出工序',
+  node1Id: '报废前工序',
   node2Id: '可到达工序',
   node2IdName: '可到达工序',
   processFlow: '工艺流程',
@@ -758,6 +762,7 @@ export const columns = {
   productBarCode: '条码变更',
   moldLineName: '成型线名称',
   moldingType: '成型线类型',
+  moldlineType: '成型线类型',
   changeDate: '变更日期',
   changeDateTime: '变更时间',
   productUniqueCode: '产品编号',
@@ -782,6 +787,7 @@ export const columns = {
   moldingInfo: '成型信息',
   scrapReasonId: '开模损原因',
   moldlineItemCode: '成型线编号',
+  moldlineItemCodeC:'模具位置',
   moldlineItemKindName: '成型线状态',
 
   //商标釉色设定
@@ -999,13 +1005,12 @@ export const columns = {
   typesOfName: '类型名称',
 
   //产品实验单
-  expCode:'实验单号',
-  expName:'实验单名',
-  makeUserCodeAndName:'制单人',
-  modelCodeAndName:'产品编码名称',
-  startNodeName:'开始工序',
-  opCreateUserCodeAndName:'创建用户',
-
+  expCode: '实验单号',
+  expName: '实验单名',
+  makeUserCodeAndName: '制单人',
+  modelCodeAndName: '产品编码名称',
+  startNodeName: '开始工序',
+  opCreateUserCodeAndName: '创建用户',
 
 
   // 自定义报表
@@ -1021,8 +1026,8 @@ export const columns = {
   dataType: '数据类型',
   flgPage: '分页',
   userNames: '用户',
-  userCodeName:'用户',
-  mouldCodeName:'模具型号',
+  userCodeName: '用户',
+  mouldCodeName: '模具型号',
   reportKind: '条件类型',
   reportType: '报表类型',
   reportTypeName: '报表类型',
@@ -1055,7 +1060,9 @@ export const columns = {
   app: '移动端',
   refreshBasicData: '刷新基础数据',
   moldlineCodeName: '成型线',
+  externalNo: '外部编号',
   qualityNoName: '重烧标识',
+  staffCodeName:'员工',
 }
 
 /**

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

@@ -45,7 +45,7 @@ export default {
         { name: 'pdtBarcode', title: self.$t('appProductBarcode') },//产品条码
         { name: 'nodeName', title: self.$t('nodeName') },//工序名称
         { name: 'productUniqueCode', title: self.$t('modelCodeAndName') },//产品编码
-        { name: 'moldLineCode', title: self.$t('appMoldingCode') },//成型线编号
+        { name: 'mouldUniqueCode', title: self.$t('appMoldingCode') },//成型线编号
 
 
       ],//每一条的内容
@@ -113,6 +113,7 @@ export default {
           if (res.data.list && res.data.list.length > 0) {
             this.tableRowData.push(res.data.list[0])
             this.formData.productCode = ''
+
             this.setFocus('productCode')
           } else {
             this.$appDialog.alert({ message: this.$t('W_002', { 'param': this.$t('appVehicleCode') }) }).then(() => {
@@ -156,7 +157,7 @@ export default {
         expName: this.formData.expName,
         ftyId: this.formData.ftyId,
         makeUserId: this.formData.makeUserId,
-        makeTime: this.format(new Date()) + '',
+        makeTime: this.currentTime() + '',
         remarks: null,
       }
 
@@ -165,6 +166,8 @@ export default {
       this.tableRowData.forEach(item => {
         detailTemp.push({
           ftyId: this.formData.ftyId,
+          nodeId: item.nodeId,
+          expNodeId: item.nodeId,
           modelCodeAndName: item.productUniqueCode,
           moldlineItemCode: item.moldlineItemCode,
           mouldKind: item.mouldKind,
@@ -175,21 +178,44 @@ export default {
           productUniqueCode: item.productUniqueCode,
         })
       });
+      this.params.detail = detailTemp
     },
     /**
    * @desc   : 日期格式化
    * @author : 于继渤
    * @date   : 2023/2/13 15:33
    */
-    format(time) {
-      if (!time || time === '') {
-        return ''
+    currentTime() {
+      var date = new Date();
+      var year = date.getFullYear(); //月份从0~11，所以加一
+      let month = date.getMonth();
+      console.log("month", month);
+      var dateArr = [
+        date.getMonth() + 1,
+        date.getDate(),
+        date.getHours(),
+        date.getMinutes(),
+        date.getSeconds(),
+      ];
+      //如果格式是MM则需要此步骤，如果是M格式则此循环注释掉
+      for (var i = 0; i < dateArr.length; i++) {
+        if (dateArr[i] >= 1 && dateArr[i] <= 9) {
+          dateArr[i] = "0" + dateArr[i];
+        }
       }
-      let now = new Date(time);
-      let year = now.getFullYear()
-      let month = now.getMonth() + 1
-      let day = now.getDate()
-      return year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day : day);
+      var strDate =
+        year +
+        "-" +
+        dateArr[0] +
+        "-" +
+        dateArr[1] +
+        " " +
+        dateArr[2] +
+        ":" +
+        dateArr[3] +
+        ":" +
+        dateArr[4];
+      return strDate
     },
     /**
      * @desc   : 保存
@@ -207,8 +233,9 @@ export default {
      */
     clear() {
       this.formData.productCode = ''
+      this.formData.expName = ''
       this.tableRowData = []
-      this.setFocus('productCode')
+      this.setFocus('experimentName')
     },
     // endregion
 

src/view/mst/custom-report/report.vue

@@ -145,6 +145,7 @@
                :current-page="pageInfo.currentPage"
                :show-footer="form['showFooter_' + tabIndex]"
                :show-tip="!!tabsOptions[tabIndex].changeTabName"
+               :choose-data-flag="!!tabsOptions[tabIndex].changeTabName"
                :seq-tip-content="$t('doubleChange')"
                @pageChange="pageSizeChange"
                @chooseData="chooseData">

src/view/mst/dictionary/index.vue

@@ -53,6 +53,7 @@
           <DkTableColumn field="dataValue" type="link"
                          @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
           <DkTableColumn field="displayNo"></DkTableColumn>
+          <DkTableColumn field="dataCode" :title="$t('externalNo')"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
                          :switch-disabled="false"></DkTableColumn>
           <DkTableColumn field="remarks" width="auto"></DkTableColumn>
@@ -80,6 +81,10 @@
         <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="dataCode" :label="$t('externalNo')">
+          <InputPop v-model="formData.dataCode" ref="dataCode"/>
+        </DkFormItem>
         <!--    备注    -->
         <DkFormItem prop="remarks">
           <InputPop v-model="formData.remarks" textareaFlag/>
@@ -107,6 +112,7 @@ export default {
       formData: {
         dataValue: '',
         dictCode: null,
+        dataCode:null,
         ftyId: null,
         displayNo: 0,
         remarks: ''

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

@@ -59,7 +59,7 @@
       :saveFlag="true"
       :title=modalTitle
     >
-      <DkForm ref="formInline" v-model="formData" :col-count="1" :label-max-words="6">
+      <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--   窑炉编码     -->
         <DkFormItem prop="uniqueCode" :required="true" :label="$t('kilnCode')">
           <InputPop v-model="formData.uniqueCode" ref="uniqueCode"/>

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

@@ -34,7 +34,7 @@
                @pageChange="pageSizeChange">
         <DkTableColumn field="uniqueCode" :title="$t('thmeterCode')" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <DkTableColumn field="thmeterName"></DkTableColumn>
-        <DkTableColumn field="spaceName"></DkTableColumn>
+        <DkTableColumn field="levelName" :title="$t('factorySpace')"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
                        :switch-disabled=false min-width="100px"></DkTableColumn>
         <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>

src/view/mst/factory-space/index.vue

@@ -34,10 +34,10 @@
                :expandFlag="true"
                tree-row-field="spaceId"
                ref="table-select" name="table">
-        <DkTableColumn field="spaceCode" :tree-node="true" type="link"
-                       @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-        <DkTableColumn field="spaceName"></DkTableColumn>
-        <DkTableColumn :title="$t('spaceKind')" field="spaceKindName"></DkTableColumn>
+        <DkTableColumn field="spaceName" :tree-node="true" type="link"  @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+        <DkTableColumn :title="$t('spaceKind')" field="spaceKindName" ></DkTableColumn>
+        <DkTableColumn field="displayNo" :data-type="$config.dataType.number" ></DkTableColumn>
+        <DkTableColumn field="spaceCode" :title="$t('externalNo')"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
                        :switch-disabled="false"></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
@@ -55,11 +55,7 @@
       :saveFlag="true"
       :title="modalTitle"
     >
-      <DkForm v-model="formData" :col-count="1">
-        <!--   区域代码     -->
-        <DkFormItem prop="spaceCode" :required="true">
-          <InputPop v-model="formData.spaceCode" ref="spaceCode"/>
-        </DkFormItem>
+      <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--   区域名称     -->
         <DkFormItem prop="spaceName" :required="true">
           <InputPop v-model="formData.spaceName" ref="spaceName"/>
@@ -77,7 +73,6 @@
                     :required="modalParams.button==$config.formMode.add || (modalParams.button==$config.formMode.edit &&formData.parentId != 0)"
                     :data-type="$config.dataType.number"
         >
-<!--          <InputPop v-model="formData.parentName" ref="parentName" readonly/>-->
           <SelectPop ref="parentName" v-model="formData.parentId" label-key="spaceName" value-key="spaceId"
                      :multiple="false" :options="spaceList" :tree-flag="true" :tree-strict="false"
                      @on-select-label="selectSpace" :disabled="formData.levelNo == 1"/>
@@ -86,6 +81,10 @@
         <DkFormItem prop="displayNo" :data-type="$config.dataType.number" :required="true">
           <InputNumberPop v-model="formData.displayNo" ref="displayNo"/>
         </DkFormItem>
+        <!--   区域代码     -->
+        <DkFormItem prop="spaceCode" :label="$t('externalNo')">
+          <InputPop v-model="formData.spaceCode" ref="spaceCode"/>
+        </DkFormItem>
         <!--   备注     -->
         <DkFormItem prop="remarks">
           <InputPop v-model="formData.remarks" textareaFlag/>

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

@@ -57,12 +57,13 @@
                  :multiple="false"
                  :page-flag="false"
                  :page-total-flag="false">
-          <DkTableColumn field="categoryCode" width="300" :tree-node="true" type="link"
+          <DkTableColumn field="categoryName" :tree-node="true" type="link"
                          @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-          <DkTableColumn field="categoryName"></DkTableColumn>
           <DkTableColumn field="modelKindName"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch"
                          @on-switch-change="onSwitchChange" :switch-disabled="false"></DkTableColumn>
+          <DkTableColumn field="displayNo"></DkTableColumn>
+          <DkTableColumn field="categoryCode" :title="$t('externalNo')"></DkTableColumn>
           <DkTableColumn field="remarks" width="auto"></DkTableColumn>
         </DkTable>
       </DkSplit>
@@ -79,10 +80,6 @@
       :title="modalTitle"
     >
       <DkForm ref="formInline" v-model="formData" :col-count="1" :label-max-words="6">
-        <!--分类代码-->
-        <DkFormItem prop="categoryCode" :required="true">
-          <InputPop v-model="formData.categoryCode" ref="categoryCode"/>
-        </DkFormItem>
         <!--分类名称-->
         <DkFormItem prop="categoryName" :required="true">
           <InputPop v-model="formData.categoryName" ref="categoryName"/>
@@ -107,6 +104,10 @@
         <DkFormItem prop="displayNo" data-type="number" :required="true">
           <InputNumberPop v-model="formData.displayNo" ref="displayNo"/>
         </DkFormItem>
+        <!--分类代码（外部编号）-->
+        <DkFormItem prop="categoryCode" :label="$t('externalNo')" >
+          <InputPop v-model="formData.categoryCode" ref="categoryCode"/>
+        </DkFormItem>
         <!--备注-->
         <DkFormItem prop="remarks">
           <InputPop v-model="formData.remarks" textareaFlag/>
@@ -156,18 +157,19 @@ export default {
     }
   },
   watch: {
-    searchInfo(n, o) {
-      let filters = n?.filter(it => it.classType == this.$config.sysType.password_security_policy)
-      if (!filters || filters.length === 0) {
-        if (n) {
-          n.splice(0, 0, {
-            displayNo: 0,
-            classType: this.$config.sysType.password_security_policy,
-            kindName: this.$t('all')
-          })
-        }
-      }
-    }
+    // 去掉全部
+    // searchInfo(n, o) {
+    //   let filters = n?.filter(it => it.classType == this.$config.sysType.password_security_policy)
+    //   if (!filters || filters.length === 0) {
+    //     if (n) {
+    //       n.splice(0, 0, {
+    //         displayNo: 0,
+    //         classType: this.$config.sysType.password_security_policy,
+    //         kindName: this.$t('all')
+    //       })
+    //     }
+    //   }
+    // }
   },
   methods: {
 
@@ -225,7 +227,16 @@ export default {
       }
       this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          this.searchInfo = res.data
+          let data = res.data
+          let searchInfo = []
+          if(data && data.length > 0){
+            data.forEach(it=>{
+              if(it.kindTags && it.kindTags.used && it.kindTags.used.includes(this.$config.type)){
+                searchInfo.push(it)
+              }
+            })
+          }
+          this.searchInfo = searchInfo;
         }
       })
     },
@@ -362,7 +373,16 @@ export default {
       }
       this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          this.modelKindList = res.data;
+          let data = res.data
+          let searchInfo = []
+          if(data && data.length > 0){
+            data.forEach(it=>{
+              if(it.kindTags && it.kindTags.used && it.kindTags.used.includes(this.$config.type)){
+                searchInfo.push(it)
+              }
+            })
+          }
+          this.modelKindList = searchInfo;
         }
       })
     },

src/view/mst/model/index.vue

@@ -37,8 +37,11 @@
                :choose-flag="false"
                @pageChange="pageSizeChange">
         <DkTableColumn field="modelCode" type="link"
+                       v-if="formType==$config.formCode.modelProduct || formType==$config.formCode.modelEquipment || formType==$config.formCode.modelMaterial"
+                       @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+        <DkTableColumn field="modelName" :type="formType!=$config.formCode.modelProduct &&
+                                                    formType!=$config.formCode.modelEquipment && formType!=$config.formCode.modelMaterial?'link':'text'"
                        @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-        <DkTableColumn field="modelName"></DkTableColumn>
         <!--产品还有型号分类-->
         <DkTableColumn field="modelCategoryName" v-if="formType==$config.formCode.modelProduct"></DkTableColumn>
         <DkTableColumn field="limitLoadQty"
@@ -48,9 +51,14 @@
                        :switch-disabled="true"></DkTableColumn>
         <DkTableColumn field="rangeNames"
                        v-if="formType==$config.formCode.modelCarrier|| formType==$config.formCode.modelTypeCar"></DkTableColumn>
-        <DkTableColumn field="stdNum" v-if="formType==$config.formCode.modelMould"></DkTableColumn>
-        <DkTableColumn field="outputQty" v-if="formType==$config.formCode.modelMould"></DkTableColumn>
-        <DkTableColumn field="outputStdSum" v-if="formType==$config.formCode.modelMould"></DkTableColumn>
+        <DkTableColumn field="stdNum" v-if="formType==$config.formCode.modelMould"
+                       :data-type="$config.dataType.number"></DkTableColumn>
+        <DkTableColumn field="outputQty" v-if="formType==$config.formCode.modelMould"
+                       :data-type="$config.dataType.number"></DkTableColumn>
+        <DkTableColumn field="outputStdSum" v-if="formType==$config.formCode.modelMould"
+                       :data-type="$config.dataType.number"></DkTableColumn>
+        <DkTableColumn field="modelCode" :title="$t('externalNo')" v-if="formType!=$config.formCode.modelProduct &&
+                                                    formType!=$config.formCode.modelEquipment && formType!=$config.formCode.modelMaterial"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
                        :switch-disabled="false"></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
@@ -73,9 +81,12 @@
         <DkTableColumn field="flgRangeOnly" type="switch" v-if="this.formType==$config.formCode.modelCarrier"
                        :switch-disabled="true"></DkTableColumn>
         <DkTableColumn field="rangeNames" v-if="this.formType==$config.formCode.modelCarrier"></DkTableColumn>
-        <DkTableColumn field="stdNum" v-if="formType==$config.formCode.modelMould"></DkTableColumn>
-        <DkTableColumn field="outputQty" v-if="formType==$config.formCode.modelMould"></DkTableColumn>
-        <DkTableColumn field="outputStdSum" v-if="formType==$config.formCode.modelMould"></DkTableColumn>
+        <DkTableColumn field="stdNum" v-if="formType==$config.formCode.modelMould"
+                       :data-type="$config.dataType.number"></DkTableColumn>
+        <DkTableColumn field="outputQty" v-if="formType==$config.formCode.modelMould"
+                       :data-type="$config.dataType.number"></DkTableColumn>
+        <DkTableColumn field="outputStdSum" v-if="formType==$config.formCode.modelMould"
+                       :data-type="$config.dataType.number"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
                        :switch-disabled="false"></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
@@ -107,7 +118,8 @@
               :label-max-words="formType==$config.formCode.modelCarrier
                     || formType==$config.formCode.modelTypeCar || formType==$config.formCode.modelMould?5:4">
         <!--  型号编码  -->
-        <DkFormItem prop="modelCode" required>
+        <DkFormItem prop="modelCode" required v-if="formType==$config.formCode.modelProduct || formType==$config.formCode.modelMould ||
+                                                    formType==$config.formCode.modelEquipment || formType==$config.formCode.modelMaterial">
           <InputPop v-model="formData.modelCode" ref="modelCode"/>
         </DkFormItem>
         <!--  型号名称  -->
@@ -162,6 +174,13 @@
           ></MultiSelect>
         </DkFormItem>
 
+        <!--  外部编号  -->
+        <DkFormItem prop="modelCode" :label="$t('externalNo')"
+                    v-if="formType!=$config.formCode.modelProduct && formType!=$config.formCode.modelMould &&
+                          formType!=$config.formCode.modelEquipment && formType!=$config.formCode.modelMaterial">
+          <InputPop v-model="formData.modelCode" ref="modelCode"/>
+        </DkFormItem>
+
         <!--   备注     -->
         <DkFormItem prop="remarks">
           <InputPop v-model="formData.remarks" textareaFlag/>
@@ -620,10 +639,9 @@ export default {
         }
       }
       // 如果是载具或者窑车，需要判断区域序号和区域名称是否为空
-      if(this.formType === this.$config.formCode.modelCarrier ||
-        this.formType === this.$config.formCode.modelTypeCar){
+      if (this.formType === this.$config.formCode.modelCarrier ||
+        this.formType === this.$config.formCode.modelTypeCar) {
         let table = this.$refs.editTableRange.getTableDataFilter();
-        console.log('333',table)
         for (let index = 0; index < table.length; index++) {
           let it = table[index]
           // 区域编号为空

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

@@ -62,8 +62,7 @@
 <!--          <DkTableColumn field="modelMouldCode"></DkTableColumn>-->
           <DkTableColumn field="mouldModelName"></DkTableColumn>
           <DkTableColumn field="mouldKindName"></DkTableColumn>
-          <DkTableColumn field="modelCode" :title="$t('productCode')"></DkTableColumn>
-          <DkTableColumn field="modelName" :title="$t('productName')"></DkTableColumn>
+          <DkTableColumn field="codeName" :title="$t('pdtModel')"></DkTableColumn>
           <DkTableColumn field="mouldQty" data-type="number"></DkTableColumn>
           <DkTableColumn field="unusedNum" data-type="number"></DkTableColumn>
           <DkTableColumn field="remarks" width="auto"></DkTableColumn>

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

@@ -22,26 +22,25 @@
     <!--  查询条件区域  -->
     <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>
+                  :search-content="searchContent"></SearchCond>
     </div>
     <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)">
+                 :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>
+                 :page-total="pageInfo.total" :current-page="pageInfo.currentPage" :choose-flag="false"
+                 :height="this.tableHeight" primaryKey="typeId" @pageChange="pageSizeChange">
+          <DkTableColumn field="typeName" type="link"
+                         @on-link="handleLink(Object.assign($event, { button: 'edit' }))"></DkTableColumn>
           <DkTableColumn field="kindName"></DkTableColumn>
           <DkTableColumn field="displayNo"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange" :switch-disabled="false">
@@ -53,30 +52,30 @@
     </div>
     <!--新建编辑-->
     <DkModal :loading="loading" v-model="editAddModal" ref="modal_editAdd" @on-visible-change="handleVisibleModal"
-      @modalOk="save" :saveFlag="true" :title=modalTitle>
+             @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" />
-        </DkFormItem>
+        <!--        &lt;!&ndash;   分类代码     &ndash;&gt;-->
+        <!--        <DkFormItem prop="typeCode" :required="true">-->
+        <!--          <InputPop v-model="formData.typeCode" ref="typeCode" />-->
+        <!--        </DkFormItem>-->
         <!--    分类名称    -->
         <DkFormItem prop="typeName" :required="true">
-          <InputPop v-model="formData.typeName" ref="typeName" />
+          <InputPop v-model="formData.typeName" ref="typeName"/>
         </DkFormItem>
         <!--    缺陷类别   -->
         <DkFormItem prop="defectKind" :required="true">
           <SelectPop v-model="formData.defectKind" ref="defectKind" :multiple="false" :options="defectKindList"
-            @on-select-label="selectPopChange" labelKey="kindName" valueKey="kindCode">
+                     @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" />
+          <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 +83,7 @@
 </template>
 
 <script>
-import { indexMixin } from '@/mixins'
+import {indexMixin} from '@/mixins'
 
 export default {
   name: 'product-defect-type',
@@ -106,14 +105,11 @@ export default {
       },
       searchContent: [
         {
-          itemCode: 'typeCode',
-        },
-        {
           itemCode: 'typeName',
         },
         {
           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 //有效标识
@@ -152,19 +148,19 @@ export default {
       }
     },
     /**
-       * @desc   : 左侧列表行变化事件
-       * @author : 于继渤
-       * @date   : 2023/5/6 9:23
-       */
-    currentChangeEvent({ row }) {
+     * @desc   : 左侧列表行变化事件
+     * @author : 于继渤
+     * @date   : 2023/5/6 9:23
+     */
+    currentChangeEvent({row}) {
       if (row != null) {
         this.kindCode = row.kindCode
         // 导出额外的条件
-        this.exportCondition = { kindCode: this.kindCode }
+        this.exportCondition = {kindCode: this.kindCode}
         let params = this.params
         params.kindCode = row.kindCode
         //查询型号类别列表的数据-右侧列表
-        if(!this.editAddModal){
+        if (!this.editAddModal) {
           this.searchData(params)
         }
       }
@@ -208,7 +204,7 @@ export default {
     initData(type) {
       if (type === this.$config.formMode.add) {
         // 加载最大序号
-        this.getMaxDisplayNo(this.$config.displayNoTable.productDefectType);
+        this.getMaxDisplayNo(this.$config.displayNoTable.productDefectType, { otherCond: 'defect_kind = \'' + this.kindCode + '\'' });
       }
     },
     /**
@@ -230,7 +226,7 @@ export default {
             this.leftData = res.data
             if (this.leftData && this.leftData.length > 0) {
               this.kindCode = this.leftData[0].kindCode
-              this.exportCondition = { kindCode: this.kindCode }
+              this.exportCondition = {kindCode: this.kindCode}
             }
           }
         }
@@ -267,7 +263,7 @@ export default {
         remarks: ''
       }
       // 获取显示顺序
-      this.getMaxDisplayNo(this.$config.displayNoTable.productDefectType);
+      this.getMaxDisplayNo(this.$config.displayNoTable.productDefectType, { otherCond: 'defect_kind = \'' + this.kindCode + '\'' });
     },
     /**
      *   @desc   : 给参数赋值
@@ -275,7 +271,7 @@ export default {
      *   @author : 洪旭东
      */
     setParams() {
-      this.params = { ...this.formData }
+      this.params = {...this.formData}
     },
     /**
      *   @desc   : 保存数据
@@ -295,10 +291,10 @@ 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
   },

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

@@ -33,8 +33,7 @@
                :choose-flag="false"
                :height="this.tableHeight" primaryKey="gradeId"
                @pageChange="pageSizeChange">
-        <DkTableColumn field="gradeCode" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-        <DkTableColumn field="gradeName"></DkTableColumn>
+        <DkTableColumn field="gradeName" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <DkTableColumn field="gradeKindName"></DkTableColumn>
         <DkTableColumn field="gradeKindDesc"></DkTableColumn>
         <DkTableColumn field="gradeType" :title="$t('gradeTypes')"></DkTableColumn>
@@ -57,10 +56,6 @@
       :title=modalTitle
     >
       <DkForm ref="formInline" v-model="formData" :col-count="1">
-        <!--   分级代码     -->
-        <DkFormItem prop="gradeCode" :required="true">
-          <InputPop v-model="formData.gradeCode" ref="gradeCode"/>
-        </DkFormItem>
         <!--    分级名称    -->
         <DkFormItem prop="gradeName" :required="true">
           <InputPop v-model="formData.gradeName" ref="gradeName"/>
@@ -127,9 +122,6 @@ export default {
       gradeTypeList:[],//分级类型
       searchContent: [
         {
-          itemCode: 'gradeCode',
-        },
-        {
           itemCode: 'gradeName',
         },
         self.$config.flgValidSearch // 有效标识

src/view/mst/product-view/form.vue

@@ -12,10 +12,10 @@
       <div id="name1" style="height: 30px;"></div>
       <DkPanel prop="productView">
         <DkForm slot="content" ref="formInline" v-model="formData" :col-count="2">
-          <!--  视图编码  -->
-          <DkFormItem prop="viewCode" required :label="$t('viewCode')">
-            <InputPop v-model="formData.viewCode"/>
-          </DkFormItem>
+<!--          &lt;!&ndash;  视图编码  &ndash;&gt;-->
+<!--          <DkFormItem prop="viewCode" required :label="$t('viewCode')">-->
+<!--            <InputPop v-model="formData.viewCode"/>-->
+<!--          </DkFormItem>-->
           <!--  视图名称  -->
           <DkFormItem prop="viewName" required>
             <InputPop v-model="formData.viewName"/>
@@ -619,7 +619,7 @@
                       this.close()
                     }
                   } else {
-                    this.$Message.warning(result.message)
+                    this.$Message.warning(res.message)
                   }
                 })
               } else {

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

@@ -40,9 +40,8 @@
                primaryKey="viewId"
                @current-change="modelRadioChange"
                @pageChange="pageSizeChange">
-        <DkTableColumn field="viewCode" type="link"
+        <DkTableColumn field="viewName" type="link"
                        @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-        <DkTableColumn field="viewName"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
                        :switch-disabled="false"></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
@@ -74,7 +73,7 @@
                    :choose-flag="false"
                    ref="placeTableData-select"
                    name="table">
-            <DkTableColumn field="placeName"></DkTableColumn>
+            <DkTableColumn field="placeCodeName" :title="$t('productPlace')"></DkTableColumn>
             <DkTableColumn field="displayNo"></DkTableColumn>
             <DkTableColumn field="remarks" width="auto"></DkTableColumn>
           </DkTable>

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

@@ -50,11 +50,11 @@
                :current-page="pageInfo.currentPage"
                :height="tableHeight "
                @pageChange="pageSizeChange">
-        <!--        <DkTableColumn field="uniqueCode" :title="$t('moldlineCode')" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>-->
-        <!--        <DkTableColumn field="moldlineName"></DkTableColumn>-->
         <!--成型线-->
-        <DkTableColumn field="moldlineCodeName" :type="formType==$config.formCode.moldingRecord?'link':'text'"
+        <DkTableColumn field="uniqueCode" :title="$t('moldlineCode')"
+                       :type="formType==$config.formCode.moldingRecord?'link':'text'"
                        @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+        <!--        <DkTableColumn field="moldlineName"></DkTableColumn>-->
         <DkTableColumn field="moldlineGroupNo" :title="$t('groupNo')" data-type="number"></DkTableColumn>
         <DkTableColumn field="pdtGlueKindName"></DkTableColumn>
         <DkTableColumn field="moldingDate" data-type="date"></DkTableColumn>
@@ -73,8 +73,8 @@
         <DkTableColumn field="thisMoldedNum" data-type="number"></DkTableColumn>
         <DkTableColumn field="flgBindUnique" type="switch" :switch-disabled="true"></DkTableColumn>
         <DkTableColumn field="productUniqueCode" :title="$t('pdtUniqueCode')"></DkTableColumn>
-        <DkTableColumn field="logoName" :title="$t('pdtLogoName')"></DkTableColumn>
-        <DkTableColumn field="colourName" :title="$t('pdtColourName')"></DkTableColumn>
+        <DkTableColumn field="logoCodeName" :title="$t('productLogo')"></DkTableColumn>
+        <DkTableColumn field="colourCodeName" :title="$t('productColour')"></DkTableColumn>
         <DkTableColumn field="flgScrap" type="switch" :switch-disabled="true"></DkTableColumn>
         <DkTableColumn field="scrapDate" :title="$t('moldingScrapDate')" data-type="date"></DkTableColumn>
         <DkTableColumn field="scrapReasonName"></DkTableColumn>
@@ -257,7 +257,7 @@ export default {
      *   @date   : 2023/5/12 15:03
      *   @author : 寇珊珊
      */
-    revokeBindBarcode(rows){
+    revokeBindBarcode(rows) {
       //因为撤销条码和绑定条码一样都是跳页 并且跳页逻辑一致  直接调用绑定条码方法
       this.bindBarcode(rows)
     },

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

@@ -29,12 +29,8 @@
                :current-page="pageInfo.currentPage"
                :height="this.tableHeight"
                @pageChange="pageSizeChange">
-<!--        &lt;!&ndash; 成型线编码&ndash;&gt;-->
-<!--        <DkTableColumn :title="$t('moldLineCode')" field="uniqueCode"></DkTableColumn>-->
-<!--        &lt;!&ndash; 成型线名称&ndash;&gt;-->
-<!--        <DkTableColumn field="moldlineName"></DkTableColumn>-->
         <!-- 成型线 -->
-        <DkTableColumn field="moldlineCodeName"></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="$t('moldlineCodeName')" ></DkTableColumn>
         <!-- 分组序号-->
         <DkTableColumn field="moldlineGroupNo"></DkTableColumn>
         <!-- 成型日期-->

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

@@ -101,8 +101,8 @@
                 <DkTableColumn field="moldingUserCodeName" :title="$t('moldingUserId')" ></DkTableColumn>
                 <!-- 注浆次数-->
                 <DkTableColumn field="moldedNum" :dataType="$config.dataType.number"  :title="$t('slipCastingNum')" ></DkTableColumn>
-                <!-- 成型线名称-->
-                <DkTableColumn field="moldlineName" ></DkTableColumn>
+                <!-- 成型线-->
+                <DkTableColumn field="moldlineCode" :title="$t('moldlineCodeName')"></DkTableColumn>
                 <!-- 窑炉编码-->
                 <DkTableColumn field="kilnCode" ></DkTableColumn>
                 <!-- 窑车编码-->
@@ -148,8 +148,8 @@
                 <DkTableColumn field="moldlineItemCode" :title="$t('moldingModelCode')"></DkTableColumn>
                 <!-- 成型工号-->
                 <DkTableColumn field="moldingUserCode" :title="$t('moldingUserId')" ></DkTableColumn>
-                <!-- 成型线名称-->
-                <DkTableColumn field="moldlineName" ></DkTableColumn>
+                <!-- 成型线-->
+                <DkTableColumn field="moldlineCode" :title="$t('moldlineCodeName')"></DkTableColumn>
                 <!-- 窑炉编码-->
                 <DkTableColumn field="kilnCode" ></DkTableColumn>
                 <!-- 窑车编码-->

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

@@ -41,7 +41,7 @@
 <!--        &lt;!&ndash; 成型线名称 &ndash;&gt;-->
 <!--        <DkTableColumn field="moldLineName"></DkTableColumn>-->
         <!-- 成型线 -->
-        <DkTableColumn field="moldlineCodeName"></DkTableColumn>
+        <DkTableColumn field="moldLineCode" :title="$t('moldlineCodeName')"></DkTableColumn>
         <!-- 注浆日期 -->
         <DkTableColumn field="moldingTime" :title="$t('moldingDate')"></DkTableColumn>
         <!-- 注浆批次 -->
@@ -61,7 +61,7 @@
         <!--产品型号（编码+名称）-->
         <DkTableColumn field="codeName" :title="$t('pdtModel')"></DkTableColumn>
         <!-- 成型线模具位置序号-->
-        <DkTableColumn field="moldlineItemCode"></DkTableColumn>
+        <DkTableColumn field="moldlineItemCode" :title="$t('moldlineItemCodeC')"></DkTableColumn>
         <!-- 模具状态 -->
         <DkTableColumn field="mouldKind"></DkTableColumn>
         <!-- 注浆次数-->

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

@@ -38,8 +38,6 @@
         <!--湿温度计编码-->
         <DkTableColumn field="thmeterCode" type="link"
                        @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-        <!--湿温度计名称-->
-        <DkTableColumn field="thmeterName"></DkTableColumn>
         <!--记录时间-->
         <DkTableColumn field="recordTime"></DkTableColumn>
         <!--温度-->

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

@@ -5,10 +5,6 @@
       <!-- 生产工位-->
       <DkPanel prop="stationInformation">
         <DkForm slot="content" ref="formInline" v-model="formData" style="width: 95%">
-          <!--    工位代码    -->
-          <DkFormItem prop="stationCode" :required="true">
-            <InputPop v-model="formData.stationCode" ref="stationCode"/>
-          </DkFormItem>
           <!--    工位名称    -->
           <DkFormItem prop="stationName" :required="true">
             <InputPop v-model="formData.stationName" ref="stationName"/>
@@ -45,6 +41,10 @@
                        valueKey="kilnId">
             </SelectPop>
           </DkFormItem>
+          <!--    工位代码    -->
+          <DkFormItem prop="stationCode">
+            <InputPop v-model="formData.stationCode" ref="stationCode"/>
+          </DkFormItem>
           <!--备注-->
           <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks" textareaFlag/>

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

@@ -11,13 +11,16 @@
         <!--    清空条件    -->
         <BaseIndexButton right-button="workStation-clear" ref="clear" name="clear"></BaseIndexButton>
         <!--    编辑    -->
-        <BaseIndexButton v-if="formType==$config.formCode.workStation" right-button="workStation-edit" ref="edit" name="edit"></BaseIndexButton>
+        <BaseIndexButton v-if="formType==$config.formCode.workStation" right-button="workStation-edit" ref="edit"
+                         name="edit"></BaseIndexButton>
         <!--    编辑标签打印机    -->
-        <BaseIndexButton v-if="formType==$config.formCode.stationPrinter" right-button="workStation-editPrinter" ref="editPrinter" name="editPrinter"></BaseIndexButton>
+        <BaseIndexButton v-if="formType==$config.formCode.stationPrinter" right-button="workStation-editPrinter"
+                         ref="editPrinter" name="editPrinter"></BaseIndexButton>
       </template>
       <template #right>
         <!--   新建     -->
-        <BaseIndexButton v-if="formType==$config.formCode.workStation" right-button="workStation-add" ref="add" name="add"></BaseIndexButton>
+        <BaseIndexButton v-if="formType==$config.formCode.workStation" right-button="workStation-add" ref="add"
+                         name="add"></BaseIndexButton>
       </template>
     </BaseIndexButtonGroup>
 
@@ -34,32 +37,33 @@
                :page-total="pageInfo.total"
                :current-page="pageInfo.currentPage"
                :multiple="false"
-               :height="this.tableHeight * split - 45" primaryKey="stationId"
+               :height="this.tableHeight * split - 35" primaryKey="stationId"
                @current-change="currentChangeEvent($event)"
                :choose-flag="false"
                @pageChange="pageSizeChange">
-        <DkTableColumn field="stationCode" type="link"
+        <DkTableColumn field="stationName" type="link"
                        @on-link="formType==$config.formCode.workStation?handleLink(Object.assign($event,{button:'edit'}))
                        :handleLink(Object.assign($event,{button:'editPrinter'}))"></DkTableColumn>
-        <DkTableColumn field="stationName"></DkTableColumn>
         <DkTableColumn field="workShopName"></DkTableColumn>
         <DkTableColumn field="levelName" :title="$t('workSpaceId')" width="280"></DkTableColumn>
         <DkTableColumn field="nodeName"></DkTableColumn>
-<!--        <DkTableColumn field="stationUsers"></DkTableColumn>-->
-        <DkTableColumn field="uniqueCode" :title="$t('kilnCode')" ></DkTableColumn>
+        <!--        <DkTableColumn field="stationUsers"></DkTableColumn>-->
+        <DkTableColumn field="uniqueCode" :title="$t('kilnCode')"></DkTableColumn>
+        <DkTableColumn field="stationCode"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
                        :switch-disabled=false min-width="100px"></DkTableColumn>
         <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>
       </DkTable>
 
       <div slot="bottom">
-        <DkTabs v-model="workStationDetailTab" :options="formType==$config.formCode.workStation?detailOptions:labelPrinterDetailOptions"></DkTabs>
+        <DkTabs v-model="workStationDetailTab"
+                :options="formType==$config.formCode.workStation?detailOptions:labelPrinterDetailOptions"></DkTabs>
         <!-- 用户 -->
         <DkTable v-show="workStationDetailTab === this.$config.workStationDetailTab.workStationUser" :pageFlag="false"
                  :pageTotalFlag="false"
                  primaryKey="userId"
                  :id="'table-'+$options.name"
-                 :height="this.tableHeight * (1-split) - 15"
+                 :height="this.tableHeight * (1-split) -10"
                  name="table"
                  ref="workTeam-select"
                  :choose-flag="false"
@@ -71,7 +75,8 @@
         </DkTable>
 
         <!--打印机信息-->
-        <DkTable v-show="workStationDetailTab === this.$config.workStationDetailTab.workStationPrinter" :pageFlag="false"
+        <DkTable v-show="workStationDetailTab === this.$config.workStationDetailTab.workStationPrinter"
+                 :pageFlag="false"
                  :pageTotalFlag="false"
                  primaryKey="wspId"
                  :id="'table-'+$options.name"
@@ -89,9 +94,9 @@
         </DkTable>
       </div>
     </DkSplit>
-<!--    <div>-->
+    <!--    <div>-->
 
-<!--    </div>-->
+    <!--    </div>-->
     <!--新建编辑-->
     <DkModal
       :loading="loading"
@@ -102,13 +107,13 @@
       :saveFlag="true"
       :title=modalTitle
     >
-      <DkForm ref="formInline" v-model="formData" :col-count="1"  >
+      <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--    工位代码    -->
         <DkFormItem prop="stationCode">
           <InputPop v-model="formData.stationCode" ref="stationCode" :readonly="true"/>
         </DkFormItem>
         <!--    工位名称    -->
-        <DkFormItem prop="stationName" >
+        <DkFormItem prop="stationName">
           <InputPop v-model="formData.stationName" ref="stationName" :readonly="true"/>
         </DkFormItem>
         <!--    工艺节点-->
@@ -126,7 +131,7 @@
       </DkForm>
 
       <!--   工位打印机   -->
-      <div style="padding: 10px 17px 10px 10px" >
+      <div style="padding: 10px 17px 10px 10px">
         <EditTable slot="content" ref="editTableWSPrinter"
                    :data="workStationPrinterList"
                    :show-setting-flag="false"
@@ -154,25 +159,25 @@ export default {
     let self = this
     return {
       editAddModal: false,
-      nodeKind:'',
+      nodeKind: '',
       modalTitle: '',//新建编辑弹窗名称
       submitType: '',//新建编辑提交类型
-      workStationUserList:[], //工位工号
-      delWorkStationUserList:[],//删除工位工号
+      workStationUserList: [], //工位工号
+      delWorkStationUserList: [],//删除工位工号
       formData: {
         stationId: null,
         stationCode: '',
-        stationName:'',
-        flowNodeId:null,
-        nodeName:'',
+        stationName: '',
+        flowNodeId: null,
+        nodeName: '',
         spaceId: null,
-        kilnId:null,
+        kilnId: null,
         remarks: '',
       },
-      spaceList:[],
-      kilnList:[],
+      spaceList: [],
+      kilnList: [],
       //工位打印机数组
-      workStationPrinterList:[],
+      workStationPrinterList: [],
       //工位打印机
       editTableWSPrinterColumn: [
         //打印机
@@ -182,7 +187,7 @@ export default {
           width: 'auto',
           labelKey: 'printerName',
           valueKey: 'printerId',
-          controlId:'printerId',
+          controlId: 'printerId',
           options: () => self.printerList,
         },
         //打印类型
@@ -209,7 +214,7 @@ export default {
         {field: 'remarks', type: 'text', width: 'auto'},
       ],
       users: [],
-      userKindList:[],
+      userKindList: [],
       searchContent: [
         {
           itemCode: 'stationCode',
@@ -267,7 +272,7 @@ export default {
      */
     getData(params) {
       // 查询数据
-      let excute =  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 = []
@@ -288,14 +293,14 @@ export default {
       this.formData = {
         stationId: null,
         stationCode: '',
-        stationName:'',
-        flowNodeId:null,
-        nodeName:'',
+        stationName: '',
+        flowNodeId: null,
+        nodeName: '',
         spaceId: null,
-        kilnId:null,
+        kilnId: null,
         remarks: '',
       }
-      this.workStationPrinterList=[]
+      this.workStationPrinterList = []
     },
     /**
      * @desc   : 给参数赋值
@@ -306,10 +311,10 @@ export default {
       this.params.stationId = this.formData.stationId // 工位Id
       this.params.ftyId = this.$store.state.user.ftyId // 工厂Id
       //过滤空行
-      this.workStationPrinterList=this.$refs.editTableWSPrinter.getTableData();
-      this.params.workStationPrinterList = this.workStationPrinterList.filter(item=>item.printerId > 0)
+      this.workStationPrinterList = this.$refs.editTableWSPrinter.getTableData();
+      this.params.workStationPrinterList = this.workStationPrinterList.filter(item => item.printerId > 0)
       //获取删除的数据
-      this.params.delWorkStationPrinterList=this.$refs.editTableWSPrinter.getDeleteData();
+      this.params.delWorkStationPrinterList = this.$refs.editTableWSPrinter.getDeleteData();
     },
     /**
      * @desc   : 保存校验
@@ -324,11 +329,17 @@ export default {
           continue;
         }
         if (!printer[i].printerId) {
-          this.$Message.warning(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printerId')}) + ';')
+          this.$Message.warning(this.$t('printerInformation') + '：' + this.$t('W_089', {
+            'param1': (i + 1),
+            'param2': this.$t('printerId')
+          }) + ';')
           return false;
         }
         if (!printer[i].printLayoutId && !printer[i].printType) {
-          this.$Message.warning(this.$t('printerInformation') + '：' + this.$t('W_089', {'param1': (i + 1), 'param2': this.$t('printLayoutId') + this.$t('or') + this.$t('printType')}) + ';')
+          this.$Message.warning(this.$t('printerInformation') + '：' + this.$t('W_089', {
+            'param1': (i + 1),
+            'param2': this.$t('printLayoutId') + this.$t('or') + this.$t('printType')
+          }) + ';')
           return false;
         }
       }
@@ -395,7 +406,7 @@ export default {
      * @author : 姜宁
      * @date   : 2023/3/16 10:37
      */
-    choosePrinterData(row, rowIndex, colItem){
+    choosePrinterData(row, rowIndex, colItem) {
       // 如果选择打印分类需要清空打印模板，选择打印模板需要清空打印分类
       if (colItem.field === 'printType') {
         if (row[colItem.field]) {
@@ -421,7 +432,7 @@ export default {
           this.formData = res.data
         }
       })
-      let params ={
+      let params = {
         ftyId: this.$store.state.user.ftyId,
         stationId: id
       }
@@ -432,14 +443,14 @@ export default {
         }
       })
     },
-   /**
-    * @desc   : 生产工号行切换事件
-    * @author : 姜宁
-    * @date   : 2023/3/14 17:10
-    */
+    /**
+     * @desc   : 生产工号行切换事件
+     * @author : 姜宁
+     * @date   : 2023/3/14 17:10
+     */
     currentChangeEvent({row}) {
       if (row != null) {
-        if (this.formType==this.$config.formCode.workStation){
+        if (this.formType == this.$config.formCode.workStation) {
           // 获取用户信息
           this.getWorkStationUserList(row.stationId);
         }
@@ -458,8 +469,8 @@ export default {
         ftyId: this.$store.state.user.ftyId,
         stationId: stationId
       }
-      this.excute(this.$service.workStationUserService,this.$service.workStationUserService.getWorkStationUser,params).then(res =>{
-        if(res.code === this.$config.SUCCESS_CODE){
+      this.excute(this.$service.workStationUserService, this.$service.workStationUserService.getWorkStationUser, params).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
           this.workStationUser = res.data
         }
       })
@@ -488,11 +499,10 @@ export default {
      * @date   : 2023/2/15 16:13
      */
     chooseNode(rows) {
-      if (rows){
+      if (rows) {
         this.formData.flowNodeId = rows[0].nodeId;
         this.nodeKind = rows[0].kindCode
-      }
-      else{
+      } else {
         this.formData.flowNodeId = '';
         this.nodeKind = ''
       }
@@ -527,11 +537,11 @@ export default {
         }
       })
     },
-   /**
-    * @desc   : 查询打印分类
-    * @author : 姜宁
-    * @date   : 2023/3/16 11:50
-    */
+    /**
+     * @desc   : 查询打印分类
+     * @author : 姜宁
+     * @date   : 2023/3/16 11:50
+     */
     getLabelPrintType() {
       let params = {
         ftyId: this.$store.state.user.ftyId,
@@ -542,11 +552,11 @@ export default {
         }
       })
     },
-   /**
-    * @desc   : 查询打印模板
-    * @author : 姜宁
-    * @date   : 2023/3/16 11:50
-    */
+    /**
+     * @desc   : 查询打印模板
+     * @author : 姜宁
+     * @date   : 2023/3/16 11:50
+     */
     getLabelPrintLayout() {
       let params = {
         ftyId: this.$store.state.user.ftyId,
@@ -562,17 +572,16 @@ export default {
      * @author : 周兴
      * @date   : 2023/2/8 12:55
      */
-    createdInit(){
+    createdInit() {
       this.primaryKey = 'stationId'  // 设置主键Id
       this.routeObjName = 'workStation'  // 设置路由名称
-      if(this.formType==this.$config.formCode.stationPrinter){
+      if (this.formType == this.$config.formCode.stationPrinter) {
         this.getFactorySpace();    // 加载工厂区域
         this.getLabelPrinter(); //加载打印机
         this.getLabelPrintType();//加载打印分类
         this.getLabelPrintLayout();//加载打印模板
         this.workStationDetailTab = this.$config.workStationDetailTab.workStationPrinter
-      }
-      else{
+      } else {
         this.workStationDetailTab = this.$config.workStationDetailTab.workStationUser
       }
     },

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

@@ -41,10 +41,8 @@
                :choose-flag="false"
                @current-change="clockCurrentChange"
                @pageChange="pageSizeChange">
-        <!--工位编码-->
-        <DkTableColumn field="stationCode" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <!--工位名称-->
-        <DkTableColumn field="stationName"></DkTableColumn>
+        <DkTableColumn field="stationName" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <!--用户-->
         <DkTableColumn field="userCodeName" :title="$t('userNames')"></DkTableColumn>
         <!--打卡时间-->
@@ -67,10 +65,8 @@
                name="table">
         <!--  工种-->
         <DkTableColumn field="jobName"></DkTableColumn>
-        <!-- 员工编码-->
-        <DkTableColumn field="staffCode"></DkTableColumn>
-        <!-- 员工名称-->
-        <DkTableColumn field="staffName"></DkTableColumn>
+        <!-- 员工-->
+        <DkTableColumn field="staffCodeName"></DkTableColumn>
         <!-- 备注-->
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
       </DkTable>

src/view/report/code-change-report/index.vue

@@ -36,7 +36,8 @@
 <!--        <DkTableColumn field="moldLineName"></DkTableColumn>-->
         <!-- 成型线 -->
         <DkTableColumn field="moldlineCodeName"></DkTableColumn>
-        <DkTableColumn field="moldingTime"></DkTableColumn>
+        <DkTableColumn field="moldlineType"></DkTableColumn>
+        <DkTableColumn field="moldingTime" :title="$t('moldingDate')"></DkTableColumn>
         <DkTableColumn field="moldingBatch"></DkTableColumn>
 <!--        <DkTableColumn field="moldingUser"></DkTableColumn>-->
         <DkTableColumn field="moldingUserCodeName" :title="$t('moldingUser')"></DkTableColumn>
@@ -50,7 +51,7 @@
         <DkTableColumn field="colourName" :title="$t('pdtColourName')"></DkTableColumn>
         <DkTableColumn field="itemCode" :title="$t('moldingModelCode')"></DkTableColumn>
         <DkTableColumn field="mouldKind"></DkTableColumn>
-        <DkTableColumn field="moldedNum"></DkTableColumn>
+        <DkTableColumn field="moldedNum" :title="$t('thisMoldedNum')"></DkTableColumn>
       </DkTable>
     </div>
   </div>
@@ -75,7 +76,7 @@ export default {
         },
         {
           itemCode: 'changeDate',//变更日期
-          valueFormat: {code: 'hisTime'},
+          valueFormat: {code: 'hisTime', default: [new Date().toDateStr(), new Date().toDateStr()]},
           valueKind: 'DATE_RANGE'
         },
       ],

src/view/report/production-report/index.vue

@@ -35,7 +35,7 @@
         <DkTableColumn field="categoryName" :title="$t('productCategory')"></DkTableColumn>
         <DkTableColumn field="logoName" :title="$t('pdtLogoName')"></DkTableColumn>
         <DkTableColumn field="colourName" :title="$t('pdtColourName')"></DkTableColumn>
-        <DkTableColumn field="flowName"></DkTableColumn>
+        <DkTableColumn field="flowName" :title="$t('processFlow')"></DkTableColumn>
         <DkTableColumn field="nodeName" :title="$t('productionProcess')"></DkTableColumn>
         <DkTableColumn field="opnTime" :title="$t('makeDate')" data-type="dateTime"></DkTableColumn>
         <DkTableColumn field="prodUserCodeName"  :title="$t('prodUserCode')"></DkTableColumn>
@@ -75,7 +75,7 @@ export default {
           },
           //产品名称
           {
-            itemCode: 'productName',
+            itemCode: 'pdtModelId',
             valueFormat: {code: 'modelId'},
             valueKind: self.$config.docUserInput.mSearch,
             magnifierType: self.$config.MagnifierType.product
@@ -90,7 +90,7 @@ export default {
           //生产日期
           {
             itemCode: 'makeDate',
-            valueFormat: {code: 'makeDate'},
+            valueFormat: {code: 'makeDate', default: [new Date().toDateStr(), new Date().toDateStr()]},
             valueKind: 'DATE_RANGE',
           },
         ],