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

src/components/business/process/node-modal/node-modal.vue

@@ -14,7 +14,7 @@
       @modalCancel="modalCancel"
       @on-cancel="modalCancel"
       :valid-form-ref-list="['formInLine-tab1','formInLine-tab2','formInLine-tab3','formInLine-tab4']">
-        <DkTabs :options="tabsOptions" v-model="currentTab" @on-click="changeTabs" style="margin: 0 0 10px;"/>
+        <DkTabs :options="tabsOptions" v-model="currentTab" @on-click="changeTabs" style="margin: 10px 0;"/>
 
         <!--          &lt;!&ndash;    返回工序    &ndash;&gt;-->
         <!--          <DkFormItem prop="backNodeId" v-if="nodeControl?.backNodeId?.visible">-->
@@ -28,6 +28,7 @@
         <!--                       :multiple="false" :options="packKindList"/>-->
         <!--          </DkFormItem>-->
 
+        {{ nodeData }}<br/>
 
         <!--   tab1 - 基本信息    -->
         <DkForm ref="formInline-tab1" v-if="currentTab =='tab1'" v-model="nodeData" :label-max-words="6" :colCount="2">
@@ -189,93 +190,92 @@
                        :multiple="true" :options="moldingSysTagsList"/>
           </DkFormItem>
         </DkForm>
+        <Divider></Divider>
         <!--   表格     -->
-        <div v-if="currentTab =='tab1'">
-          <!--    生产工号    -->
-          <EditTable ref="productUserTable" :title='"生产工号"' :titleInfo='"未设置代表有数据采集权限的用户都可以作为此工序生产工号"'
-                     :data="nodeData.userList"
-                     v-if="nodeControl?.userTable?.visible&&productUserTableFlag"
-                     :columns="userColumns_noKind"
-                     enabledRepeatId="userId"
-                     :height="200"
-                     controlId="userId"
-                     :enabledRepeat="false"
-                     :show-setting-flag="false"/>
-          <!--                   @chooseData="chooseUser"/>-->
-          <!--    操作工号    -->
-          <EditTable ref="operateUserTable" :title='"操作工号"' :titleInfo='"未设置代表有数据采集权限的用户都可以操作此工序"'
-                     :data="nodeData.userList"
-                     v-if="nodeControl?.userTable?.visible&&operateUserTableFlag&&nodeData.userKind==$config.userKind.operate"
-                     :columns="userColumns_noKind"
-                     enabledRepeatId="userId"
-                     :height="200"
-                     controlId="userId"
-                     :enabledRepeat="false"
-                     :show-setting-flag="false"/>
-          <!--                   @chooseData="chooseUser"/>-->
+        <div style="margin-bottom: 8px">
+          <div v-if="currentTab =='tab1'">
+            <!--    生产工号    -->
+            <EditTable ref="productUserTable" :title='"生产工号"' :titleInfo='"未设置代表有数据采集权限的用户都可以作为此工序生产工号"'
+                       :data="nodeData.userList.filter(it=>it.userKind==$config.userKind.product)"
+                       v-if="nodeControl?.userTable?.visible&&productUserTableFlag"
+                       :columns="userColumns_noKind"
+                       enabledRepeatId="userId"
+                       :height="200"
+                       controlId="userId"
+                       :enabledRepeat="false"
+                       :show-setting-flag="false"/>
+            <!--    操作工号    -->
+            <EditTable ref="operateUserTable" :title='"操作工号"' :titleInfo='"未设置代表有数据采集权限的用户都可以操作此工序"'
+                       :data="nodeData.userList.filter(it=>it.userKind==$config.userKind.operate)"
+                       v-if="nodeControl?.userTable?.visible&&operateUserTableFlag&&nodeData.userKind==$config.userKind.operate"
+                       :columns="userColumns_noKind"
+                       enabledRepeatId="userId"
+                       :height="200"
+                       controlId="userId"
+                       :enabledRepeat="false"
+                       :show-setting-flag="false"/>
+          </div>
+          <div v-if="currentTab =='tab2'">
+            <!--    工序可检缺陷    -->
+            <EditTable ref="defectTable" :title='"工序可检缺陷"' :data="nodeData.defectList"
+                       v-if="nodeControl?.defectTable?.visible&&defectTableFlag"
+                       :columns="defectColumns"
+                       enabledRepeatId="defectId"
+                       :height="200"
+                       controlId="pdtDefectId"
+                       :enabledRepeat="false"
+                       :show-setting-flag="false"/>
+            <!--    工序工种缺陷    -->
+            <EditTable ref="jobDefectTable" :title='"工序工种缺陷"' :data="nodeData.jobDefectList"
+                       v-if="nodeControl?.jobDefectTable?.visible&&jobDefectTableFlag&&nodeData.flgJobDefect"
+                       :columns="jobDefectColumns"
+                       enabledRepeatId="defectId"
+                       :height="200"
+                       controlId="pdtDefectId"
+                       :enabledRepeat="false"
+                       :show-setting-flag="false"/>
+          </div>
+          <div v-if="currentTab =='tab3'">
+            <!--    回收/检验设置    -->
+            <EditTable ref="checkRecoverTable" :title='nodeData.nodeKind===$config.nodeKind.recover?"回收设置":"检验设置"'
+                       :data="nodeData.routerList"
+                       v-if="[$config.nodeKind.recover,$config.nodeKind.halfCheck,$config.nodeKind.finishCheck].includes(nodeData.nodeKind)"
+                       :columns="routerColumns"
+                       :controlId="'node1Id'"
+                       :height="200"
+                       :enabledRepeatId="['node1Id','backNodeId']"
+                       :enabledRepeat="false"
+                       :show-setting-flag="false"/>
+          </div>
+          <div v-if="currentTab =='tab4'">
+            <!--    工序在制品    -->
+            <EditTable ref="pdtTable" :title='"工序在制品"' :data="nodeData.pdtList"
+                       v-if="nodeControl?.pdtTable?.visible&&pdtTableFlag"
+                       :columns="pdtColumns"
+                       enabledRepeatId="modelId"
+                       controlId="pdtModelId"
+                       :height="200"
+                       :enabledRepeat="false"
+                       :show-setting-flag="false"/>
+            <!--    跨流程工序    -->
+            <!--          {{nodeData.routerType}}-->
+            <EditTable ref="routerTable" :title='"跨流程工序"' :data="nodeData.routerList"
+                       v-if="nodeControl?.routerTable?.visible&&routerTableFlag&&nodeData.recycledKind!==$config.recycledKind.before"
+                       :columns="routerColumns_noNode1AndBack"
+                       :controlId="'node2Id'"
+                       :height="200"
+                       :enabledRepeatId="'nodeId'"
+                       :enabledRepeat="false"
+                       :show-setting-flag="false"/>
+          </div>
         </div>
