Преглед изворни кода

Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

yusheng пре 7 месеци
родитељ
комит
086cc08c86
1 измењених фајлова са 156 додато и 16 уклоњено
  1. 156 16
      src/views/material/product/detail.vue

+ 156 - 16
src/views/material/product/detail.vue

@@ -129,7 +129,15 @@
               Number(categoryLevelPathId || $route.query.rootTreeId)
             )
           " -->
-            <el-form-item label="加工类型" prop="isConsumable">
+            <el-form-item
+              label="加工类型"
+              prop="isConsumable"
+              :rules="{
+                required: mandatoryFieldList.includes('isConsumable'),
+                message: '请选择加工类型',
+                trigger: 'change'
+              }"
+            >
               <el-select
                 v-model="form.isConsumable"
                 style="width: 100%"
@@ -142,24 +150,56 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="牌号" prop="brandNum">
+            <el-form-item
+              label="牌号"
+              prop="brandNum"
+              :rules="{
+                required: mandatoryFieldList.includes('brandNum'),
+                message: '请输入牌号',
+                trigger: 'change'
+              }"
+            >
               <el-input v-model="form.brandNum" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="型号" prop="modelType">
+            <el-form-item
+              label="型号"
+              prop="modelType"
+              :rules="{
+                required: mandatoryFieldList.includes('modelType'),
+                message: '请输入型号',
+                trigger: 'change'
+              }"
+            >
               <el-input v-model="form.modelType" />
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="规格" prop="specification">
+            <el-form-item
+              label="规格"
+              prop="specification"
+              :rules="{
+                required: mandatoryFieldList.includes('specification'),
+                message: '请输入规格',
+                trigger: 'change'
+              }"
+            >
               <el-input v-model="form.specification" @input="inputSpe" />
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="计量类型" prop="measureType">
+            <el-form-item
+              label="计量类型"
+              prop="measureType"
+              :rules="{
+                required: mandatoryFieldList.includes('measureType'),
+                message: '请选择计量类型',
+                trigger: 'change'
+              }"
+            >
               <el-select
                 v-model="form.measureType"
                 style="width: 100%"
@@ -175,7 +215,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="计量单位" prop="measuringUnit">
+            <el-form-item
+              label="计量单位"
+              prop="measuringUnit"
+              :rules="{
+                required: mandatoryFieldList.includes('measuringUnit'),
+                message: '请选择计量单位',
+                trigger: 'change'
+              }"
+            >
               <DictSelection
                 dictName="计量单位"
                 clearable
@@ -187,7 +235,15 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="重量单位" prop="weightUnit">
+            <el-form-item
+              label="重量单位"
+              prop="weightUnit"
+              :rules="{
+                required: mandatoryFieldList.includes('weightUnit'),
+                message: '请选择重量单位',
+                trigger: 'change'
+              }"
+            >
               <DictSelection
                 dictName="重量单位"
                 clearable
@@ -199,7 +255,15 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="包装单位" prop="packingUnit">
+            <el-form-item
+              label="包装单位"
+              prop="packingUnit"
+              :rules="{
+                required: mandatoryFieldList.includes('packingUnit'),
+                message: '请选择包装单位',
+                trigger: 'change'
+              }"
+            >
               <DictSelection
                 dictName="包装单位"
                 clearable
@@ -210,13 +274,29 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="图号/件号" prop="imgCode">
+            <el-form-item
+              label="图号/件号"
+              prop="imgCode"
+              :rules="{
+                required: mandatoryFieldList.includes('imgCode'),
+                message: '请输入图号/件号',
+                trigger: 'change'
+              }"
+            >
               <el-input v-model="form.imgCode" />
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="毛重">
+            <el-form-item
+              label="毛重"
+              prop="roughWeight"
+              :rules="{
+                required: mandatoryFieldList.includes('roughWeight'),
+                message: '请输入毛重',
+                trigger: 'change'
+              }"
+            >
               <div class="form-line">
                 <el-input v-model="form.roughWeight" @input="handleInput2" />
               </div>
@@ -240,7 +320,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="体积">
+            <el-form-item
+              label="体积"
+              prop="volume"
+              :rules="{
+                required: mandatoryFieldList.includes('volume'),
+                message: '请输入体积',
+                trigger: 'change'
+              }"
+            >
               <div class="form-line">
                 <el-input
                   v-model="form.volume"
@@ -258,7 +346,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="级别">
+            <el-form-item
+              label="级别"
+              prop="level"
+              :rules="{
+                required: mandatoryFieldList.includes('level'),
+                message: '请选择级别',
+                trigger: 'change'
+              }"
+            >
               <template>
                 <el-select
                   style="width: 100%"
@@ -278,7 +374,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="机型" prop="modelKey">
+            <el-form-item
+              label="机型"
+              prop="modelKey"
+              :rules="{
+                required: mandatoryFieldList.includes('modelKey'),
+                message: '请选择机型',
+                trigger: 'change'
+              }"
+            >
               <DictSelection
                 dictName="物品机型"
                 clearable
@@ -292,7 +396,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="颜色" prop="colorKey">
+            <el-form-item
+              label="颜色"
+              prop="colorKey"
+              :rules="{
+                required: mandatoryFieldList.includes('colorKey'),
+                message: '请选择颜色',
+                trigger: 'change'
+              }"
+            >
               <DictSelection
                 dictName="物品颜色"
                 clearable
@@ -319,8 +431,25 @@
             </el-form-item>
           </el-col>
 
+          <!-- :rules="{
+                  required:
+                    form.categoryLevelPathId.substring(0, 1) == 9 ||
+                    form.componentAttribute.includes(1) == 1
+                      ? true
+                      : false,
+                  message: '请选择生产类型',
+                  trigger: 'change'
+                }" -->
           <el-col :span="8" v-for="(f, idx) in fileList" :key="idx">
-            <el-form-item :label="f.label" :prop="'extField.' + f.prop">
+            <el-form-item
+              :label="f.label"
+              :prop="'extField.' + f.prop"
+              :rules="{
+                required: mandatoryFieldList.includes(f.prop),
+                message: '请输入',
+                trigger: 'change'
+              }"
+            >
               <template>
                 <div class="form-line">
                   <component
@@ -656,7 +785,8 @@
         codeShow: false,
 
         status: null,
-        isNetWeight: 0
+        isNetWeight: 0,
+        mandatoryFieldList: []
       };
     },
     watch: {
@@ -840,6 +970,16 @@
         }
       });
 
+      parameterGetByCode({
+        code: 'mandatory_field'
+      }).then((res) => {
+        // console.log(res.value, '77777');
+        if (res.value) {
+          this.mandatoryFieldList = res.value.split(',');
+          console.log(this.mandatoryFieldList, '7222222');
+        }
+      });
+
       //新增
 
       this.$set(