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

src/views/GARDENBASEDATA/index.vue

@@ -138,6 +138,8 @@
       </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>
       <el-table-column label="企业资质 " align="center" prop="qyzz">
       </el-table-column>
       <el-table-column label="主要市场 " align="center" prop="zysc">
@@ -309,7 +311,18 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12"></el-col>
+              <el-col :span="12">
+                <el-form-item label="信用等级" prop="grade">
+                  <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">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </el-tab-pane>
@@ -672,14 +685,31 @@ export default {
             trigger: "blur",
           },
         ],
+        grade: [
+          { required: true, message: "信用等级 不能为空", trigger: "blur" },
+        ],
       },
+      options: [{
+        value: '1',
+        label: '1'
+      }, {
+        value: '2',
+        label: '2'
+      }, {
+        value: '3',
+        label: '3'
+      }, {
+        value: '4',
+        label: '4'
+      }],
+      value: ''
     };
   },
   created() {
     this.getList();
     getEnterprise().then((res) => {
       this.detpList = res.data
-      
+
     });
   },
   methods: {

src/views/RANK/index.vue

@@ -80,6 +80,11 @@
           {{scope.row.ranking}}
         </template>
       </el-table-column>
+      <el-table-column label="中西部排名" align="center" prop="midwestRanking">
+        <template slot-scope="scope">
+          {{scope.row.midwestRanking}}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -136,6 +141,10 @@
           <el-input  v-model="form.ranking" placeholder="请输入排名" ></el-input>
         </el-form-item>
 
+        <el-form-item prop="midwestRanking" label-width="100px" label="中西部排名">
+          <el-input  v-model="form.midwestRanking" placeholder="请输入排名" ></el-input>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -202,6 +211,10 @@ export default {
           { required: true, message: "排名不能为空", trigger: "blur" },
           { trigger: 'blur', validator: this.validatorFloatNum }
         ],
+        midwestRanking: [
+          { required: true, message: "中西部排名不能为空", trigger: "blur" },
+          { trigger: 'blur', validator: this.validatorFloatNum }
+        ]
       }
     };
   },