bug 修复

src/pages/index/components/parking_outside_operation.vue

@@ -355,14 +355,8 @@
         <el-form class="form-wrapper" :inline="true" :model="formInline5" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="收费员:">
-                <el-select clearable v-model="formInline5.tollmanId" placeholder="请选择">
-                  <el-option
-                    v-for="(item,index) in tollmanOptions"
-                    :key="index"
-                    :label="item.tollmanName"
-                    :value="item.id" />
-                </el-select>
+              <el-form-item label="车牌号:">
+                <el-input v-model="formInline5.plateNo"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/pages/index/components/service_configuration.vue

@@ -5,8 +5,10 @@
         <el-form class="form-wrapper" :inline="true" :model="formInline1" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="区域编码:">
-                <el-input v-model="formInline1.regionCode" placeholder="请输入"></el-input>
+              <el-form-item label="行政区">
+                <el-select clearable  v-model="formInline1.regionCode" placeholder="请选择" popper-class="cur-select">
+                  <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
 <!--            <el-col :span="8">-->
@@ -50,11 +52,10 @@
           custom-class="audit-dialog">
           <div class="form-div">
             <el-form label-position="left" label-width="100px" :model="formLabelAlign">
-              <el-form-item label="区域编码">
-                <el-input v-model="formLabelAlign.regionCode"></el-input>
-              </el-form-item>
-              <el-form-item label="所在区域">
-                <el-input v-model="formLabelAlign.regionName"></el-input>
+              <el-form-item label="行政区">
+                <el-select clearable  v-model="formLabelAlign.regionCode" placeholder="请选择" popper-class="cur-select">
+                  <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="业务类型">
                 <el-input v-model="formLabelAlign.serviceType"></el-input>
@@ -77,8 +78,10 @@
         <el-form class="form-wrapper" :inline="true" :model="formInline2" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="区域编码:">
-                <el-input v-model="formInline2.regionCode" placeholder="请输入"></el-input>
+              <el-form-item label="行政区">
+                <el-select clearable  v-model="formInline2.regionCode" placeholder="请选择" popper-class="cur-select">
+                  <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
 <!--            <el-col :span="8">-->
@@ -122,11 +125,10 @@
           custom-class="audit-dialog">
           <div class="form-div">
             <el-form label-position="left" label-width="145px" :model="formLabelAlign2">
-              <el-form-item label="区域编码">
-                <el-input v-model="formLabelAlign2.regionCode"></el-input>
-              </el-form-item>
-              <el-form-item label="所在区域">
-                <el-input v-model="formLabelAlign2.regionName"></el-input>
+              <el-form-item label="行政区">
+                <el-select clearable  v-model="formLabelAlign2.regionCode" placeholder="请选择" popper-class="cur-select">
+                  <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="节假日名称">
                 <el-input v-model="formLabelAlign2.holidayName"></el-input>
@@ -149,15 +151,17 @@
         <el-form class="form-wrapper" :inline="true" :model="formInline3" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="区域编码:">
-                <el-input v-model="formInline3.regionCode" placeholder="请输入"></el-input>
+              <el-form-item label="行政区">
+                <el-select clearable  v-model="formInline3.regionCode" placeholder="请选择" popper-class="cur-select">
+                  <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商圈名称:">
+                <el-input v-model="formInline3.districtName	" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="8">-->
-<!--              <el-form-item label="商圈名称:">-->
-<!--                <el-input v-model="formInline3.districtName	" placeholder="请输入"></el-input>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
             <el-col :span="8">
               <el-form-item>
                 <el-button type="primary" class="query-btn" @click="onSubmit3">查询</el-button>
@@ -187,7 +191,6 @@
                          :current-page.sync="pageNum3" :page-size.sync="pageSize3">
           </el-pagination>
         </div>
-
         <el-dialog
           :title="title3"
           :visible.sync="dialogVisible3"
@@ -195,11 +198,10 @@
           custom-class="audit-dialog">
           <div class="form-div">
             <el-form label-position="left" label-width="145px" :model="formLabelAlign3">
-              <el-form-item label="区域编码">
-                <el-input v-model="formLabelAlign3.regionCode"></el-input>
-              </el-form-item>
-              <el-form-item label="所在区域">
-                <el-input v-model="formLabelAlign3.regionName"></el-input>
+              <el-form-item label="行政区">
+                <el-select clearable  v-model="formLabelAlign3.regionCode" placeholder="请选择" popper-class="cur-select">
+                  <el-option v-for="item in districtOptions"  :key="item.label" :label="item.label" :value="item.value"></el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="商圈名称">
                 <el-input v-model="formLabelAlign3.districtName	"></el-input>
