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

src/components-app/base/dk-app-custom-tabs/dk-app-custom-tabs.vue

@@ -1,7 +1,7 @@
 <!-- @desc:tabs组件  @auth:admin  @time:2022/12/29 10:47 -->
 <template>
   <van-tabs v-model="active" @click="click">
-    <van-tab v-for="(item,index) in tabsTitles" :title="item.title" :name="item.name">
+    <van-tab v-for="(item,index) in tabsTitles" :title="item.title" :name="item.name" :key="index">
       <slot :name="item.name"/>
     </van-tab>
   </van-tabs>

src/components-app/base/dk-app-popup/dk-app-popup.vue

@@ -5,7 +5,7 @@
 
         <van-grid square :border="false" icon-size="42px">
 
-          <van-grid-item use-slot v-for="(item,index ) in gridItemList" @click="onClick(item)" >
+          <van-grid-item use-slot v-for="(item,index ) in gridItemList" @click="onClick(item)" :key="index">
             <div>
               <van-image width="40" height="40" :src="item.imagePath"/>
             </div>

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/business/select-magnifier/select-magnifier.vue

@@ -1702,6 +1702,23 @@ export default {
           {field: 'staffName', width: '200'},
         ]
       }
+      // 型号种类 成型线类型
+      if (self.type === self.$config.MagnifierType.getKind) {
+        self.service = this.$service.commonService
+        self.methodsName = 'getDataKind'
+        self.methodsNameDetail = 'getDataKind'
+        self.searchContent = [
+          {itemCode: 'kindCode'},
+        ]
+        self.modalWidth = 550
+        self.colCount = 2
+        self.selectKey = 'kindCode'
+        self.selectLabel = 'kindName'
+        self.columns = [
+          {field: 'kindCode', width: '200'},
+          {field: 'kindName', width: '200'},
+        ]
+      }
     }
   },
   mounted() {

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: [
@@ -644,6 +645,8 @@ export default {
     flgBindUniqueFalse: '未绑码',
     flgScrapTrue: '损坯',
     flgScrapFalse: '未损坯',
+    flgExperimentTrue: '有效',
+    flgExperimentFalse: '无效',
   },
   /**
    * @desc   : 有显示顺序的表
@@ -981,6 +984,8 @@ export default {
     getStaffWithWork: 'getStaffWithWork',
     //可判分级-检验模型
     judgeGrade:'judgeGrade',
+    //型号种类 成型线类型
+    getKind:'getKind',
   },
 
   /**

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': '模具产出',
@@ -489,7 +489,7 @@ export const columns = {
 
   modelId: '型号',
   modelCode: '型号编号',
-  modelCName:'型号名称',
+  modelCName: '型号名称',
   modelName: '型号名称',
   modelCategory: '型号分类',
   modelCategoryName: '型号分类',
@@ -991,15 +991,16 @@ export const columns = {
   inspectUserCode: '检验工号',
   inspectStation: '检验工位',
   inspectMissTime: '检验漏扫时间',
+  moldLineKindName: '成型线类型',
+  flgExperimentList: '实验标识',
 
   //产品实验单
-  expCode:'实验单号',
-  expName:'实验单名',
-  makeUserCodeAndName:'制单人',
-  modelCodeAndName:'产品编码名称',
-  startNodeName:'开始工序',
-  opCreateUserCodeAndName:'创建用户',
-
+  expCode: '实验单号',
+  expName: '实验单名',
+  makeUserCodeAndName: '制单人',
+  modelCodeAndName: '产品编码名称',
+  startNodeName: '开始工序',
+  opCreateUserCodeAndName: '创建用户',
 
 
   // 自定义报表
@@ -1015,8 +1016,8 @@ export const columns = {
   dataType: '数据类型',
   flgPage: '分页',
   userNames: '用户',
-  userCodeName:'用户',
-  mouldCodeName:'模具型号',
+  userCodeName: '用户',
+  mouldCodeName: '模具型号',
   reportKind: '条件类型',
   reportType: '报表类型',
   reportTypeName: '报表类型',
@@ -1049,6 +1050,7 @@ export const columns = {
   app: '移动端',
   refreshBasicData: '刷新基础数据',
   moldlineCodeName: '成型线',
+  externalNo: '外部编号',
   qualityNoName: '重烧标识',
 }
 

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/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/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/report/molding-record-report/index.vue

@@ -34,33 +34,57 @@
 <!--        <DkTableColumn field="moldlineName"></DkTableColumn>-->
         <!-- 成型线 -->
         <DkTableColumn field="moldlineCodeName"></DkTableColumn>
+        <!--成型线类型-->
+        <DkTableColumn field="moldLineKindName"></DkTableColumn>
+        <!-- 分组序号 -->
         <DkTableColumn field="moldlineGroupNo" :title="$t('groupNo')" :data-type="$config.dataType.number"></DkTableColumn>
+        <!-- 成型日期 -->
         <DkTableColumn field="moldingDate" data-type="date"></DkTableColumn>
+        <!-- 成型批次 -->
         <DkTableColumn field="moldingBatch" data-type="number"></DkTableColumn>
+        <!-- 成型工号 -->
         <DkTableColumn field="moldingUserName"></DkTableColumn>
 <!--        <DkTableColumn field="modelCode" :title="$t('appProductCodeB')"></DkTableColumn>-->
 <!--        <DkTableColumn field="modelName" :title="$t('appProductName')"></DkTableColumn>-->
         <!--产品型号（编码+名称）-->
         <DkTableColumn field="codeName" :title="$t('pdtModel')"></DkTableColumn>
+        <!-- 模具编号 -->
         <DkTableColumn field="itemCode" :title="$t('moldingModelCode')"></DkTableColumn>
+        <!-- 模具状态 -->
         <DkTableColumn field="modelMouldKindName" :title="$t('mouldKindName')"></DkTableColumn>
+        <!-- 成型标识 -->
         <DkTableColumn field="flgMolding" type="switch" :switch-disabled="true"></DkTableColumn>
+        <!-- 未成型原因 -->
         <DkTableColumn field="unmoldedReasonName"></DkTableColumn>
+        <!-- 模具当前成型次数 -->
         <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="productUniqueCode" :title="$t('barCode')"></DkTableColumn>
+        <!-- 产品商标 -->
         <DkTableColumn field="logoName" :title="$t('pdtLogoName')"></DkTableColumn>
+        <!-- 产品釉色 -->
         <DkTableColumn field="colourName" :title="$t('pdtColourName')"></DkTableColumn>
+        <!-- 开摸损标识 -->
         <DkTableColumn field="flgScrap" type="switch" :switch-disabled="true"></DkTableColumn>
+        <!-- 开摸损日期-->
         <DkTableColumn field="scrapDate" :title="$t('moldingScrapDate')" data-type="date"></DkTableColumn>
+        <!-- 开摸损原因 -->
         <DkTableColumn field="scrapReasonName"></DkTableColumn>
+        <!-- 交柸标识 -->
         <DkTableColumn field="flgRenderM" type="switch" :switch-disabled="true"></DkTableColumn>
+        <!-- 交柸时间 -->
         <DkTableColumn field="renderMTime" data-type="date"></DkTableColumn>
 <!--        <DkTableColumn field="manageUserCode"></DkTableColumn>-->
 <!--        <DkTableColumn field="manageUserName" :title="$t('manageUserNameB')"></DkTableColumn>-->
+        <!-- 成型班长 -->
         <DkTableColumn field="manageUserCodeName" :title="$t('manageUserName')"></DkTableColumn>
+        <!-- 操作工号 -->
         <DkTableColumn field="opCreateUserCodeName" :title="$t('opCreateUserCode')"></DkTableColumn>
+        <!-- 操作时间 -->
         <DkTableColumn field="opCreateTime" :title="$t('operationTime')" data-type="dateTime"></DkTableColumn>
+        <!-- 备注 -->
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
       </DkTable>
     </div>
@@ -79,13 +103,32 @@ export default {
     return {
       searchContent:
         [
-          //成型线编码
+          //成型线类型
+          {
+            itemCode: 'modelKindList',
+            itemName: 'moldLineKindName',
+            valueFormat: {code: 'modelKindList'},
+            valueKind: self.$config.docUserInput.mSearch,
+            magnifierType: self.$config.MagnifierType.getKind,
+            otherCondition:{kindType:'型号种类-成型线'}
+          },
+          //成型线
           {
             itemCode: 'moldLineCode',
+            itemName: 'moldlineCodeName',
             valueFormat: {code: 'moldlineId'},
             valueKind: self.$config.docUserInput.mSearch,
             magnifierType: self.$config.MagnifierType.moldline
           },
+          //分组序号
+          {
+            itemCode: 'groupNo',
+            valueFormat: {code: 'moldlineGroupNo'},
+          },
+          //成型批次
+          {
+            itemCode: 'moldingBatch',
+          },
           //产品分类
           {
             itemCode: 'appProductCategory',
@@ -95,40 +138,26 @@ export default {
             magnifierType: self.$config.MagnifierType.modelCategoryReport,
             otherCondition:{'modelKind':self.$config.kindCode.product}
           },
-          //产品名称
+          //产品型号
           {
             itemCode: 'appProductName',
-            valueFormat: {code: 'modelId'},
+            valueFormat: {code: 'pdtModelCode'},
             valueKind: self.$config.docUserInput.mSearch,
             magnifierType: self.$config.MagnifierType.product
           },
-          //生产工号
+          //成型工号
           {
             itemCode: 'opnUserCode',
+            itemName: 'moldingUserId',
             valueFormat: {code: 'userId'},
             valueKind: self.$config.docUserInput.mSearch,
             magnifierType: self.$config.MagnifierType.workUser,
             otherCondition : {userType: self.$config.userType.workTeam}
           },
-          //分组序号
-          {
-            itemCode: 'groupNo',
-            valueFormat: {code: 'moldlineGroupNo'},
-          },
           //模具编号
           {
             itemCode: 'modelMouldCode',
           },
-          //成型批次
-          {
-            itemCode: 'moldingBatch',
-          },
-          //成型日期
-          {
-            itemCode: 'moldingDate',
-            valueFormat: {code: 'moldingDate'},
-            valueKind: 'DATE_RANGE',
-          },
           //成型标识
           {
             itemCode: 'flgMoldingList',
@@ -148,6 +177,12 @@ export default {
             valueFormat: {code: 'unmoldedReasonIds', data: [], valueKey: 'dataId', labelKey: 'dataValue',},
             valueKind: self.$config.docUserInput.mChoice
           },
+          //交柸标识
+          {
+            itemCode: 'unmoldedReasonId',
+            valueFormat: {code: 'unmoldedReasonIds', data: [], valueKey: 'dataId', labelKey: 'dataValue',},
+            valueKind: self.$config.docUserInput.mChoice
+          },
           //开模损标识
           {
             itemCode: 'flgScrapList',
@@ -161,12 +196,6 @@ export default {
             },
             valueKind: self.$config.docUserInput.mChoice
           },
-          //开模损日期
-          {
-            itemCode: 'moldingScrapDate',
-            valueFormat: {code: 'scrapDate'},
-            valueKind: 'DATE_RANGE',
-          },
           //绑码标识
           {
             itemCode: 'flgBindUniqueList',
@@ -180,12 +209,38 @@ export default {
             },
             valueKind: self.$config.docUserInput.mChoice
           },
-          //操作时间
+          //实验标识
           {
-            itemCode: 'operationTime',
-            valueFormat: {code: 'opCreateTime'},
+            itemCode: 'flgExperimentList',
+            valueFormat: {
+              data: [
+                {valueKey: 'true', flgValid: self.$config.searchDataEnum.flgExperimentTrue},
+                {valueKey: 'false', flgValid: self.$config.searchDataEnum.flgExperimentFalse}],
+              valueKey: 'valueKey',
+              labelKey: 'flgValid',
+              default: ['true', 'false']
+            },
+            valueKind: self.$config.docUserInput.mChoice
+          },
+          //成型日期
+          {
+            itemCode: 'moldingDate',
+            valueFormat: {code: 'moldingDate', default: [new Date().toDateStr(), new Date().toDateStr()]},
             valueKind: 'DATE_RANGE',
           },
+          //todo  暂时注掉
+          // //开模损日期
+          // {
+          //   itemCode: 'moldingScrapDate',
+          //   valueFormat: {code: 'scrapDate'},
+          //   valueKind: 'DATE_RANGE',
+          // },
+          // //操作时间
+          // {
+          //   itemCode: 'operationTime',
+          //   valueFormat: {code: 'opCreateTime'},
+          //   valueKind: 'DATE_RANGE',
+          // },
           //交胚时间
           {
             itemCode: 'renderMTime',