-        <div v-if="currentTab =='tab2'">
-          <!--    工序可检缺陷    -->
-          <EditTable ref="defectTable" :title='"工序可检缺陷"' :data="nodeData.defectList"
-                     v-if="nodeControl?.defectTable?.visible&&defectTableFlag"
-                     :columns="defectColumns"
-                     enabledRepeatId="defectId"
-                     :height="200"
-                     controlId="pdtDefectId"
-                     :enabledRepeat="false"
-                     :show-setting-flag="false"/>
-          <!--    工序工种缺陷    -->
-          <EditTable ref="jobDefectTable" :title='"工序工种缺陷"' :data="nodeData.jobDefectList"
-                     v-if="nodeControl?.jobDefectTable?.visible&&jobDefectTableFlag&&nodeData.flgJobDefect"
-                     :columns="jobDefectColumns"
-                     enabledRepeatId="defectId"
-                     :height="200"
-                     controlId="pdtDefectId"
-                     :enabledRepeat="false"
-                     :show-setting-flag="false"/>
-        </div>
-        <div v-if="currentTab =='tab3'">
-          <!--    回收/检验设置    -->
-          <EditTable ref="checkRecoverTable" :title='nodeData.nodeKind===$config.nodeKind.recover?"回收设置":"检验设置"'
-                     :data="nodeData.routerList"
-                     v-if="[$config.nodeKind.recover,$config.nodeKind.halfCheck,$config.nodeKind.finishCheck].includes(nodeData.nodeKind)"
-                     :columns="routerColumns"
-                     :controlId="'node1Id'"
-                     :height="200"
-                     :enabledRepeatId="['node1Id','backNodeId']"
-                     :enabledRepeat="false"
-                     :show-setting-flag="false"/>
-        </div>
-        <div v-if="currentTab =='tab4'">
-          <!--    工序在制品    -->
-          <EditTable ref="pdtTable" :title='"工序在制品"' :data="nodeData.pdtList"
-                     v-if="nodeControl?.pdtTable?.visible&&pdtTableFlag"
-                     :columns="pdtColumns"
-                     enabledRepeatId="modelId"
-                     controlId="pdtModelId"
-                     :height="200"
-                     :enabledRepeat="false"
-                     :show-setting-flag="false"/>
-          <!--    跨流程工序    -->
-          <!--          {{nodeData.routerType}}-->
-          <EditTable ref="routerTable" :title='"跨流程工序"' :data="nodeData.routerList"
-                     v-if="nodeControl?.routerTable?.visible&&routerTableFlag&&nodeData.recycledKind!==$config.recycledKind.before"
-                     :columns="routerColumns_noNode1AndBack"
-                     :controlId="'node2Id'"
-                     :height="200"
-                     :enabledRepeatId="'nodeId'"
-                     :enabledRepeat="false"
-                     :show-setting-flag="false"/>
-        </div>
-        <!--                  {{ nodeData }}<br/>-->
         <!--            {{ nodeControl }}<br/>-->
         <!--            {{ allNodes }}<br/>-->
         <!--      {{nodeData.routerList}}<br/>-->
 <!--   todo 切换tab保存各list   -->
 <!--   todo 2个userList数据问题   -->
 <!--   todo 2个routerList数据问题   -->
-<!--   todo 2个routerType切换的问题   -->
-<!--   todo 2个routerType切换的问题   -->
+<!--   todo routerType切换的问题   -->
 <!--   todo 返回分级不为null时有返回工序列，null时，隐藏并清空   -->
 <!--   todo 返回工序（回收后处理方式为 后续流程 时，此列隐藏并清空）   -->
 <!--   todo 产品分级表【t_product_grade】增加了分级类型字段【grade_types】，半检时数据源为分级类型为null或【工艺节点-半检】，成检时数据源为分级类型为null或【工艺节点-成检】）   -->
@@ -644,7 +644,8 @@ export default {
      * @date   : 2023/5/29 14:50
      */
     changeTabs(e) {
-      //重新渲染各table
+
+      // region重新渲染各table
       this.productUserTableFlag = !this.productUserTableFlag
       this.operateUserTableFlag = !this.operateUserTableFlag
       this.$nextTick(() => {
@@ -677,8 +678,10 @@ export default {
         }
         this.checkRecoverTable = !this.checkRecoverTable
       })
+      //endregion
 
-
+      //设置表单数据
+      this.setFormData()
     },
     /**
      * @desc   : 改变操作模式
@@ -774,38 +777,10 @@ export default {
     changeUserKind(e) {
       //当切换到生产工号时，删除userTable中设置的操作工号
       if (e == this.$config.userKind.product) {
-        this.$refs?.userTable?.getTableDataFilter().forEach((it) => {
-          if ((it.userKind === this.$config.userKind.operate)) {
-            this.$refs?.userTable?.del(this.$refs?.userTable?.getTableDataFilter().findIndex(item => item._X_ID == it._X_ID))
-          }
-        })
+        this.nodeData.userList =this.nodeData.userList.filter(it=>it.userKind==this.$config.userKind.product)
       }
     },
     /**
-     * @desc   : 选择用户
-     * @author : 周兴
-     * @date   : 2023/3/13 17:50
-     */
-    chooseUser() {
-      this.$nextTick(() => {
-        let userKind = this.nodeData.userKind
-        let userList = this.$refs['userTable'].tableData
-        if (userKind && userList != null && userList.length > 0) {
-          let userKindName = this.$refs['userKind']?.getDisplayText()
-          userList.forEach(it => {
-            if (!it.userKind && it.userId) {
-              // 判断用户是否已经存在
-              let filters = userList.filter(item => item.userId === it.userId && item['_X_ID'] !== it['_X_ID'])
-              if (!filters || filters.length === 0) {
-                this.$set(it, 'userKind', userKind)
-                this.$set(it, 'userKind_Name', userKindName)
-              }
-            }
-          })
-        }
-      })
-    },
-    /**
      * @desc   : 确定
      * @author : 张潇木
      * @date   : 2023/1/5 10:38
@@ -841,121 +816,8 @@ export default {
      * @date   : 2023/2/16 16:21
      */
     setParams() {
-      // console.log('this.$refs?.defectTable?.getTableDataFilter()',this.$refs?.jobDefectTable?.getTableDataFilter())
-      // console.log("routerTable?.getTableDataFilter()",this.$refs?.routerTable?.getTableDataFilter())
-      // region 设置表单数据
-      // 半检、成检、成型 直接指定为生产工号类型
-      let userKindProduct = ''
-      if (this.nodeData.nodeKind === this.$config.nodeKind.halfCheck ||
-        this.nodeData.nodeKind === this.$config.nodeKind.finishCheck ||
-        this.nodeData.nodeKind === this.$config.nodeKind.shaping) {
-        userKindProduct = this.$config.userKind.product
-        this.nodeData.userKind = userKindProduct
-      }
-      //工序工号
-      this.nodeData.userList = this.$refs?.userTable?.getTableDataFilter().map((it, index) => {
-        return {
-          flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
-          nodeId: this.process.currentNodeId,
-          userId: it.userId,
-          userCode: it.userCode,
-          userName: it.userName,
-          // 生产工号
-          //userKind:it.userKind,
-          userKind: userKindProduct ? userKindProduct : it.userKind,
-          displayNo: index + 1,
-          remarks: it.remarks,
-          ftyId: this.$store.state.user.ftyId
-        }
-      })
-      //工序在制品
-      this.nodeData.pdtList = this.$refs?.pdtTable?.getTableDataFilter().map((it) => {
-        return {
-          flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
-          nodeId: this.process.currentNodeId,
-          pdtModelId: it.pdtModelId,
-          pdtModelCode: it.pdtModelCode,
-          pdtModelName: it.pdtModelName,
-          categoryName: it.categoryName,
-          remarks: it.remarks,
-          ftyId: this.$store.state.user.ftyId
-        }
-      })
-      //载具
-      this.nodeData.carList = this.$refs?.carTable?.getTableDataFilter().map((it) => {
-        return {
-          flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
-          nodeId: this.process.currentNodeId,
-          carModelId: it.carModelId,
-          carModelCode: it.carModelCode,
-          carModelName: it.carModelName,
-          remarks: it.remarks,
-          ftyId: this.$store.state.user.ftyId
-        }
-      })
-      //缺陷
-      this.nodeData.defectList = this.$refs?.defectTable?.getTableDataFilter().map((it) => {
-        return {
-          flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
-          nodeId: this.process.currentNodeId,
-          pdtDefectId: it.pdtDefectId,
-          defectCode: it.defectCode,
-          defectName: it.defectName,
-          defectTypesName: it.defectTypesName,
-          remarks: it.remarks,
-          ftyId: this.$store.state.user.ftyId
-        }
-      })
-      //工种缺陷
-      this.nodeData.jobDefectList = this.$refs?.jobDefectTable?.getTableDataFilter().map((it) => {
-        return {
-          flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
-          nodeId: this.process.currentNodeId,
-          jobId: it.jobId,
-          pdtDefectId: it.pdtDefectId,
-          defectCode: it.defectCode,
-          defectName: it.defectName,
-          defectTypesName: it.defectTypesName,
-          remarks: it.remarks,
-          ftyId: this.$store.state.user.ftyId
-        }
-      })
-      //跨流程工序
-      this.nodeData.routerList = this.$refs?.routerTable?.getTableDataFilter().map((it) => {
-        if (this.nodeData.routerType === 4) {
-          return {
-            routeType: this.nodeData.routerType,
-            flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
-            nodeId: this.process.currentNodeId,
-            node1Id: this.process.currentNodeId,
-            node2Id: it.node2Id,
-            node2IdName: it.node2IdName,
-            productGrade: it.productGrade,
-            moldingSysTags: it.moldingSysTags,
-            remarks: it.remarks,
-            ftyId: this.$store.state.user.ftyId
-          }
-        } else {
-          return {
-            routeType: this.nodeData.routerType,
-            flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
-            nodeId: this.process.currentNodeId,
-            node1Id: it.node1Id,
-            node2Id: this.process.currentNodeId,
-            backNodeId: it.backNodeId,
-            productGrade: it.productGrade,
-            moldingSysTags: it.moldingSysTags,
-            remarks: it.remarks,
-            ftyId: this.$store.state.user.ftyId
-          }
-        }
-      })
-      //数量
-      this.nodeData.cntPdtModel = this.nodeData.pdtList?.length  // 在制品型号数量
-      this.nodeData.cntCarModel = this.nodeData.carList?.length  // 可用载具数量
-      this.nodeData.cntQuyDefect = this.nodeData.defectList?.length  // 可检缺陷数量
-      this.nodeData.cntJobDefect = this.nodeData.flgJobDefect ? this.nodeData.jobDefectList?.length : -1  // 工种缺陷数量，产生缺陷为true时设置成 -1
-      // endregion
+      // 设置表单数据
+      this.setFormData()
 
       // region 设置图形业务数据
       //根据工序id获取工序数据
@@ -986,7 +848,154 @@ export default {
           }
         })
       }
