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

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

@@ -1614,7 +1614,7 @@ export default {
           {itemCode: 'categoryCode'},
           {itemCode: 'categoryName'},
         ]
-        self.modalWidth = 550
+        self.modalWidth = 650
         self.colCount = 2
         self.selectKey = 'categoryId'
         self.selectLabel = 'categoryCode'
@@ -1622,6 +1622,7 @@ export default {
           {field: 'categoryCode', width: '200'},
           {field: 'categoryName', width: '200'},
           {field: 'modelKindName', width: '200'},
+          {field: 'levelName', width: '200'},
         ]
       }
       // 模具类别（分页）

src/locale/lang/zh-CN.js

@@ -758,6 +758,7 @@ export const columns = {
   productBarCode: '条码变更',
   moldLineName: '成型线名称',
   moldingType: '成型线类型',
+  moldlineType: '成型线类型',
   changeDate: '变更日期',
   changeDateTime: '变更时间',
   productUniqueCode: '产品编号',

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',
           },
         ],