@@ -218,92 +220,94 @@
         </span>
         </el-dialog>
       </el-tab-pane>
-      <el-tab-pane label="停车概览页面配置" name="停车概览页面配置">
-        <el-form class="form-wrapper" :inline="true" :model="formInline4" style="margin-bottom: 20px;">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="暂未改:">
-                <el-input v-model="formInline4.tollCollector" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="车牌号:">
-                <el-input v-model="formInline4.plateNo" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item>
-                <el-button type="primary" class="query-btn" @click="onSubmit4">查询</el-button>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="success" @click="handleAdd4">添加</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-table :data="tableData4">
-          <el-table-column v-for="(item, index) in columns4" :key="index" :label="item.label" :prop="item.key">
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            width="200">
-            <template slot-scope="scope" style="display: inline-block">
-              <el-button type="primary" @click="handleEdit4(scope.row)" slot="reference">修改</el-button>
-              <el-popconfirm title="确定删除吗？" @confirm="deleteRow4(scope.row)">
-                <el-button type="danger" slot="reference">删除</el-button>
-              </el-popconfirm>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="table-pagination">
-          <el-pagination layout="prev, pager, next" :total="total4" @current-change="handlePageChange4"
-                         :current-page.sync="pageNum4" :page-size.sync="pageSize4">
-          </el-pagination>
-        </div>
+<!--      <el-tab-pane label="停车概览页面配置" name="停车概览页面配置">-->
+<!--        <el-form class="form-wrapper" :inline="true" :model="formInline4" style="margin-bottom: 20px;">-->
+<!--          <el-row>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="暂未改:">-->
+<!--                <el-input v-model="formInline4.tollCollector" placeholder="请输入"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="车牌号:">-->
+<!--                <el-input v-model="formInline4.plateNo" placeholder="请输入"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item>-->
+<!--                <el-button type="primary" class="query-btn" @click="onSubmit4">查询</el-button>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item>-->
+<!--                <el-button type="success" @click="handleAdd4">添加</el-button>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
+<!--        </el-form>-->
+<!--        <el-table :data="tableData4">-->
+<!--          <el-table-column v-for="(item, index) in columns4" :key="index" :label="item.label" :prop="item.key">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="操作"-->
+<!--            width="200">-->
+<!--            <template slot-scope="scope" style="display: inline-block">-->
+<!--              <el-button type="primary" @click="handleEdit4(scope.row)" slot="reference">修改</el-button>-->
+<!--              <el-popconfirm title="确定删除吗？" @confirm="deleteRow4(scope.row)">-->
+<!--                <el-button type="danger" slot="reference">删除</el-button>-->
+<!--              </el-popconfirm>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+<!--        <div class="table-pagination">-->
+<!--          <el-pagination layout="prev, pager, next" :total="total4" @current-change="handlePageChange4"-->
+<!--                         :current-page.sync="pageNum4" :page-size.sync="pageSize4">-->
+<!--          </el-pagination>-->
+<!--        </div>-->
 
