Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -16,7 +16,7 @@ let mixin = {
   computed: {
     ...mapGetters(['dicData'])
   },
-  created () {
+  mounted () {
     this.handleSearch()
   },
   methods: {

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="5">
             <el-form-item label="行政区" label-width="80px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
@@ -149,4 +149,4 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" label-width="80px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="5">
             <el-form-item label="行政区" label-width="80px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
@@ -158,4 +158,4 @@
       }
     }
   }
-</script>
\ No newline at end of file
+</script>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row>
           <el-col :span="6" class="mb-5">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row>
           <el-col :span="6" class="mb-5">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" label-width="106px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row>
           <el-col :span="5" class="mb-5">
             <el-form-item label="行政区" label-width="80px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -8,7 +8,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -10,7 +10,7 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" prop="qxdm">
-              <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.qxdm = $store.state.user.userInfo.areaCode : form.qxdm" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>

@@ -10,8 +10,8 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">
-              <el-select v-model="form.areacode" class="width100" clearable placeholder="行政区">
-                <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.areacode = $store.state.user.userInfo.areaCode : form.areacode" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
+              <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>

@@ -10,8 +10,8 @@
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" prop="qxdm">
-              <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
-                <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.qxdm = $store.state.user.userInfo.areaCode : form.qxdm" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
+              <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>