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

src/views/GARDENBASEDATA/index.vue

@@ -138,7 +138,18 @@
       </el-table-column>
       <el-table-column label="经营范围 " align="center" prop="jyfw" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column label="企业信用 " align="center" prop="grade">
+      <el-table-column label="外汇等级 " align="center" prop="grade">
+        <template slot-scope="scope">
+          <span v-if="scope.row.grade == 1">A</span>
+          <span v-if="scope.row.grade == 2">B</span>
+          <span v-if="scope.row.grade == 3">C</span>
+          <span v-if="scope.row.grade == 4">D</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="企业结构 " align="center" prop="enterpriseStructure">
+        <template slot-scope="scope">
+          <span>{{ selectDictLabel(dict.type.enterprise_structure, scope.row.enterpriseStructure) }}</span>
+        </template>
       </el-table-column>
       <el-table-column label="企业资质 " align="center" prop="qyzz">
       </el-table-column>
@@ -283,6 +294,7 @@
                 <el-form-item label="成立日期 " prop="clrq">
                   <!-- <el-input  v-model="form.clrq" placeholder="请输入成立日期 "></el-input> -->
                   <el-date-picker
+                    style="width: 100%"
                     value-format="yyyy-MM-dd"
                     @change="setUpTimeSelect"
                     v-model="form.clrq"
@@ -312,7 +324,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="信用等级" prop="grade">
+                <el-form-item label="外汇等级" prop="grade">
                   <el-select v-model="form.grade" placeholder="请选择" style="width: 100%">
                     <el-option
                       v-for="item in options"
@@ -324,6 +336,23 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="企业结构  " prop="enterpriseStructure">
+                  <el-select v-model="form.enterpriseStructure" placeholder="请选择" style="width: 100%">
+                    <el-option
+                      v-for="dict in dict.type.enterprise_structure"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+              </el-col>
+            </el-row>
           </el-form>
         </el-tab-pane>
 
@@ -503,6 +532,7 @@ import selectTree from '@/components/selectTree'
 export default {
   name: "GARDENBASEDATA",
   components: { selectTree },
+  dicts: ['enterprise_structure'],
   data() {
     return {
       // 新增标签索引
@@ -686,21 +716,24 @@ export default {
           },
         ],
         grade: [
-          { required: true, message: "信用等级 不能为空", trigger: "blur" },
+          { required: true, message: "外汇等级 不能为空", trigger: "blur" },
+        ],
+        enterpriseStructure: [
+          { required: true, message: "企业结构 不能为空", trigger: "blur" },
         ],
       },
       options: [{
-        value: '1',
-        label: '1'
+        value: 1,
+        label: 'A'
       }, {
-        value: '2',
-        label: '2'
+        value: 2,
+        label: 'B'
       }, {
-        value: '3',
-        label: '3'
+        value: 3,
+        label: 'C'
       }, {
-        value: '4',
-        label: '4'
+        value: 4,
+        label: 'D'
       }],
       value: ''
     };