Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!185

src/views/material/basicFile/details.vue

@@ -132,7 +132,6 @@
                   v-if="activeMainTab == 'material'"
                   :inline="true"
                   label-position="right"
-                  :hide-required-asterisk="true"
                   :model="basicData.value"
                   ref="basicMessageRef"
                   :rules="rules"
@@ -164,13 +163,16 @@
                         >
                           <template slot="label">
                             <el-tooltip class="item" effect="dark" placement="top-start" :disabled="f.name.length < 10">
-                              <span>{{ f.name }}</span>
+                              
+                              <span :class="(f.apiUrl && f.required) ? 'redSpan': ''">{{ f.name }}</span>
+
                               <div slot="content">
-                                <p>{{ f.name }}</p>
+                                <p> {{ f.name }}</p>
                               </div>
                             </el-tooltip>
                           </template>
 
+                         
                           <!-- 参照 -->
                           <el-select v-if="f.apiUrl" 
                             v-model="basicData.value[`${f.prop}Name`]" 
@@ -180,6 +182,7 @@
                             :disabled="handleJudge(f)"
                             @focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })">
                             <div slot="empty"></div>
+                            
                           </el-select>
 
                           <!-- 字典 -->
@@ -189,12 +192,11 @@
                             size="mini"
                             :key="basicData.value[f.prop]" 
                             :disabled="handleJudge(f)"
-                            :rules="[{ required: f.required, message: `请选择${f.name}`, trigger: 'change' }]">
+                          >
                             <el-option v-if="f.dictId" 
                               v-for="d in f.dictValue" :key="d.dictValue" :label="d.dictLabel"
                               :value="d.dictValue">
                             </el-option>
-
                           </el-select>
 
                         </el-form-item>
@@ -2134,6 +2136,29 @@
         },
         deep: true,
       },
+      "basicData.value.oneClass": {
+        handler(nVal, oVal) {
+
+          this.basicData.form = this.basicData.form.map(formItem => {
+
+            if (formItem.prop === "businessLine") {
+
+              if ( nVal.includes('介入耗材&5') || nVal.includes('骨科耗材&2') ||
+                  nVal.includes('普通耗材&3') || nVal.includes('医用设备&1') ||
+                  nVal.includes('体外诊断&4')) {
+
+                    formItem.required  = true
+              } else {
+                formItem.required  = false
+              }
+
+            }
+            return formItem;
+          })
+        },
+        deep: true,
+      },
+
 
     },
 
@@ -2193,6 +2218,11 @@
             overflow-y: auto;
             overflow-x: hidden;
 
+            .redSpan::before {
+              content: "* ";
+              color: red;
+            } 
+
             .el-checkbox {
               padding: 0 58%;
             }

src/views/material/basicFile/init/index.js

@@ -6,7 +6,7 @@ export const initRules = (prop) => {
     .forEach((column) => {
       const message = `${column.name}不能为空`;
       rules[column.prop] = [
-        { required: true, message: message, trigger: "change" },
+        { required: true, message: message, trigger: "change"},
       ];
     });
   return rules;