禅道问题修改

src/view/mst/material-bom/form.vue

@@ -14,17 +14,24 @@
           <!--物料编码-->
           <DkFormItem :required="true" prop="modelId"
                       :data-type="$config.dataType.number"
-                      :label="$t('modelMaterialCode')">
+                      v-if="type === 'add'"
+                      :span="12"
+                      :label="$t('modelMaterial')">
             <SelectMagnifier v-model="formData.modelId"
                              :disabled="type === 'edit'"
-                             :display-text="formData.modelName"
+                             :display-text="formData.codeName"
                              :type="this.$config.MagnifierType.modelMaterial"
                              :multiple="false"
                              @ok="chooseMould"></SelectMagnifier>
           </DkFormItem>
           <!--物料名称-->
-          <DkFormItem prop="modelName" :label="$t('modelMaterialName')">
-            <InputPop ref="modelName" v-model="formData.modelName" :readonly="true"/>
+<!--          <DkFormItem prop="modelName" :label="$t('modelMaterialName')" v-if="type === 'add'">-->
+<!--            <InputPop ref="modelName" v-model="formData.modelName" :readonly="true"/>-->
+<!--          </DkFormItem>-->
+
+          <!--物料型号-->
+          <DkFormItem prop="modelCodeName" :label="$t('modelMaterial')" v-if="type === 'edit'" :span="12">
+            <InputPop ref="modelCodeName" v-model="formData.modelCodeName" :readonly="true"/>
           </DkFormItem>
           <!--有效期开始-->
           <DkFormItem prop="validityDateBegin" required :data-type="$config.dataType.date">
@@ -80,6 +87,7 @@ export default {
         matModelId: null,
         modelCode: null,//物料编码
         modelName: null,//物料名称
+        modelCodeName: null,//物料型号
         validityDateBegin: null,//有效期开始
         validityDateEnd: null,//有效期开始
         remarks: null,
@@ -116,6 +124,7 @@ export default {
           field: 'itemQty',
           title: this.$t('count'),
           type: 'number',
+          digits: 6,
           width: 'auto',
           value: 1,
 
@@ -123,7 +132,7 @@ export default {
         // 单位
         {
           field: 'unitId',
-          title: this.$t('modelMaterialUnit'),
+          title: this.$t('modelUnits'),
           type: 'select',
           options: () => self.unitList,
           labelKey: 'unitName',
@@ -133,7 +142,7 @@ export default {
         // 显示顺序
         {
           field: 'displayNo',
-          type: 'text',
+          type: 'number',
           width: 'auto'
         },
         // 装配标识
@@ -141,19 +150,19 @@ export default {
         //扫码标识
         {field: 'flgScanCode', type: 'switch', width: 'auto', title: self.$t('flgScanCodeFlag'),},
         //可变更产品型号
-        {
-          field: 'repPdtModelName',
-          title: this.$t('changeModelMaterial'),
-          selectField: 'modelCode',
-          width: 'auto',
-          type: 'tableSelect',
-          param: () => {
-            return {}
-          },
-          sortBoolean: false,
-          dataType: this.$config.tableSelectType.modelMaterial,
-          fieldUpdate: this.$updateColumns.modelChooseRepMould,
-        },
+        // {
+        //   field: 'repPdtModelName',
+        //   title: this.$t('changeModelMaterial'),
+        //   selectField: 'modelCode',
+        //   width: 'auto',
+        //   type: 'tableSelect',
+        //   param: () => {
+        //     return {}
+        //   },
+        //   sortBoolean: false,
+        //   dataType: this.$config.tableSelectType.modelMaterial,
+        //   fieldUpdate: this.$updateColumns.modelChooseRepMould,
+        // },
         // 备注
         {
           field: 'remarks',
@@ -261,6 +270,7 @@ export default {
       this.formData.matModelId = data.matModelId
       this.formData.modelCode = data.modelCode
       this.formData.modelName = data.modelName
+      this.formData.modelCodeName = data.modelCodeName
       this.formData.validityDateBegin = data.validityDateBegin
       this.formData.validityDateEnd = data.validityDateEnd
       this.formData.remarks = data.remarks

src/view/mst/material-bom/index.vue

@@ -58,9 +58,11 @@
                :choose-flag="false"
                ref="detailTable" >
         <DkTableColumn field="modelCodeName" :title="$t('modelMaterial')"></DkTableColumn>
-        <DkTableColumn field="repModelCodeName" :title="$t('changeModelMaterial')"></DkTableColumn>
-        <DkTableColumn field="unitCodeName" :title="$t('modelMaterialUnit')"></DkTableColumn>
-        <DkTableColumn field="itemQty" :title="$t('count')"></DkTableColumn>
+<!--        <DkTableColumn field="repModelCodeName" :title="$t('changeModelMaterial')"></DkTableColumn>-->
+<!--        <DkTableColumn field="unitCodeName" :title="$t('modelMaterialUnit')"></DkTableColumn>-->
+        <DkTableColumn field="itemQty" :title="$t('count')" :data-type="$config.dataType.number" :digits="6"></DkTableColumn>
+        <DkTableColumn field="unitName" :title="$t('modelUnits')"></DkTableColumn>
+        <DkTableColumn field="displayNo" :data-type="$config.dataType.number"></DkTableColumn>
         <DkTableColumn field="flgFitting" type="switch" :switch-disabled="true"></DkTableColumn>
         <DkTableColumn field="flgScanCode" type="switch" :switch-disabled="true"></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
@@ -83,12 +85,15 @@
         tableData:[],
         detailData:[],
         searchContent: [
+          // {
+          //   //物料型号
+          //   itemCode: 'modelMaterial',
+          //   valueFormat: {code: 'matModelId'},
+          //   valueKind: self.$config.docUserInput.sSearch,
+          //   magnifierType: self.$config.MagnifierType.modelMaterial,
+          // },
           {
-            //物料型号
             itemCode: 'modelMaterial',
-            valueFormat: {code: 'matModelId'},
-            valueKind: self.$config.docUserInput.sSearch,
-            magnifierType: self.$config.MagnifierType.modelMaterial,
           },
           self.$config.flgValidSearch, // 有效标识
           {

src/view/mst/model/index.vue

@@ -71,7 +71,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="flgValid" type="switch" @on-switch-change="onSwitchChange"
                        :switch-disabled="false"></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
@@ -235,11 +235,10 @@
         <!--物料型号分类-->
         <DkFormItem prop="modelCategory" :span="24" :data-type="$config.dataType.number" :label="$t('materialModelCategoryCode')"
                     v-if="formType==$config.formCode.modelMaterial">
-          <SelectMagnifier v-model="formData.modelCategory" :display-text="formData.modelCategoryName"
+          <SelectMagnifier v-model="formData.modelCategory" :display-text="formData.modelCategoryLevelName"
                            :type="this.$config.MagnifierType.modelCategory"
                            :other-condition="{modelKind:$config.kindCode.matter}"
-                           :multiple="false"
-                           @ok="chooseModelCategory"></SelectMagnifier>
+                           :multiple="false"></SelectMagnifier>
         </DkFormItem>
 
         <!--   备注     -->
@@ -358,6 +357,7 @@ export default {
         modelName: null,
         modelCode: null,
         modelCategory: null,
+        modelCategoryLevelName:'',
         limitLoadQty: 1,
         flgRangeOnly: false,
         remarks: '',

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

@@ -70,6 +70,7 @@
                      :options="placeCategoryList"
                      :show-toolbar="true"
                      :tree-flag="true"
+                     :tree-strict="false"
                      labelKey="categoryName"
                      valueKey="categoryId">
           </SelectPop>