bug-5933

src/locale/lang/zh-CN.js

@@ -579,7 +579,10 @@ export const columns = {
   overallQuality: '整体质量设置',
 
   //产品型号相关
-  productModelName: '型号名称',
+  codeMouldModel: '模具编码',
+  nameMouldModel:'模具名称',
+  productModelCode:'产品编码',
+  productModelName: '产品名称',
   categoryId: '产品分类',
   pdtView: '产品视图',
   pdtModel: '产品型号',

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

@@ -13,7 +13,7 @@
         <DkForm slot="content" ref="formInline" v-model="formData">
           <div id="search-cond-div" ref="search-cond-div">
             <!-- 型号编码 -->
-            <DkFormItem prop="modelCode" :required="true">
+            <DkFormItem :label="$t('productModelCode')" prop="modelCode" :required="true">
               <InputPop v-model="formData.modelCode" ref="modelCode"/>
             </DkFormItem>
             <!-- 型号名称-->
@@ -21,8 +21,8 @@
               <InputPop v-model="formData.modelName" ref="modelName"/>
             </DkFormItem>
             <!-- 产品分类 -->
-            <DkFormItem prop="categoryId" :required="true"
-                        :data-type="this.$config.dataType.number" :label="$t('modelCategory')">
+            <DkFormItem :label="$t('categoryId')" prop="categoryId" :required="true"
+                        :data-type="this.$config.dataType.number">
               <SelectPop v-model="formData.categoryId" ref="categoryId" :multiple="false"
                          :show-toolbar="true"
                          pop-type="productModelCategoryByLevel">

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

@@ -43,11 +43,11 @@
                @current-change="modelPdtRadioChange"
                @pageChange="pageSizeChange">
         <!--型号编码-->
-        <DkTableColumn  field="modelCode" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+        <DkTableColumn :title="$t('productModelCode')" field="modelCode" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <!--型号名称-->
         <DkTableColumn :title="$t('productModelName')" field="modelName"></DkTableColumn>
         <!--产品分类-->
-        <DkTableColumn field="categoryName"></DkTableColumn>
+        <DkTableColumn :title="$t('categoryId')" field="categoryName"></DkTableColumn>
         <!--产品规格-->
         <DkTableColumn field="pdtSpecs"></DkTableColumn>
         <!--默认商标-->

src/view/mst/model/index.vue

@@ -42,12 +42,12 @@
                :height="tableHeight" primaryKey="modelId"
                :choose-flag="false"
                @pageChange="pageSizeChange">
-        <DkTableColumn field="modelCode" type="link"
+        <DkTableColumn field="modelCode" type="link" :title="formType==$config.formCode.modelMaterial?$t('modelMaterialCode'):''"
                        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'"
-                       :title="typeFlag?$t('typesOfName'):$t('modelCName')"
+                       :title="typeFlag?$t('typesOfName'):(formType==$config.formCode.modelMaterial?$t('modelMaterialName'):$t('modelCName'))"
                        @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <!--产品还有型号分类-->
         <DkTableColumn field="modelCategoryLevelName" v-if="formType==$config.formCode.modelProduct || formType==$config.formCode.modelCarrier"
@@ -73,7 +73,7 @@
         <DkTableColumn field="unitName" :title="$t('modelUnits')" v-if="formType==$config.formCode.modelMaterial"></DkTableColumn>
         <DkTableColumn field="modelSpecs" :title="$t('modelSpecs')" v-if="formType==$config.formCode.modelMaterial"></DkTableColumn>
         <DkTableColumn field="modelPlace" :title="$t('modelPlace')" v-if="formType==$config.formCode.modelMaterial"></DkTableColumn>
-        <DkTableColumn field="modelCategoryLevelName" v-if="formType==$config.formCode.modelMaterial"></DkTableColumn>
+        <DkTableColumn field="modelCategoryLevelName" v-if="formType==$config.formCode.modelMaterial" :title="$t('materialModelCategoryCode')"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
                        :switch-disabled="false"></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
@@ -90,9 +90,9 @@
                :choose-flag="false"
                @pageChange="pageSizeChange"
       >
-        <DkTableColumn field="modelCode" type="link"
+        <DkTableColumn field="modelCode" type="link" :title="$t('codeMouldModel')"
                        @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-        <DkTableColumn field="modelName" :title="typeFlag?$t('typesOfName'):$t('modelCName')"></DkTableColumn>
+        <DkTableColumn field="modelName" :title="typeFlag?$t('typesOfName'):$t('nameMouldModel')"></DkTableColumn>
         <DkTableColumn field="stdNum"
                        :data-type="$config.dataType.number"></DkTableColumn>
         <DkTableColumn field="outputQty"
@@ -122,13 +122,26 @@
               :label-max-words="formType==$config.formCode.modelCarrier  || formType==$config.formCode.modelTypeKiln
                     || formType==$config.formCode.modelTypeMoldline
                     || formType==$config.formCode.modelTypeCar || formType==$config.formCode.modelMould?5:4">
+
+<!--        <DkTableColumn field="modelCode" type="link" :title="formType==$config.formCode.modelMaterial?$t('modelMaterialCode'):''"-->
+<!--                       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'"-->
+<!--                       :title="typeFlag?$t('typesOfName'):(formType==$config.formCode.modelMaterial?$t('modelMaterialName'):$t('modelCName'))"-->
+<!--                       @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>-->
         <!--  型号编码  -->
         <DkFormItem prop="modelCode" :span="24" required v-if="formType==$config.formCode.modelProduct || formType==$config.formCode.modelMould ||
-                                                    formType==$config.formCode.modelEquipment || formType==$config.formCode.modelMaterial">
+                                                    formType==$config.formCode.modelEquipment || formType==$config.formCode.modelMaterial"
+                    :label="formType==$config.formCode.modelMaterial?$t('modelMaterialCode'):(formType==$config.formCode.modelMould?$t('codeMouldModel'):'')">
           <InputPop v-model="formData.modelCode" ref="modelCode"/>
         </DkFormItem>
         <!--  型号名称 /类型名称 -->
-        <DkFormItem prop="modelName" :span="24" required :label="typeFlag?$t('typesOfName'):$t('modelCName')">
+        <DkFormItem prop="modelName" :span="24" required
+                    :label="typeFlag?$t('typesOfName')
+                    :(formType==$config.formCode.modelMaterial?$t('modelMaterialName')
+                    :(formType==$config.formCode.modelMould?$t('nameMouldModel')
+                    :$t('modelCName')))">
           <InputPop v-model="formData.modelName" ref="modelName"/>
         </DkFormItem>
         <!--  型号分类（目前只有产品型号、载具需要）  -->