1、修改明细报表列的显示

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

@@ -1259,7 +1259,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: 'categoryName', width: '150'},
           {field: 'remarks', width: 'auto'},
         ]
@@ -1313,7 +1313,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'},
         ]
       }

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: '检验工号',
@@ -1059,6 +1059,7 @@ export const columns = {
   externalNo: '外部编号',
   qualityNoName: '重烧标识',
   staffCodeName:'员工',
+  defectCodeName:'产品缺陷',
 }
 
 /**

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>