-      //end
+      //endregion
+
+    },
+    /**
+     * @desc   : 设置表单数据
+     * @author : 张潇木
+     * @date   : 2023/5/30 17:19
+     */
+    setFormData(){
+      //判断当前哪些table存在，不存在的table 不需要重新设置数据
+      //操作工号
+      if(this.$refs.operateUserTable){
+        //将原操作工号删除
+        this.nodeData.userList =this.nodeData.userList.filter(it=>it.userKind!==this.$config.userKind.operate)
+        //取新的操作工号
+        let operateUserList = this.$refs?.operateUserTable?.getTableDataFilter().map((it, index) => {
+          return {
+            flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
+            nodeId: this.process.currentNodeId,
+            userId: it.userId,
+            userCode: it.userCode,
+            userName: it.userName,
+            userKind :this.$config.userKind.operate,
+            displayNo: index + 1,
+            remarks: it.remarks,
+            ftyId: this.$store.state.user.ftyId
+          }
+        })
+        //增加到userList中
+        this.nodeData.userList=[...this.nodeData.userList,...operateUserList]
+      }
+      //生产工号
+      if(this.$refs.productUserTable){
+        //将原操作工号删除
+        this.nodeData.userList =this.nodeData.userList.filter(it=>it.userKind!==this.$config.userKind.product)
+        //取新的生产工号
+        let productUserList = this.$refs?.productUserTable?.getTableDataFilter().map((it, index) => {
+          return {
+            flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
+            nodeId: this.process.currentNodeId,
+            userId: it.userId,
+            userCode: it.userCode,
+            userName: it.userName,
+            userKind :this.$config.userKind.product,
+            displayNo: index + 1,
+            remarks: it.remarks,
+            ftyId: this.$store.state.user.ftyId
+          }
+        })
+        //增加到userList中
+        this.nodeData.userList=[...this.nodeData.userList,...productUserList]
+      }
+      //工序在制品
+      if(this.$refs.pdtTable){
+        this.nodeData.pdtList = this.$refs?.pdtTable?.getTableDataFilter().map((it) => {
+          return {
+            flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
+            nodeId: this.process.currentNodeId,
+            pdtModelId: it.pdtModelId,
+            pdtModelCode: it.pdtModelCode,
+            pdtModelName: it.pdtModelName,
+            categoryName: it.categoryName,
+            remarks: it.remarks,
+            ftyId: this.$store.state.user.ftyId
+          }
+        })
+        this.nodeData.cntPdtModel = this.nodeData.pdtList?.length  // 在制品型号数量
+      }
+      //载具
+      if(this.$refs.carTable){
+        this.nodeData.carList = this.$refs?.carTable?.getTableDataFilter().map((it) => {
+          return {
+            flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
+            nodeId: this.process.currentNodeId,
+            carModelId: it.carModelId,
+            carModelCode: it.carModelCode,
+            carModelName: it.carModelName,
+            remarks: it.remarks,
+            ftyId: this.$store.state.user.ftyId
+          }
+        })
+        this.nodeData.cntCarModel = this.nodeData.carList?.length  // 可用载具数量
+      }
+      //缺陷
+      if(this.$refs.defectTable){
+        this.nodeData.defectList = this.$refs?.defectTable?.getTableDataFilter().map((it) => {
+        return {
+          flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
+          nodeId: this.process.currentNodeId,
+          pdtDefectId: it.pdtDefectId,
+          defectCode: it.defectCode,
+          defectName: it.defectName,
+          defectTypesName: it.defectTypesName,
+          remarks: it.remarks,
+          ftyId: this.$store.state.user.ftyId
+        }
+      })
+        this.nodeData.cntQuyDefect = this.nodeData.defectList?.length  // 可检缺陷数量
+      }
+      //工种缺陷
+      if(this.$refs.jobDefectTable) {
+        this.nodeData.jobDefectList = this.$refs?.jobDefectTable?.getTableDataFilter().map((it) => {
+          return {
+            flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
+            nodeId: this.process.currentNodeId,
+            jobId: it.jobId,
+            pdtDefectId: it.pdtDefectId,
+            defectCode: it.defectCode,
+            defectName: it.defectName,
+            defectTypesName: it.defectTypesName,
+            remarks: it.remarks,
+            ftyId: this.$store.state.user.ftyId
+          }
+        })
+        this.nodeData.cntJobDefect = this.nodeData.flgJobDefect ? this.nodeData.jobDefectList?.length : -1  // 工种缺陷数量，产生缺陷为true时设置成 -1
+      }
+      //跨流程工序
+      if(this.$refs.routerTable) {
+        this.nodeData.routerList = this.$refs?.routerTable?.getTableDataFilter().map((it) => {
+          if (this.nodeData.routerType === 4) {
+            return {
+              routeType: this.nodeData.routerType,
+              flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
+              nodeId: this.process.currentNodeId,
+              node1Id: this.process.currentNodeId,
+              node2Id: it.node2Id,
+              node2IdName: it.node2IdName,
+              productGrade: it.productGrade,
+              moldingSysTags: it.moldingSysTags,
+              remarks: it.remarks,
+              ftyId: this.$store.state.user.ftyId
+            }
+          } else {
+            return {
+              routeType: this.nodeData.routerType,
+              flowId: this.isFromIndex ? this.flowFormData.flowId : parseInt(this.$route.params.id),
+              nodeId: this.process.currentNodeId,
+              node1Id: it.node1Id,
+              node2Id: this.process.currentNodeId,
+              backNodeId: it.backNodeId,
+              productGrade: it.productGrade,
+              moldingSysTags: it.moldingSysTags,
+              remarks: it.remarks,
+              ftyId: this.$store.state.user.ftyId
+            }
+          }
+        })
+      }
     },
     /**
      * @desc   : 校验数据
@@ -1138,7 +1147,7 @@ export default {
 <style scoped>
 
 .ivu-divider-horizontal {
-  margin: 12px 0 !important;
+  margin: 10px 0 2px !important;
 }
 
 .switch {
@@ -1150,5 +1159,4 @@ export default {
 /deep/ .vxe-select-slots {
   z-index: 5100 !important;
 }
-
 </style>

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

@@ -59,6 +59,8 @@
                  :show-setting-flag="false"
                  :show-tip="true"
                  :choose-data-flag="true"
+                 :perspective-flag="false"
+                 :export="false"
                  :seq-tip-content="vm.$t('doubleSeq')"
                  @select-change="handleSelectChange"
                  @pageChange="pageSizeChange"
@@ -73,6 +75,8 @@
                  :primaryKey="selectKey"
                  :id="'table-'+$options.name"
                  :choose-flag="false"
+                 :perspective-flag="false"
+                 :export="false"
                  :show-setting-flag="false" :data="batchRowsPage" :operateFlag="true" :height="tableHeight"
                  :refreshSelect="false"
                  :add-flag="false"
@@ -95,6 +99,8 @@
                :refreshSelect="false"
                :show-setting-flag="false"
                :show-tip="true"
+               :perspective-flag="false"
+               :export="false"
                :seq-tip-content="vm.$t('doubleSeq')"
                :choose-data-flag="true"
                :linkClickChecked="true" @pageChange="pageSizeChange"
@@ -775,7 +781,7 @@ export default {
       }
       this.excute(this.service, this.service[this.methodsNameDetail], param).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          if(res.data &&res.data.list){
+          if (res.data && res.data.list) {
             let arr = [...res.data.list]
             if (this.multiple) {
               if (this.$refs['table-select'].batchKeys && this.$refs['table-select'].batchRows.length > 0) {
@@ -1111,7 +1117,7 @@ export default {
         self.selectLabel = 'staffName'
         self.columns = [
           {field: 'jobName'},
-          {field: 'staffCodeName', width: '200',title: self.$t('staff')},
+          {field: 'staffCodeName', width: '200', title: self.$t('staff')},
           {field: 'orgName', title: self.$t('orgId')},
           {field: 'postName'},
           {field: 'remarks', width: 'auto'}
@@ -1148,8 +1154,7 @@ export default {
         self.selectKey = 'userId'
         self.selectLabel = 'userName'
         self.columns = [
-          {field: 'userCode', width: '200'},
-          {field: 'userName', width: '200'},
+          {field: 'userCodeName', width: '200',title:self.$t('prodUserCode')},
         ]
       }
       // 部门
@@ -1191,15 +1196,15 @@ export default {
         self.columns = [
           {field: 'pdtBarcode', width: 'auto'},
           {field: 'hisPdtCodes', width: 'auto'},
-          {field: 'moldLineCode', width: 'auto',title: self.$t('moldlineCodeName')},
+          {field: 'moldLineCode', width: 'auto', title: self.$t('moldlineCodeName')},
           {field: 'moldingDate', width: 'auto'},
           {field: 'moldingBatch', width: 'auto'},
-          {field: 'moldingUserCodeName', width: 'auto',title: self.$t('moldingUserName')},
-          {field: 'productUniqueCode', width: 'auto' ,title: self.$t('pdtModel')},
+          {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: 'manageUserCodeName', width: 'auto',title: self.$t('manageUserName')},
+          {field: 'manageUserCodeName', width: 'auto', title: self.$t('manageUserName')},
           {field: 'renderMTime', width: 'auto'},
           {field: 'nodeName', width: 'auto'},
           {field: 'finishTime', width: 'auto'},
@@ -1382,13 +1387,13 @@ export default {
         ]
         self.selectKey = 'modelId'
         self.selectLabel = 'modelName'
-        self.modalWidth = 600
+        self.modalWidth = 550
         self.colCount = 2
         self.columns = [
           // {field: 'modelCode', width: '300'},
           // {field: 'modelName', width: '300', title: self.$t('productModelName')},
           {field: 'codeName', width: '300', title: self.$t('pdtModel')},
-          {field: 'categoryName', width: '300', title: self.$t('modelCategory')},
+          {field: 'levelName', width: '300', title: self.$t('productCategory')},
         ]
       }
       //模具
@@ -1526,10 +1531,9 @@ export default {
         self.modalWidth = 550
         self.colCount = 2
         self.selectKey = 'categoryId'
-        self.selectLabel = 'categoryCode'
+        self.selectLabel = 'levelName'
         self.columns = [
-          {field: 'categoryName', width: '200'},
-          {field: 'categoryCode', width: '200'},
+          {field: 'levelName', width: '200', title: self.$t('productCategory')},
         ]
       }
       // 窑炉
@@ -1613,18 +1617,14 @@ export default {
         self.methodsName = 'getModelCategoryPage'
         self.methodsNameDetail = 'getModelCategoryPage'
         self.searchContent = [
-          {itemCode: 'categoryCode'},
           {itemCode: 'categoryName'},
         ]
-        self.modalWidth = 650
+        self.modalWidth = 550
         self.colCount = 2
         self.selectKey = 'categoryId'
-        self.selectLabel = 'categoryCode'
+        self.selectLabel = 'levelName'
         self.columns = [
-          {field: 'categoryCode', width: '200'},
-          {field: 'categoryName', width: '200'},
-          {field: 'modelKindName', width: '200'},
-          {field: 'levelName', width: '200'},
+          {field: 'levelName', width: '200', title: self.$t('productCategory')},
         ]
       }
       // 模具类别（分页）
@@ -1633,16 +1633,14 @@ export default {
         self.methodsName = 'getModelCategoryByPage'
         self.methodsNameDetail = 'getModelCategoryByPage'
         self.searchContent = [
-          {itemCode: 'categoryCode'},
           {itemCode: 'categoryName'},
         ]
         self.modalWidth = 550
         self.colCount = 2
         self.selectKey = 'categoryId'
-        self.selectLabel = 'categoryCode'
+        self.selectLabel = 'levelName'
         self.columns = [
-          {field: 'categoryName', width: '200'},
-          {field: 'categoryCode', width: '200'},
+          {field: 'levelName', width: '200', title: self.$t('productCategory')},
         ]
       }
       // 湿温度计（分页）
@@ -1710,15 +1708,15 @@ export default {
         self.methodsName = 'getMoldlineType'
         self.methodsNameDetail = 'getMoldlineType'
         self.searchContent = [
-          {itemCode: 'modelCode',itemName:'typesOfCode'},
+          {itemCode: 'modelCode', itemName: 'typesOfCode'},
         ]
         self.modalWidth = 550
         self.colCount = 2
         self.selectKey = 'modelId'
         self.selectLabel = 'modelCode'
         self.columns = [
-          {field: 'modelCode',title: this.$t('typesOfCode'), width: '200'},
-          {field: 'modelName',title: this.$t('typesOfName'), width: '200'},
+          {field: 'modelCode', title: this.$t('typesOfCode'), width: '200'},
+          {field: 'modelName', title: this.$t('typesOfName'), width: '200'},
         ]
       }
       // 数据字典
@@ -1727,15 +1725,15 @@ export default {
         self.methodsName = 'getDictionaryData'
         self.methodsNameDetail = 'getDictionaryData'
         self.searchContent = [
-          {itemCode: 'dictCode',itemName:'experimentCode'},
+          {itemCode: 'dictCode', itemName: 'experimentCode'},
         ]
         self.modalWidth = 550
         self.colCount = 2
         self.selectKey = 'dataId'
         self.selectLabel = 'dictCode'
         self.columns = [
-          {field: 'dictCode', title: this.$t('experimentCode'),width: '100'},
-          {field: 'dataValue',title: this.$t('experimentValue'), width: '150'},
+          {field: 'dictCode', title: this.$t('experimentCode'), width: '100'},
+          {field: 'dataValue', title: this.$t('experimentValue'), width: '150'},
         ]
       }
     }

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

@@ -160,7 +160,7 @@
                          :title="cItem.title?cItem.title:$t(cItem.field)"
                          :resize-flag="cIndex == columns.length-1"></DkTableColumn>
         </DkTable>
-        <div style="width: 100%;text-align: right;" v-if="searchDetailFlag">
+        <div class="look-more-class" v-if="searchDetailFlag">
           <a @click="lookMore">{{ $t('lookMore') }}</a>
         </div>
       </div>
@@ -1201,12 +1201,10 @@ export default {
         this.selectLabel = 'staffName'
         this.columns = [
           {field: 'jobName', width: '150'},
-          {field: 'staffCode', width: '120'},
-          {field: 'staffName', width: 'auto'},
+          {field: 'staffCodeName', width: '120',title:this.$t('staff')},
         ]
         this.columnsDetail = [
-          {field: 'staffCode', width: '150'},
-          {field: 'staffName', width: '150'},
+          {field: 'staffCodeName', width: '120',title:this.$t('staff')},
           {field: 'orgName', width: '150', title: this.$t('orgId')},
           {field: 'jobName', width: '150'},
           {field: 'remarks', width: 'auto'},
@@ -1259,8 +1257,8 @@ export default {
         this.columnsDetail = [
           // {field: 'modelCode', width: '150'},
           // {field: 'modelName', width: '150'},
-          {field: 'codeName', width: '150'},
-          {field: 'categoryName', width: '150'},
+          {field: 'codeName', width: '150',title:this.$t('pdtModel')},
+          {field: 'levelName',  title: this.$t('productCategory')},
           {field: 'remarks', width: 'auto'},
         ]
       }
@@ -1313,7 +1311,7 @@ export default {
         this.columnsDetail = [
           // {field: 'modelCode', width: '150'},
           // {field: 'modelName', width: '150'},
-          {field: 'codeName', width: '150'},
+          {field: 'codeName', width: '150' ,title:this.$t('pdtModel')},
           {field: 'remarks', width: 'auto'},
         ]
       }
@@ -1460,7 +1458,6 @@ export default {
         this.columnsDetail = [
           {field: 'modelCode', minWidth: '100'},
           {field: 'modelName', minWidth: '100'},
-          {field: 'categoryName', minWidth: '100'},
         ]
       }
       //产品实验单产品

src/components/sub/xm-select/index.vue

@@ -334,7 +334,6 @@ export default {
   color: #c5c8ce;
   display: block !important;
   overflow: hidden !important;
-  font-size: 12px !important;
   padding: 0 7px !important;
 }
 

src/font-less/font-12.less

@@ -38,6 +38,23 @@
   font-size: @font_size !important;
 }
 
+.vxe-table--empty-content{
+  font-size:  @font_size !important;
+}
+
+
+.xm-tips{
+  font-size:  @font_size !important;
+}
+
+.ivu-modal-body .content-div{
+  font-size:  @font_size !important;
+}
+
+.look-more-class{
+  font-size:  @font_size !important;
+}
+
 .drawer .drawer-content {
   font-size:  @font_size !important;
 }

src/font-less/font-13.less

@@ -29,6 +29,22 @@
   resize: none;
 }
 
+.vxe-table--empty-content{
+  font-size:  @font_size !important;
+}
+
+.look-more-class{
+  font-size:  @font_size !important;
+}
+
+.ivu-modal-body .content-div{
+  font-size:  @font_size !important;
+}
+
+.xm-tips{
+  font-size:  @font_size !important;
+}
+
 .drawer .drawer-content {
   font-size:  @font_size !important;
 }

src/font-less/font-14.less

@@ -38,6 +38,22 @@
   resize: none;
 }
 
+.vxe-table--empty-content{
+  font-size:  @font_size !important;
+}
+
+.ivu-modal-body .content-div{
+  font-size:  @font_size !important;
+}
+
+.look-more-class{
+  font-size:  @font_size !important;
+}
+
+.xm-tips{
+  font-size:  @font_size !important;
+}
+
 .drawer .drawer-content {
   font-size:  @font_size !important;
 }

src/index.less

@@ -779,6 +779,11 @@
   background-size: 1px 100%, 100% 0px !important;
 }
 
+.look-more-class{
+  width: 100%;
+  text-align: right;
+}
+
 
 
 /**************app的共同样式****************/

