bug-5936-1|2|3|4|5|6|7|8

src/locale/lang/zh-CN.js

@@ -182,7 +182,7 @@ export const formTitle = {
   'equipThmeter': '温湿度计',
   'carrier': '载具',
   'carrKilnCar': '窑车',
-  'productDefectType': '缺陷类型',
+  'productDefectType': '缺陷分类',
   'productBrand': '品牌',
   'productLogo': '商标',
   'productColour': '釉色',
@@ -663,8 +663,8 @@ export const columns = {
   staffStatusName: '员工状态',
   staffStatus: '员工状态',
 
-  defectKind: '缺陷类别',
-  kindName: '缺陷类别',
+  defectKind: '缺陷种类',
+  kindName: '缺陷种类',
   kindQuality: '缺陷类别-质量',
   kindDamagedBillet: '缺陷类别-损坯',
   kindMoldOpening: '缺陷类别-开模',

src/view/mst/product-defect-type/index.vue

@@ -42,7 +42,6 @@
                  :height="this.tableHeight" primaryKey="typeId" @pageChange="pageSizeChange">
           <DkTableColumn field="typeName" type="link" :title="$t('productDefectType')"
                          @on-link="handleLink(Object.assign($event, { button: 'edit' }))"></DkTableColumn>
-          <DkTableColumn field="kindName"></DkTableColumn>
           <DkTableColumn field="displayNo"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange" :switch-disabled="false">
           </DkTableColumn>
@@ -63,8 +62,8 @@
           <InputPop v-model="formData.typeName" ref="typeName" />
         </DkFormItem>
         <!--    缺陷类别   -->
-        <DkFormItem prop="defectKind" :required="true">
-          <SelectPop v-model="formData.defectKind" ref="defectKind" :multiple="false"
+        <DkFormItem prop="defectKind" :required="true" >
+          <SelectPop v-model="formData.defectKind" ref="defectKind" :multiple="false" disabled
                      @on-select-label="selectPopChange" pop-type="defectKind">
           </SelectPop>
         </DkFormItem>
@@ -106,11 +105,7 @@ export default {
         {
           itemCode: 'typeName',
         },
-        {
-          itemCode: 'defectKind',
-          valueFormat: {code: 'defectKinds', data: [], popType: 'defectKind'},
-          valueKind: self.$config.docUserInput.mChoice
-        },
+
         self.$config.flgValidSearch //有效标识
       ],
       split: 0.1,// 分区的默认

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

@@ -45,12 +45,12 @@
                  :choose-flag="false"
                  :height="tableHeight" primaryKey="defectId"
                  @pageChange="pageSizeChange">
-          <DkTableColumn field="defectCode" type="link"
+          <DkTableColumn field="defectCode" type="link" :title="defectKind === $config.defectKind.Defect?$t('defectCode'):$t('reasonCode')"
                          @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
-          <DkTableColumn field="defectName" ></DkTableColumn>
-          <DkTableColumn field="defectTypesName" :title="$t('productDefectType')"></DkTableColumn>
+          <DkTableColumn field="defectName" :title="defectKind === $config.defectKind.Defect?$t('defectName'):$t('reasonName')"></DkTableColumn>
+          <DkTableColumn field="defectTypesName" :title="defectKind === $config.defectKind.Defect?$t('productDefectType'):$t('reasonType')"></DkTableColumn>
           <DkTableColumn field="defectFinesName" :title="$t('defectFines')"
-                         v-if="formType === $config.formCode.productDefect"></DkTableColumn>
+                         v-if="defectKind === $config.defectKind.Defect"></DkTableColumn>
           <DkTableColumn field="displayNo"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
                          :switch-disabled="false"></DkTableColumn>
@@ -89,31 +89,32 @@
       <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--   缺陷代码     -->
         <DkFormItem
-          v-if="this.defectKind === this.$config.defectKind.Defect  || this.defectKind === this.$config.defectKind.moldDamageReason "
+          v-if="this.defectKind === this.$config.defectKind.Defect  "
           prop="defectCode" :required="true" >
           <InputPop v-model="formData.defectCode" ref="defectCode"/>
         </DkFormItem>
         <!--    缺陷名称    -->
         <DkFormItem
-          v-if="this.defectKind === this.$config.defectKind.Defect  || this.defectKind === this.$config.defectKind.moldDamageReason "
+          v-if="this.defectKind === this.$config.defectKind.Defect "
           prop="defectName" :required="true" >
           <InputPop v-model="formData.defectName" ref="defectName"/>
         </DkFormItem>
         <!--   损坯代码     -->
-        <DkFormItem :label="$t('reasonCode')" v-if="this.defectKind === this.$config.defectKind.Damage"
+        <DkFormItem :label="$t('reasonCode')" v-if="this.defectKind === this.$config.defectKind.Damage || this.defectKind === this.$config.defectKind.moldDamageReason"
                     prop="defectCode" :required="true">
           <InputPop v-model="formData.defectCode" ref="defectCode"/>
         </DkFormItem>
         <!--    损坯名称    -->
-        <DkFormItem :label="$t('reasonName')" v-if="this.defectKind === this.$config.defectKind.Damage"
+        <DkFormItem :label="$t('reasonName')" v-if="this.defectKind === this.$config.defectKind.Damage || this.defectKind === this.$config.defectKind.moldDamageReason "
                     prop="defectName" :required="true">
           <InputPop v-model="formData.defectName" ref="defectName"/>
         </DkFormItem>
         <!--    缺陷分类    -->
         <DkFormItem prop="defectTypes" :required="false"
-                    :data-type="this.$config.dataType.array" :label="$t('productDefectType')">
+                    :data-type="this.$config.dataType.array" :label="defectKind === $config.defectKind.Defect?$t('productDefectType'):$t('reasonType')">
           <SelectPop v-model="formData.defectTypes" ref="defectTypes" multiple
                      :show-toolbar="true"
+                     :show-all-flag="false"
                      :other-condition="{defectKind: defectKind}"
                      pop-type="defectType">
           </SelectPop>
@@ -122,6 +123,7 @@
         <DkFormItem v-if="this.defectKind === this.$config.defectKind.Defect" prop="defectFines"
                     :data-type="this.$config.dataType.array">
           <SelectPop v-model="formData.defectFines" ref="defectFines" multiple
+                     :show-all-flag="false"
                      :show-toolbar="true"
                      pop-type="defectFine">
           </SelectPop>