-        <el-dialog
-          :title="title4"
-          :visible.sync="dialogVisible4"
-          width="45%"
-          custom-class="audit-dialog">
-          <div class="form-div">
-            <el-form label-position="left" label-width="100px" :model="formLabelAlign4">
-              <el-form-item label="收费员">
-                <el-input v-model="formLabelAlign4.tollCollector"></el-input>
-              </el-form-item>
-              <el-form-item label="车牌号">
-                <el-input v-model="formLabelAlign4.plateNo"></el-input>
-              </el-form-item>
-              <el-form-item label="放行时间">
-                <el-date-picker
-                  v-model="formLabelAlign4.releaseTime"
-                  type="date"
-                  placeholder="选择日期">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="放行原因">
-                <el-input v-model="formLabelAlign4.releaseReason"></el-input>
-              </el-form-item>
-            </el-form>
-          </div>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible4 = false">取 消</el-button>
-            <el-button type="primary" @click="handleConfirm4">确 定</el-button>
-          </span>
-        </el-dialog>
-      </el-tab-pane>
+<!--        <el-dialog-->
+<!--          :title="title4"-->
+<!--          :visible.sync="dialogVisible4"-->
+<!--          width="45%"-->
+<!--          custom-class="audit-dialog">-->
+<!--          <div class="form-div">-->
+<!--            <el-form label-position="left" label-width="100px" :model="formLabelAlign4">-->
+<!--              <el-form-item label="收费员">-->
+<!--                <el-input v-model="formLabelAlign4.tollCollector"></el-input>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="车牌号">-->
+<!--                <el-input v-model="formLabelAlign4.plateNo"></el-input>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="放行时间">-->
+<!--                <el-date-picker-->
+<!--                  v-model="formLabelAlign4.releaseTime"-->
+<!--                  type="date"-->
+<!--                  placeholder="选择日期">-->
+<!--                </el-date-picker>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="放行原因">-->
+<!--                <el-input v-model="formLabelAlign4.releaseReason"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-form>-->
+<!--          </div>-->
+<!--          <span slot="footer" class="dialog-footer">-->
+<!--            <el-button @click="dialogVisible4 = false">取 消</el-button>-->
+<!--            <el-button type="primary" @click="handleConfirm4">确 定</el-button>-->
+<!--          </span>-->
+<!--        </el-dialog>-->
+<!--      </el-tab-pane>-->
     </el-tabs>
   </div>
 </template>
 <script>
-import api from "@/api/audit.js";
 import dictionary from "@/util/dictionary";
 import api_z from "@/api/article_z.js";
+import options from '@/util/options'
 
 export default {
   components: {},
   data() {
     return {
+      districtOptions: options.districtOptions,
+      areaCodeMap: dictionary.areaCodeMap,
       activeName: '业务参数配置',
       columns1: [
         {
@@ -396,7 +400,7 @@ export default {
         },
         {
           label: '商圈名称',
-          key: 'districtName	'
+          key: 'districtName'
         },
         {
           label: '基础停车费(元/小时)',
@@ -493,7 +497,7 @@ export default {
     },
     handleConfirm() {
       if (this.title === '修改') {
-        api_z.editServiceConfigurationConfig({...this.formLabelAlign}).then(res => {
+        api_z.editServiceConfigurationConfig({...this.formLabelAlign, regionName: this.areaCodeMap[this.formLabelAlign.regionCode]}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -504,7 +508,7 @@ export default {
           }
         })
       } else {
-        api_z.addServiceConfigurationConfig({...this.formLabelAlign}).then(res => {
+        api_z.addServiceConfigurationConfig({...this.formLabelAlign, regionName: this.areaCodeMap[this.formLabelAlign.regionCode]}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -541,7 +545,7 @@ export default {
     },
     handleConfirm2() {
       if (this.title2 === '修改') {
-        api_z.editServiceConfigurationHoliday({...this.formLabelAlign2}).then(res => {
+        api_z.editServiceConfigurationHoliday({...this.formLabelAlign2, regionName: this.areaCodeMap[this.formLabelAlign2.regionCode]}).then(res => {
           if (res.code === 200) {
             this.dialogVisible2 = false
             this.$message({
@@ -552,7 +556,7 @@ export default {
           }
         })
       } else {
-        api_z.addServiceConfigurationHoliday({...this.formLabelAlign2}).then(res => {
+        api_z.addServiceConfigurationHoliday({...this.formLabelAlign2, regionName: this.areaCodeMap[this.formLabelAlign2.regionCode]}).then(res => {
           if (res.code === 200) {
             this.dialogVisible2 = false
             this.$message({
@@ -589,7 +593,7 @@ export default {
     },
     handleConfirm3() {
       if (this.title3 === '修改') {
-        api_z.editServiceConfigurationDistrict({...this.formLabelAlign3}).then(res => {
+        api_z.editServiceConfigurationDistrict({...this.formLabelAlign3, regionName: this.areaCodeMap[this.formLabelAlign3.regionCode]}).then(res => {
           if (res.code === 200) {
             this.dialogVisible3 = false
             this.$message({
@@ -600,7 +604,7 @@ export default {
           }
         })
       } else {
-        api_z.addServiceConfigurationDistrict({...this.formLabelAlign3}).then(res => {
+        api_z.addServiceConfigurationDistrict({...this.formLabelAlign3, regionName: this.areaCodeMap[this.formLabelAlign3.regionCode]}).then(res => {
           if (res.code === 200) {
             this.dialogVisible3 = false
             this.$message({