src/locale/lang/zh-CN.js

@@ -964,7 +964,7 @@ export const columns = {
   changeNodeName: '变更工序',
   modelEquipment: '设备型号',
   moldlineGroupNo: '分组序号',
-  productCategoryName: '产品类别',
+  productCategoryName: '产品分类',
   productionUserCode: '生产工号',
   productionProcess: '生产工序',
   crovMonth: '结转月份',
@@ -991,7 +991,7 @@ export const columns = {
   processName: '工序名称',
   operatingInstructions: '操作说明',
   opnKindName: '操作类型',
-  mouldItemCode: '模具序号',
+  mouldItemCode: '模具位置',
   perMouldKindName: '操作状态',
   inspectionProcess: '检验工序',
   inspectUserCode: '检验工号',
@@ -1063,6 +1063,7 @@ export const columns = {
   externalNo: '外部编号',
   qualityNoName: '重烧标识',
   staffCodeName:'员工',
+  defectCodeName:'产品缺陷',
 }
 
 /**

src/view/core/user/form.vue

@@ -158,10 +158,9 @@ export default {
       ],
       // 业务员列表
       staffColumns: [
-        // 业务员
-        {field: 'staffCode', type: 'disabled', width: 255},
         {
           field: 'staffName',
+          title:self.$t('staff'),
           width: 255,
           sortBoolean: false,
           controlId: 'staffId',

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

@@ -22,13 +22,13 @@
             <InputPop ref="barCode" name="barCode" v-model="formData.barCode" @on-enter="onEnterBlur"
                       @on-blur="onBarCode" @on-clear="clearFromData"/>
           </DkFormItem>
-          <!--产品型号-->
-          <DkFormItem prop="modelCode" :label="$t('appMoldNo')">
+          <!--模具编号-->
+          <DkFormItem prop="modelCode" :label="$t('modelMouldCode')">
             <InputPop ref="modelCode" v-model="formData.modelCode" :readonly="true"/>
           </DkFormItem>
           <!--成型线-->
-          <DkFormItem prop="moldlineName">
-            <InputPop ref="moldlineName" v-model="formData.moldlineName" :readonly="true"/>
+          <DkFormItem prop="moldlineCode" :label="$t('moldlineCodeName')">
+            <InputPop ref="moldlineCode" v-model="formData.moldlineCode" :readonly="true"/>
           </DkFormItem>
           <!--完成工序-->
           <DkFormItem prop="pdtFlowNodeName" :label="$t('reasonPdtFlowNodeName')">
@@ -39,20 +39,16 @@
             <InputPop ref="carrierCode" v-model="formData.carrierCode" :readonly="true"/>
           </DkFormItem>
           <!--商标-->
-          <DkFormItem prop="logoName">
-            <InputPop ref="logoName" v-model="formData.logoName" :readonly="true"/>
+          <DkFormItem prop="logoCodeName" :label="$t('productLogo')">
+            <InputPop ref="logoCodeName" v-model="formData.logoCodeName" :readonly="true"/>
           </DkFormItem>
           <!--釉色-->
-          <DkFormItem prop="colourName">
-            <InputPop ref="colourName" v-model="formData.colourName" :readonly="true"/>
-          </DkFormItem>
-          <!--编码-->
-          <DkFormItem prop="productCode">
-            <InputPop ref="productCode" v-model="formData.productCode" :readonly="true"/>
+          <DkFormItem prop="colourCodeName" :label="$t('productColour')">
+            <InputPop ref="colourCodeName" v-model="formData.colourCodeName" :readonly="true"/>
           </DkFormItem>
-          <!--名称-->
-          <DkFormItem prop="productName">
-            <InputPop ref="productName" v-model="formData.productName" :readonly="true"/>
+          <!--产品型号-->
+          <DkFormItem prop="modelCodeName" :label="$t('pdtModel')">
+            <InputPop ref="modelCodeName" v-model="formData.modelCodeName" :readonly="true"/>
           </DkFormItem>
         </DkForm>
       </DkPanel>
@@ -97,7 +93,7 @@
                              @ok="chooseBlameUser"></SelectMagnifier>
           </DkFormItem>
           <!--   备注     -->
-          <DkFormItem prop="remarks">
+          <DkFormItem prop="remarks" :span="8">
             <InputPop v-model="LossReportingFormData.remarks"/>
           </DkFormItem>
         </DkForm>
@@ -114,8 +110,7 @@
                    :show-setting-flag="false"
                    name="table">
             <DkTableColumn field="jobName" :title="$t('jobName')"></DkTableColumn>
-            <DkTableColumn field="staffCode" :title="$t('staffCode')" width="auto"></DkTableColumn>
-            <DkTableColumn field="staffName" :title="$t('staffName')"></DkTableColumn>
+            <DkTableColumn field="staffCodeName" :title="$t('staff')" width="auto"></DkTableColumn>
           </DkTable>
         </div>
       </DkPanel>
@@ -157,15 +152,14 @@
           barCode: '',
           ftyId: this.$store.state.user.ftyId,
           productId: null,
-          productCode: null,
-          productName: null,
-          logoName: null,//商标
-          colourName: null,//釉色
+          modelCodeName: null,
+          logoCodeName: null,//商标
+          colourCodeName: null,//釉色
           moldingDate: null,//成型日期
-          modelCode: null,//产品型号
+          modelCode: null,//模具编号
           pdtFlowNodeName: null,//完成工序
           carrierCode: null,//所在载具
-          moldlineName: null,//成型线
+          moldlineCode: null,//成型线
         },
         //记录产品条码
         oldBarCode: null,
@@ -189,7 +183,7 @@
         detailColumns: [
           // 产品条码
           { field: 'barCode', type: 'disabled', width: 'auto' },
-          //产品型号
+          //模具编号
           { field: 'modelCode', title: self.$t('appMoldNo'), type: 'disabled', width: 'auto' },
           // 成型日期
           { field: 'moldingDate', type: 'disabled', width: 'auto' },
@@ -198,13 +192,15 @@
           //所在载具
           { field: 'carrierCode', title: self.$t('reasonCarrierCode'), type: 'disabled', width: 'auto' },
           //商标
-          { field: 'logoName', type: 'disabled', width: 'auto' },
+          { field: 'logoCodeName', type: 'disabled', width: 'auto' ,title: self.$t('productLogo')},
           //釉色
-          { field: 'colourName', type: 'disabled', width: 'auto' },
-          //产品编码
-          { field: 'productCode', type: 'disabled', width: 'auto' },
-          //产品名称
-          { field: 'productName', type: 'disabled', width: 'auto' },
+          { field: 'colourCodeName', type: 'disabled', width: 'auto',title: self.$t('productColour') },
+          // 产品型号
+          { field: 'modelCodeName', type: 'disabled', width: 'auto' ,title: self.$t('pdtModel') }
+          // //产品编码
+          // { field: 'productCode', type: 'disabled', width: 'auto' },
+          // //产品名称
+          // { field: 'productName', type: 'disabled', width: 'auto' },
         ],
         staffList: [],//责任员工
         addRowFlag: true,//保存至明细可用标识
@@ -220,15 +216,14 @@
         this.formData = {
           barCode: '',
           productId: null,
-          productCode: null,
-          productName: null,
-          logoName: null,//商标
-          colourName: null,//釉色
+          modelCodeName: null,
+          logoCodeName: null,//商标
+          colourCodeName: null,//釉色
           moldingDate: null,//成型日期
           modelCode: null,//产品型号
           pdtFlowNodeName: null,//完成工序
           carrierCode: null,//所在载具
-          moldlineName: null,//成型线
+          moldlineCode: null,//成型线
         }
       },
       /**
@@ -253,15 +248,15 @@
           this.excute(this.$service.collectService, this.$service.collectService.checkBarCodeScrap, param).then(res => {
             if (res.code === this.$config.SUCCESS_CODE) {
               this.formData.productId = res.data.uniqueId
-              this.formData.productCode = res.data.modelCode
-              this.formData.productName = res.data.modelName
-              this.formData.logoName = res.data.logoName
-              this.formData.colourName = res.data.colourName
+              this.formData.modelCodeName = res.data.modelCodeName
+              this.formData.logoCodeName = res.data.logoCodeName
+              this.formData.colourCodeName = res.data.colourCodeName
               this.formData.moldingDate = res.data.moldingDate
               this.formData.modelCode = res.data.moldlineItemCode
               this.formData.pdtFlowNodeName = res.data.pdtFlowNodeName
               this.formData.carrierCode = res.data.carrierCode
               this.formData.moldlineName = res.data.moldlineName
+              this.formData.moldlineCode = res.data.moldlineCode
               this.nodeList = res.data.productionList
             } else {
               this.formData.barCode = null
@@ -371,15 +366,14 @@
           list.splice(0, 0, {})
           list[0].barCode = this.formData.barCode//产品条码
           list[0].productId = this.formData.productId
-          list[0].productCode = this.formData.productCode//产品编码
-          list[0].productName = this.formData.productName//产品名称
-          list[0].logoName = this.formData.logoName//商标
-          list[0].colourName = this.formData.colourName//釉色
+          list[0].modelCodeName = this.formData.modelCodeName//产品编码
+          list[0].logoCodeName = this.formData.logoCodeName//商标
+          list[0].colourCodeName = this.formData.colourCodeName//釉色
           list[0].moldingDate = this.formData.moldingDate//成型时间
           list[0].modelCode = this.formData.modelCode//型号编码
           list[0].pdtFlowNodeName = this.formData.pdtFlowNodeName//完成工序
           list[0].carrierCode = this.formData.carrierCode//所在载具
-          list[0].moldlineName = this.formData.moldlineName//成型线
+          list[0].moldlineCode = this.formData.moldlineCode//成型线
           this.detailList.push(list[0])
           //清空表单
           this.clear(true)
@@ -457,10 +451,9 @@
       clear(value) {
         this.formData.barCode = null
         this.formData.productId = null
-        this.formData.productCode = null
-        this.formData.productName = null
-        this.formData.logoName = null
-        this.formData.colourName = null
+        this.formData.modelCodeName = null
+        this.formData.logoCodeName = null
+        this.formData.colourCodeName = null
         this.formData.moldingDate = null
         this.formData.moldlineName = null
         this.formData.modelCode = null
@@ -470,6 +463,7 @@
           this.detailList = []
           this.LossReportingFormData.blameUserId = null
           this.LossReportingFormData.userName = null
+          this.LossReportingFormData.blameNodeId = null
           this.LossReportingFormData.opnGradeId = null
           this.LossReportingFormData.gradeName = null
           this.LossReportingFormData.pdtDefectId = null
@@ -514,6 +508,8 @@
       },
     },
     created() {
+      //默认给新建为了保存不关页面
+      this.typeData = this.$config.formMode.add
       //查询产品分级
       this.getGrade()
       //查询损柸原因
@@ -523,5 +519,8 @@
 </script>
 
 <style scoped>
-
+/deep/.ivu-btn > span {
+  display: flex;
+  align-items: center;
+}
 </style>

src/view/report/in-product-report/index.vue

@@ -81,6 +81,7 @@ export default {
           //成型线编码
           {
             itemCode: 'moldLineCode',
+            itemName:self.$t('moldlineCodeName'),
             valueFormat: {code: 'moldlineId'},
             valueKind: self.$config.docUserInput.mSearch,
             magnifierType: self.$config.MagnifierType.moldline
@@ -97,6 +98,7 @@ export default {
           //产品名称
           {
             itemCode: 'appProductName',
+            itemName: self.$t('pdtModel'),
             valueFormat: {code: 'modelId'},
             valueKind: self.$config.docUserInput.mSearch,
             magnifierType: self.$config.MagnifierType.product

src/view/report/kiln-car-status-report/index.vue

@@ -23,7 +23,7 @@
     <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
       <DkSplit mode="vertical" v-model="split" :height="tableHeight">
         <DkTable slot="top" :id="'table-'+$options.name" ref="table-select" :data="tableData"
-                 :height="this.tableHeight * split - 45"
+                 :height="this.tableHeight * split - 35"
                  primaryKey="uniqueId"
                  :choose-flag="false"
                  @pageChange="pageSizeChange"
@@ -33,9 +33,11 @@
                  @current-change="currentChange($event)"
                  name="table">
           <!-- 窑炉编码 -->
-          <DkTableColumn field="kilnCode" width="200px" ></DkTableColumn>
+          <DkTableColumn field="kilnCodeName" :title="$t('equipKiln')"></DkTableColumn>
+          <!-- 窑炉类型 -->
+          <DkTableColumn field="kilnType" ></DkTableColumn>
           <!-- 窑车编码 -->
-          <DkTableColumn field="carCode" :title="$t('carCode')"></DkTableColumn>
+          <DkTableColumn field="carCode" :title="$t('carrKilnCar')"></DkTableColumn>
           <!-- 当前工序 -->
           <DkTableColumn field="currentNode"></DkTableColumn>
           <!-- 最大产品数量 -->
@@ -49,7 +51,7 @@
           <DkTable v-show="detailModel===this.$config.KilnCarStatusText.productionData" :pageFlag="true" multiple
                    primaryKey="itemId"
                    :id="'table-'+$options.name"
-                   :height="this.tableHeight * (1-split) - 15"
+                   :height="this.tableHeight * (1-split) - 35"
                    ref="not-counted-select"
                    name="notCountedTable"
                    :choose-flag="false"
@@ -59,9 +61,9 @@
             <!-- 创建时间-->
             <DkTableColumn field="opCreateTime" :title="$t('operationTime')"  :dataType="$config.dataType.dateTime"></DkTableColumn>
             <!-- 生产工号-->
-            <DkTableColumn field="makeUserId"></DkTableColumn>
+            <DkTableColumn field="makeUserCodeName" :title="$t('makeUserName')"></DkTableColumn>
             <!-- 操作者-->
-            <DkTableColumn field="opnUserName"></DkTableColumn>
+            <DkTableColumn field="opnUserCodeName" :title="$t('opnUserName')"></DkTableColumn>
             <!-- 操作说明-->
             <DkTableColumn field="operatingInstructions"></DkTableColumn>
           </DkTable>
@@ -70,21 +72,19 @@
           <DkTable v-show="detailModel===this.$config.KilnCarStatusText.KilnCarProducts" :pageFlag="true" multiple
                    primaryKey="itemId"
                    :id="'table-'+$options.name"
-                   :height="this.tableHeight * (1-split) - 15"
+                   :height="this.tableHeight * (1-split) - 35"
                    ref="counted-select"
                    name="countedTable"
                    :choose-flag="false"
                    :data="kilnCarProductsData">
             <!-- 产品条码-->
             <DkTableColumn field="pdtBarcode"></DkTableColumn>
-            <!-- 产品编码-->
-            <DkTableColumn field="productCode"></DkTableColumn>
+            <!-- 产品型号-->
+            <DkTableColumn field="codeName" :title="$t('pdtModel')"></DkTableColumn>
             <!-- 窑车位置-->
             <DkTableColumn  field="rangeNo" :title="$t('kilnCarPlace')"></DkTableColumn>
             <!-- 生产工号-->
             <DkTableColumn field="proUserCode"  :title="$t('makeUserId')" ></DkTableColumn>
-            <!-- 员工姓名-->
-            <DkTableColumn field="staffNames"></DkTableColumn>
             <!-- 操作时间-->
             <DkTableColumn field="operationTime" :dataType="$config.dataType.dateTime"></DkTableColumn>
             <!-- 操作者-->

src/view/report/mould-follow-report/index.vue

@@ -29,14 +29,15 @@
                name="table">
         <DkTableColumn field="mouldUniqueCode"></DkTableColumn>
         <DkTableColumn field="mouldKindName"></DkTableColumn>
-        <DkTableColumn field="modelCodes" :title="$t('productCode')"></DkTableColumn>
+        <DkTableColumn field="modelCodes" :title="$t('pdtModel')"></DkTableColumn>
         <DkTableColumn field="makeDate" data-type="date"></DkTableColumn>
-        <DkTableColumn field="prodUserCode"></DkTableColumn>
+        <DkTableColumn field="prodUserCodeName" :title="$t('prodUserCode')"></DkTableColumn>
         <DkTableColumn field="stdNum" data-type="number"></DkTableColumn>
         <DkTableColumn field="moldedNum" data-type="number"></DkTableColumn>
+        <DkTableColumn field="unusedNum" data-type="number"></DkTableColumn>
 <!--        <DkTableColumn field="moldlineCode"></DkTableColumn>-->
         <!-- 成型线 -->
-        <DkTableColumn field="moldlineCodeName"></DkTableColumn>
+        <DkTableColumn field="moldlineCode" :title="$t('moldlineCodeName')"></DkTableColumn>
         <DkTableColumn field="mouldItemCode"></DkTableColumn>
       </DkTable>
 
@@ -44,7 +45,7 @@
         <DkTabs v-model="mouldFollowItemTab" :options="detailOptions"></DkTabs>
         <!--明细信息-->
         <DkTable v-if="mouldFollowItemTab === this.$config.mouldFollowItemTab.mouldFollowItem"
-                 :height="this.tableHeight * (1-split) - 25"
+                 :height="this.tableHeight * (1-split) - 35"
                  primaryKey="itemId"
                  :id="'table-'+$options.name"
                  name="table"
@@ -56,13 +57,13 @@
                  :current-page="detailPageInfo.currentPage"
                  @pageChange="detailPageSizeChange">
           <DkTableColumn field="opnTime" :title="$t('operationTime')" data-type="dateTime"></DkTableColumn>
-          <DkTableColumn field="opCreateUserCode"></DkTableColumn>
+          <DkTableColumn field="opCreateUserCodeName" :title="$t('opCreateUserCode')"></DkTableColumn>
           <DkTableColumn field="opnKindName"></DkTableColumn>
           <DkTableColumn field="perMouldKindName"></DkTableColumn>
           <DkTableColumn field="stdNum" data-type="number"></DkTableColumn>
           <DkTableColumn field="moldedNum" data-type="number"></DkTableColumn>
           <DkTableColumn field="unusedNum" data-type="number"></DkTableColumn>
-          <DkTableColumn field="moldlineCode"></DkTableColumn>
+          <DkTableColumn field="moldlineCode" :title="$t('moldlineCodeName')"></DkTableColumn>
           <DkTableColumn field="mouldItemCode"></DkTableColumn>
 <!--          <DkTableColumn field="operatingInstructions" width="auto"></DkTableColumn>-->
           <DkTableColumn field="remarks" width="auto"></DkTableColumn>

src/view/report/product-follow-report/index.vue

@@ -34,8 +34,8 @@
         <!--产品型号（编码+名称）-->
         <DkTableColumn field="codeName" :title="$t('pdtModel')"></DkTableColumn>
         <DkTableColumn field="categoryName" :title="$t('productCategoryName')"></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="erpModelCode"></DkTableColumn>
         <DkTableColumn field="pdtSpecs"></DkTableColumn>
 <!--        <DkTableColumn field="moldlineCode"></DkTableColumn>-->
@@ -43,7 +43,7 @@
         <DkTableColumn field="moldlineCodeName"></DkTableColumn>
         <DkTableColumn field="itemCode" :title="$t('moldingModelCode')"></DkTableColumn>
         <DkTableColumn field="thisMoldedNum" data-type="number"></DkTableColumn>
-        <DkTableColumn field="moldingUserCode"></DkTableColumn>
+        <DkTableColumn field="moldingUserCodeName"></DkTableColumn>
         <DkTableColumn field="moldingDate" data-type="date"></DkTableColumn>
         <DkTableColumn field="moldingBatch" data-type="number"></DkTableColumn>
         <DkTableColumn field="pdtProdStatusName"></DkTableColumn>
@@ -66,13 +66,13 @@
                  :page-total="detailPageInfo.total"
                  :current-page="detailPageInfo.currentPage"
                  @pageChange="detailPageSizeChange">
-          <DkTableColumn field="flowName"></DkTableColumn>
+          <DkTableColumn field="flowName" :title="$t('processFlow')"></DkTableColumn>
           <DkTableColumn field="nodeName" :title="$t('processName')"></DkTableColumn>
-          <DkTableColumn field="prodUserCode"></DkTableColumn>
-          <DkTableColumn field="defectName"></DkTableColumn>
+          <DkTableColumn field="prodUserCodeName" :title="$t('opnUserCode')"></DkTableColumn>
+          <DkTableColumn field="defectCodeName"></DkTableColumn>
           <DkTableColumn field="pdtGradeName"></DkTableColumn>
-          <DkTableColumn field="kilnCode"></DkTableColumn>
-          <DkTableColumn field="kilnCarCode"></DkTableColumn>
+          <DkTableColumn field="kilnCodeName" :title="$t('equipKiln')"></DkTableColumn>
+          <DkTableColumn field="kilnCarCode" :title="$t('carrKilnCar')"></DkTableColumn>
           <DkTableColumn field="opType" :title="$t('dataOpType')" width="300"></DkTableColumn>
           <DkTableColumn field="opnTime" :title="$t('operationTime')" data-type="dateTime"></DkTableColumn>
           <DkTableColumn field="opCreateUserCode"></DkTableColumn>