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

@@ -10,8 +10,8 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">              
-              <el-select v-model="form.areacode" class="width100" filterable placeholder="行政区">
-                <el-option v-for="item in dicData['XZQ']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+               <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-option>
               </el-select>
             </el-form-item>

@@ -32,7 +32,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="汇交状态" prop="state">
-              <el-select v-model="form.state" class="width100" clearable placeholder="汇交状态">
+              <el-select v-model="form.hjjg" class="width100" clearable placeholder="汇交状态">
                  <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>