Merge branch '1025branch' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into 1025branch

src/views/GARDENBASEDATA/index.vue

@@ -146,9 +146,9 @@
           <span v-if="scope.row.grade == 4">D</span>
         </template>
       </el-table-column>
-      <el-table-column label="企业结构 " align="center" prop="enterpriseStructure">
+      <el-table-column label="企业结构 " align="center" prop="enterpriseStructureValue">
         <template slot-scope="scope">
-          <span>{{ selectDictLabel(dict.type.enterprise_structure, scope.row.enterpriseStructure) }}</span>
+          <span>{{ selectDictLabel(dict.type.enterprise_structure, scope.row.enterpriseStructureValue) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="企业资质 " align="center" prop="qyzz">
@@ -328,9 +328,10 @@
                   <el-select v-model="form.grade" placeholder="请选择" style="width: 100%">
                     <el-option
                       v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -339,25 +340,25 @@
 
             <el-row>
               <el-col :span="12">
-                <el-form-item label="企业结构  " prop="enterpriseStructure">
-                  <el-select v-model="form.enterpriseStructure" placeholder="请选择" style="width: 100%">
+                <el-form-item label="企业结构  " prop="enterpriseStructureValue">
+                  <el-select v-model="form.enterpriseStructureValue" placeholder="请选择" style="width: 100%">
                     <el-option
                       v-for="dict in dict.type.enterprise_structure"
                       :key="dict.value"
                       :label="dict.label"
-                      :value="dict.label"
+                      :value="dict.value"
                     />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="业务构成  " prop="businessEvents">
-                  <el-select v-model="form.businessEvents" placeholder="请选择" style="width: 100%">
+                <el-form-item label="业务构成  " prop="businessEventsValue">
+                  <el-select v-model="form.businessEventsValue" placeholder="请选择" style="width: 100%">
                     <el-option
                       v-for="dict in dict.type.business_events"
                       :key="dict.value"
                       :label="dict.label"
-                      :value="dict.label"
+                      :value="dict.value"
                     />
                   </el-select>
                 </el-form-item>
@@ -728,10 +729,10 @@ export default {
         grade: [
           { required: true, message: "外汇等级 不能为空", trigger: "blur" },
         ],
-        enterpriseStructure: [
+        enterpriseStructureValue: [
           { required: true, message: "企业结构 不能为空", trigger: "blur" },
         ],
-        businessEvents: [
+        businessEventsValue: [
         { required: true, message: "业务构成 不能为空", trigger: "blur" },
         ]
       },
@@ -744,9 +745,6 @@ export default {
       }, {
         value: 3,
         label: 'C'
-      }, {
-        value: 4,
-        label: 'D'
       }],
       value: ''
     };
@@ -870,7 +868,18 @@ export default {
       if (is) return;
 
       this.$refs["form"].validate((valid) => {
+
         if (valid) {
+          // 获取选中的企业结构 获取 label数据和 sort排序数据
+          let currentEnterpriseStructure = this.dict.type.enterprise_structure?.find(({value}) => value == this.form.enterpriseStructureValue)
+          this.form.enterpriseStructure = currentEnterpriseStructure?.label
+          this.form.enterpriseStructureSort = currentEnterpriseStructure?.raw?.dictSort
+
+          // 获取选中的业务结构
+          let currentBusinessEvents = this.dict.type.business_events?.find(({value}) => value == this.form.businessEventsValue)
+          this.form.businessEvents = currentBusinessEvents?.label
+          this.form.businessEventsSort = currentBusinessEvents?.raw?.dictSort
+
           if (this.form.id != null) {
             updateGARDENBASEDATA(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");