车场下拉及岗亭操作

src/api/article_z.js

@@ -338,4 +338,68 @@ export default {
   deleteTaskRecovery(params) {
     return axios.post(`/opt/task/recovery/delete`, params)
   },
+  // 岗亭操作——获取出入管理分页
+  queryParkingOutsideOperationInoutByPage(params) {
+    return axios.get(`/opt/parking/outside/operation/inout/page`, {params})
+  },
+  // 岗亭操作——添加出入管理
+  addParkingOutsideOperationInout(params) {
+    return axios.post(`/opt/parking/outside/operation/inout/add`, params)
+  },
+  // 岗亭操作——编辑出入管理
+  editParkingOutsideOperationInout(params) {
+    return axios.post(`/opt/parking/outside/operation/inout/edit`, params)
+  },
+  // 岗亭操作——删除出入管理
+  deleteParkingOutsideOperationInout(params) {
+    return axios.post(`/opt/parking/outside/operation/inout/delete`, params)
+  },
+  // 岗亭操作——获取停车记录分页
+  queryParkingOutsideOperationParkingrecordByPage(params) {
+    return axios.get(`/opt/parking/outside/operation/parkingrecord/page`, {params})
+  },
+  // 岗亭操作——添加停车记录
+  addParkingOutsideOperationParkingrecord(params) {
+    return axios.post(`/opt/parking/outside/operation/parkingrecord/add`, params)
+  },
+  // 岗亭操作——编辑停车记录
+  editParkingOutsideOperationParkingrecord(params) {
+    return axios.post(`/opt/parking/outside/operation/parkingrecord/edit`, params)
+  },
+  // 岗亭操作——删除停车记录
+  deleteParkingOutsideOperationParkingrecord(params) {
+    return axios.post(`/opt/parking/outside/operation/parkingrecord/delete`, params)
+  },
+  // 岗亭操作——获取在场记录分页
+  queryParkingOutsideOperationInrecordByPage(params) {
+    return axios.get(`/opt/parking/outside/operation/inrecord/page`, {params})
+  },
+  // 岗亭操作——添加在场记录
+  addParkingOutsideOperationInrecord(params) {
+    return axios.post(`/opt/parking/outside/operation/inrecord/add`, params)
+  },
+  // 岗亭操作——编辑在场记录
+  editParkingOutsideOperationInrecord(params) {
+    return axios.post(`/opt/parking/outside/operation/inrecord/edit`, params)
+  },
+  // 岗亭操作——删除在场记录
+  deleteParkingOutsideOperationInrecord(params) {
+    return axios.post(`/opt/parking/outside/operation/inrecord/delete`, params)
+  },
+  // 岗亭操作——获取特殊放行记录分页
+  queryParkingOutsideOperationSpecialByPage(params) {
+    return axios.get(`/opt/parking/outside/operation/special/page`, {params})
+  },
+  // 岗亭操作——添加特殊放行记录
+  addParkingOutsideOperationSpecial(params) {
+    return axios.post(`/opt/parking/outside/operation/special/add`, params)
+  },
+  // 岗亭操作——编辑特殊放行记录
+  editParkingOutsideOperationSpecial(params) {
+    return axios.post(`/opt/parking/outside/operation/special/edit`, params)
+  },
+  // 岗亭操作——删除特殊放行记录
+  deleteParkingOutsideOperationSpecial(params) {
+    return axios.post(`/opt/parking/outside/operation/special/delete`, params)
+  },
 }

src/pages/index/components/basic_configuration.vue

@@ -184,8 +184,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.carParkName" />
+                    :label="item.parkName"
+                    :value="item.parkName" />
                 </el-select>
               </el-form-item>
             </el-form>

src/pages/index/components/business_record.vue

@@ -10,8 +10,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -66,8 +66,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="车牌号">
@@ -109,8 +109,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -155,13 +155,16 @@
           custom-class="audit-dialog">
           <div class="form-div">
             <el-form label-position="left" label-width="110px" :model="formLabelAlign2">
+              <el-form-item label="订单号">
+                <el-input v-model="formLabelAlign2.orderNo"></el-input>
+              </el-form-item>
               <el-form-item label="车场名称">
                 <el-select v-model="formLabelAlign2.parkLotId" placeholder="请选择">
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="车牌号">
@@ -201,8 +204,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -248,13 +251,16 @@
           custom-class="audit-dialog">
           <div class="form-div">
             <el-form label-position="left" label-width="100px" :model="formLabelAlign3">
+              <el-form-item label="订单号">
+                <el-input v-model="formLabelAlign2.orderNo"></el-input>
+              </el-form-item>
               <el-form-item label="车场名称">
                 <el-select v-model="formLabelAlign3.parkLotId" placeholder="请选择">
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="车牌号">
@@ -386,6 +392,7 @@ export default {
       dialogVisible2: false,
       formLabelAlign2: {
         id: '',
+        orderNo: '',
         parkLotId: '',
         plateNo: '',
         paymentAmount: '',
@@ -427,19 +434,20 @@ export default {
           key: 'paymentTime'
         },
       ],
-      tableData3: [{carParkingName: 'sasa111'}],
+      tableData3: [{parkName: 'sasa111'}],
       total3: 0,
       pageSize3: 10,
       pageNum3: 1,
       formInline3: {
-        carParkingName: '',
+        parkLotId: '',
         plateNo: '',
       },
       title3: '',
       dialogVisible3: false,
       formLabelAlign3: {
         id: '',
-        carParkingName: '',
+        orderNo: '',
+        parkLotId: '',
         plateNo: '',
         parkingDuration: '',
         arrearsAmount: '',

src/pages/index/components/exception_handing.vue

@@ -10,8 +10,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -61,8 +61,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="车牌号">
@@ -100,8 +100,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -146,8 +146,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="车牌号">
@@ -262,8 +262,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -314,8 +314,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="车牌号">

src/pages/index/components/inspection_management.vue

@@ -42,8 +42,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="取证类型">
@@ -65,8 +65,8 @@
                 <el-option
                   v-for="(item,index) in carParkingNameOptions"
                   :key="index"
-                  :label="item.carParkName"
-                  :value="item.parkId" />
+                  :label="item.parkName"
+                  :value="item.id" />
               </el-select>
             </el-form-item>
             <el-form-item label="稽查对象">
@@ -214,7 +214,7 @@ export default {
       columns1: [
         {
           label: '稽查地点',
-          key: 'carParkName'
+          key: 'parkName'
         },
         {
           label: '取证类型',

src/pages/index/components/pakking_lot.vue

@@ -10,8 +10,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.carParkName" />
+                    :label="item.parkName"
+                    :value="item.parkName" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -56,8 +56,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.carParkName" />
+                    :label="item.parkName"
+                    :value="item.parkName" />
                 </el-select>
               </el-form-item>
               <el-form-item label="入场时间">
@@ -96,7 +96,7 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
+                    :label="item.parkName"
                     :value="item.parkId" />
                 </el-select>
               </el-form-item>
@@ -142,7 +142,7 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
+                    :label="item.parkName"
                     :value="item.parkId" />
                 </el-select>
               </el-form-item>
@@ -172,7 +172,7 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
+                    :label="item.parkName"
                     :value="item.parkId" />
                 </el-select>
               </el-form-item>
@@ -219,7 +219,7 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
+                    :label="item.parkName"
                     :value="item.parkId" />
                 </el-select>
               </el-form-item>
@@ -255,7 +255,7 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
+                    :label="item.parkName"
                     :value="item.parkId" />
                 </el-select>
               </el-form-item>
@@ -302,7 +302,7 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
+                    :label="item.parkName"
                     :value="item.parkId" />
                 </el-select>
               </el-form-item>

src/pages/index/components/parking_outside_operation.vue

@@ -6,7 +6,13 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="车场名称:">
-                <el-input v-model="formInline1.carParkingName" placeholder="请输入"></el-input>
+                <el-select clearable v-model="formInline1.parkLotId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in carParkingNameOptions"
+                    :key="index"
+                    :label="item.parkName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -51,26 +57,39 @@
           <div class="form-div">
             <el-form label-position="left" label-width="100px" :model="formLabelAlign">
               <el-form-item label="车场名称">
-                <el-input v-model="formLabelAlign.carParkingName"></el-input>
+                <el-select v-model="formLabelAlign.parkLotId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in carParkingNameOptions"
+                    :key="index"
+                    :label="item.parkName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
               <el-form-item label="车牌号">
                 <el-input v-model="formLabelAlign.plateNo"></el-input>
               </el-form-item>
               <el-form-item label="入场时间">
-                <el-input v-model="formLabelAlign.inTime"></el-input>
+                <el-date-picker
+                  v-model="formLabelAlign.inTime"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="选择日期时间">
+                </el-date-picker>
               </el-form-item>
               <el-form-item label="离场时间">
-                <el-input v-model="formLabelAlign.outTime"></el-input>
-              </el-form-item>
-              <el-form-item label="岗亭操作人">
-                <el-input v-model="formLabelAlign.operator"></el-input>
+                <el-date-picker
+                  v-model="formLabelAlign.outTime"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="选择日期时间">
+                </el-date-picker>
               </el-form-item>
             </el-form>
           </div>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
             <el-button type="primary" @click="handleConfirm">确 定</el-button>
-        </span>
+          </span>
         </el-dialog>
       </el-tab-pane>
       <el-tab-pane label="停车记录" name="停车记录">
@@ -78,7 +97,13 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="车场名称:">
-                <el-input v-model="formInline2.carParkingName" placeholder="请输入"></el-input>
+                <el-select clearable v-model="formInline2.parkLotId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in carParkingNameOptions"
+                    :key="index"
+                    :label="item.parkName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -123,7 +148,13 @@
           <div class="form-div">
             <el-form label-position="left" label-width="110px" :model="formLabelAlign2">
               <el-form-item label="车场名称">
-                <el-input v-model="formLabelAlign2.carParkingName"></el-input>
+                <el-select v-model="formLabelAlign2.parkLotId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in carParkingNameOptions"
+                    :key="index"
+                    :label="item.parkName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
               <el-form-item label="车牌号">
                 <el-input v-model="formLabelAlign2.plateNo"></el-input>
@@ -132,7 +163,7 @@
                 <el-input v-model="formLabelAlign2.parkingTime"></el-input>
               </el-form-item>
               <el-form-item label="应收费用">
-                <el-input v-model="formLabelAlign2.expenseReceivable"></el-input>
+                <el-input v-model="formLabelAlign2.receivableFee"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -147,14 +178,21 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="收费员:">
-                <el-input v-model="formInline3.tollCollector" placeholder="请输入"></el-input>
+                <el-select clearable v-model="formInline3.tollmanId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in tollmanOptions"
+                    :key="index"
+                    :label="item.tollmanName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="工作日期:">
                 <el-date-picker
-                  v-model="formInline3.workingDate"
+                  v-model="formInline3.workDate"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -197,20 +235,27 @@
           <div class="form-div">
             <el-form label-position="left" label-width="100px" :model="formLabelAlign3">
               <el-form-item label="收费员">
-                <el-input v-model="formLabelAlign3.tollCollector"></el-input>
+                <el-select v-model="formLabelAlign3.tollmanId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in tollmanOptions"
+                    :key="index"
+                    :label="item.tollmanName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
               <el-form-item label="工作日期">
                 <el-date-picker
-                  v-model="formLabelAlign3.workingDate"
+                  v-model="formLabelAlign3.workDate"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
               <el-form-item label="入场车辆数">
-                <el-input v-model="formLabelAlign3.inCarNumber"></el-input>
+                <el-input v-model="formLabelAlign3.inCount"></el-input>
               </el-form-item>
               <el-form-item label="出场车辆数">
-                <el-input v-model="formLabelAlign3.outCarNumber"></el-input>
+                <el-input v-model="formLabelAlign3.outCount"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -225,7 +270,13 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="收费员:">
-                <el-input v-model="formInline4.tollCollector" placeholder="请输入"></el-input>
+                <el-select clearable v-model="formInline4.tollmanId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in tollmanOptions"
+                    :key="index"
+                    :label="item.tollmanName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -271,20 +322,26 @@
           <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-select v-model="formLabelAlign4.tollmanId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in tollmanOptions"
+                    :key="index"
+                    :label="item.tollmanName"
+                    :value="item.id" />
+                </el-select>
               </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"
+                  v-model="formLabelAlign4.createTime"
                   type="date"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
               <el-form-item label="放行原因">
-                <el-input v-model="formLabelAlign4.releaseReason"></el-input>
+                <el-input v-model="formLabelAlign4.relaseReason"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -299,7 +356,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="收费员:">
-                <el-input v-model="formInline5.tollCollector" placeholder="请输入"></el-input>
+                <el-input v-model="formInline5.tollmanName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -345,7 +402,7 @@
           <div class="form-div">
             <el-form label-position="left" label-width="100px" :model="formLabelAlign5">
               <el-form-item label="收费员">
-                <el-input v-model="formLabelAlign5.tollCollector"></el-input>
+                <el-input v-model="formLabelAlign5.tollmanName"></el-input>
               </el-form-item>
               <el-form-item label="抬杆类型">
                 <el-input v-model="formLabelAlign5.liftingRodType"></el-input>
@@ -361,7 +418,7 @@
                 <el-input v-model="formLabelAlign5.liftingRodCar"></el-input>
               </el-form-item>
               <el-form-item label="应收费用">
-                <el-input v-model="formLabelAlign5.expenseReceivable"></el-input>
+                <el-input v-model="formLabelAlign5.receivableFee"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -377,6 +434,7 @@
 <script>
 import api from "@/api/audit.js";
 import dictionary from "@/util/dictionary";
+import api_z from "@/api/article_z.js";
 
 export default {
   components: {},
@@ -386,7 +444,7 @@ export default {
       columns1: [
         {
           label: '车场名称',
-          key: 'carParkingName'
+          key: 'parkName'
         },
         {
           label: '车牌号',
@@ -400,33 +458,32 @@ export default {
           label: '离场时间',
           key: 'outTime'
         },
-        {
-          label: '岗亭操作人',
-          key: 'operator'
-        },
       ],
-      tableData1: [{carParkingName: 'sasa'}],
+      tableData1: [{parkName: 'sasa'}],
       total1: 0,
       pageSize1: 10,
       pageNum1: 1,
       formInline1: {
-        carParkingName: '',
+        parkLotId: '',
         plateNo:'',
       },
+      carParkingNameValue: '',
+      carParkingNameOptions: [],
+      tollmanValue: '',
+      tollmanOptions: [],
       title: '',
       dialogVisible: false,
       formLabelAlign: {
         id: '',
-        carParkingName: '',
+        parkLotId: '',
         plateNo:'',
         inTime: '',
         outTime: '',
-        operator: '',
       },
       columns2: [
         {
           label: '车场名称',
-          key: 'carParkingName'
+          key: 'parkName'
         },
         {
           label: '车牌号',
@@ -438,10 +495,10 @@ export default {
         },
         {
           label: '应收费用',
-          key: 'expenseReceivable'
+          key: 'receivableFee'
         },
       ],
-      tableData2: [{carParkingName: 'sasa1'}],
+      tableData2: [{parkName: 'sasa1'}],
       total2: 0,
       pageSize2: 10,
       pageNum2: 1,
@@ -456,47 +513,47 @@ export default {
         carParkingName: '',
         plateNo:'',
         parkingTime: '',
-        expenseReceivable: '',
+        receivableFee: '',
       },
       columns3: [
         {
           label: '收费员',
-          key: 'tollCollector'
+          key: 'tollmanName'
         },
         {
           label: '工作日期',
-          key: 'workingDate'
+          key: 'workDate'
         },
         {
           label: '入场车辆数',
-          key: 'inCarNumber'
+          key: 'inCount'
         },
         {
           label: '出场车辆数',
-          key: 'outCarNumber'
+          key: 'outCount'
         },
       ],
-      tableData3: [{carParkingName: 'sasa111'}],
+      tableData3: [{tollmanName: 'sasa111'}],
       total3: 0,
       pageSize3: 10,
       pageNum3: 1,
       formInline3: {
-        tollCollector: '',
-        workingDate: ''
+        tollmanId: '',
+        workDate: ''
       },
       title3: '',
       dialogVisible3: false,
       formLabelAlign3: {
         id: '',
-        tollCollector: '',
-        workingDate: '',
-        inCarNumber: '',
-        outCarNumber: '',
+        tollmanId: '',
+        workDate: '',
+        inCount: '',
+        outCount: '',
       },
       columns4: [
         {
           label: '收费员',
-          key: 'tollCollector'
+          key: 'tollmanName'
         },
         {
           label: '车牌号',
@@ -504,34 +561,34 @@ export default {
         },
         {
           label: '放行时间',
-          key: 'releaseTime'
+          key: 'createTime'
         },
         {
           label: '放行原因',
-          key: 'releaseReason'
+          key: 'relaseReason'
         },
       ],
-      tableData4: [{carParkingName: 'sasa1111'}],
+      tableData4: [{tollmanName: 'sasa1111'}],
       total4: 0,
       pageSize4: 10,
       pageNum4: 1,
       formInline4: {
-        tollCollector: '',
+        tollmanId: '',
         plateNo: '',
       },
       title4: '',
       dialogVisible4: false,
       formLabelAlign4: {
         id: '',
-        tollCollector: '',
+        tollmanId: '',
         plateNo: '',
-        releaseTime: '',
-        releaseReason: '',
+        createTime: '',
+        relaseReason: '',
       },
       columns5: [
         {
           label: '收费员',
-          key: 'tollCollector'
+          key: 'tollmanName'
         },
         {
           label: '抬杆类型',
@@ -547,34 +604,36 @@ export default {
         },
         {
           label: '应收费用',
-          key: 'expenseReceivable'
+          key: 'receivableFee'
         },
       ],
-      tableData5: [{carParkingName: 'sasa1111'}],
+      tableData5: [{tollmanName: 'sasa1111'}],
       total5: 0,
       pageSize5: 10,
       pageNum5: 1,
       formInline5: {
-        tollCollector: '',
+        tollmanId: '',
         liftingRodType: '',
       },
       title5: '',
       dialogVisible5: false,
       formLabelAlign5: {
         id: '',
-        tollCollector: '',
+        tollmanId: '',
         liftingRodType: '',
         liftingRodTime: '',
         liftingRodCar: '',
-        expenseReceivable: '',
+        receivableFee: '',
       },
     }
   },
   mounted() {
-    // this.getTableData1()
-    // this.getTableData2()
-    // this.getTableData3()
-    // this.getTableData4()
+    this.getTableData1()
+    this.getCarParkingName()
+    this.getTollmanList()
+    this.getTableData2()
+    this.getTableData3()
+    this.getTableData4()
     // this.getTableData5()
   },
   watch: {},
@@ -585,11 +644,7 @@ export default {
     },
     handleAdd() {
       this.title = '添加'
-      this.formLabelAlign.carParkingName = ''
-      this.formLabelAlign.plateNo = ''
-      this.formLabelAlign.inTime = ''
-      this.formLabelAlign.outTime = ''
-      this.formLabelAlign.operator = ''
+      this.formLabelAlign = {}
       this.dialogVisible = true
     },
     handleEdit(row) {
@@ -598,7 +653,7 @@ export default {
       this.dialogVisible = true
     },
     deleteRow(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_z.deleteParkingOutsideOperationInout([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData1()
@@ -607,7 +662,7 @@ export default {
     },
     handleConfirm() {
       if (this.title === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
+        api_z.editParkingOutsideOperationInout({...this.formLabelAlign}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -618,7 +673,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
+        api_z.addParkingOutsideOperationInout({...this.formLabelAlign}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -630,16 +685,25 @@ export default {
         })
       }
     },
+    //车场
+    getCarParkingName() {
+      api_z.querySelectParkListByPage().then(res => {
+        this.carParkingNameOptions=res.data
+      })
+    },
+    //收费员
+    getTollmanList() {
+      api_z.querySelectTollmanListByPage().then(res => {
+        this.tollmanOptions=res.data
+      })
+    },
     onSubmit2() {
       this.pageNum2 = 1
       this.getTableData2()
     },
     handleAdd2() {
       this.title2 = '添加'
-      this.formLabelAlign2.carParkingName = ''
-      this.formLabelAlign2.plateNo = ''
-      this.formLabelAlign2.parkingTime = ''
-      this.formLabelAlign2.expenseReceivable = ''
+      this.formLabelAlign2 = {}
       this.dialogVisible2 = true
     },
 
@@ -649,7 +713,7 @@ export default {
       this.dialogVisible2 = true
     },
     deleteRow2(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_z.deleteParkingOutsideOperationParkingrecord([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData2()
@@ -658,7 +722,7 @@ export default {
     },
     handleConfirm2() {
       if (this.title2 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr, id: this.formLabelAlign2.id}).then(res => {
+        api_z.editParkingOutsideOperationParkingrecord({...this.formLabelAlign2}).then(res => {
           if (res.code === 200) {
             this.dialogVisible2 = false
             this.$message({
@@ -669,7 +733,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr}).then(res => {
+        api_z.addParkingOutsideOperationParkingrecord({...this.formLabelAlign2}).then(res => {
           if (res.code === 200) {
             this.dialogVisible2 = false
             this.$message({
@@ -687,10 +751,7 @@ export default {
     },
     handleAdd3() {
       this.title3 = '添加'
-      this.formLabelAlign3.tollCollector = ''
-      this.formLabelAlign3.workingDate = ''
-      this.formLabelAlign3.inCarNumber = ''
-      this.formLabelAlign3.outCarNumber = ''
+      this.formLabelAlign3 = {}
       this.dialogVisible3 = true
     },
 
@@ -700,7 +761,7 @@ export default {
       this.dialogVisible3 = true
     },
     deleteRow3(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_z.deleteParkingOutsideOperationInrecord([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData3()
@@ -709,7 +770,7 @@ export default {
     },
     handleConfirm3() {
       if (this.title3 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr, id: this.formLabelAlign3.id}).then(res => {
+        api_z.editParkingOutsideOperationInrecord({...this.formLabelAlign3}).then(res => {
           if (res.code === 200) {
             this.dialogVisible3 = false
             this.$message({
@@ -720,7 +781,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr}).then(res => {
+        api_z.addParkingOutsideOperationInrecord({...this.formLabelAlign3}).then(res => {
           if (res.code === 200) {
             this.dialogVisible3 = false
             this.$message({
@@ -738,10 +799,7 @@ export default {
     },
     handleAdd4() {
       this.title4 = '添加'
-      this.formLabelAlign4.tollCollector= ''
-      this.formLabelAlign4.plateNo= ''
-      this.formLabelAlign4.releaseTime= ''
-      this.formLabelAlign4.releaseReason = ''
+      this.formLabelAlign4 = {}
       this.dialogVisible4 = true
     },
 
@@ -751,7 +809,7 @@ export default {
       this.dialogVisible4 = true
     },
     deleteRow4(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_z.deleteParkingOutsideOperationSpecial([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData4()
@@ -760,7 +818,7 @@ export default {
     },
     handleConfirm4() {
       if (this.title4 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign4.ipAddr, id: this.formLabelAlign4.id}).then(res => {
+        api_z.editParkingOutsideOperationSpecial({...this.formLabelAlign4}).then(res => {
           if (res.code === 200) {
             this.dialogVisible4 = false
             this.$message({
@@ -771,7 +829,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign4.ipAddr}).then(res => {
+        api_z.addParkingOutsideOperationSpecial({...this.formLabelAlign4}).then(res => {
           if (res.code === 200) {
             this.dialogVisible4 = false
             this.$message({
@@ -789,11 +847,7 @@ export default {
     },
     handleAdd5() {
       this.title5 = '添加'
-      this.formLabelAlign5.tollCollector= ''
-      this.formLabelAlign5.liftingRodType = ''
-      this.formLabelAlign5.liftingRodTime = ''
-      this.formLabelAlign5.liftingRodCar = ''
-      this.formLabelAlign5.expenseReceivable = ''
+      this.formLabelAlign5 = {}
       this.dialogVisible5 = true
     },
 
@@ -803,7 +857,7 @@ export default {
       this.dialogVisible5 = true
     },
     deleteRow5(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_z.deleteWhiteIp([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData5()
@@ -812,7 +866,7 @@ export default {
     },
     handleConfirm5() {
       if (this.title5 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign5.ipAddr, id: this.formLabelAlign5.id}).then(res => {
+        api_z.addWhiteIp({...this.formLabelAlign5}).then(res => {
           if (res.code === 200) {
             this.dialogVisible5 = false
             this.$message({
@@ -823,7 +877,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign5.ipAddr}).then(res => {
+        api_z.addWhiteIp({...this.formLabelAlign5}).then(res => {
           if (res.code === 200) {
             this.dialogVisible5 = false
             this.$message({
@@ -840,8 +894,8 @@ export default {
     },
     getTableData1() {
       const {pageNum1, pageSize1} = this
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
+      api_z.queryParkingOutsideOperationInoutByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
+        this.tableData1 = res.data.records || []
         this.total1 = res.data.total
       })
     },
@@ -850,7 +904,7 @@ export default {
     },
     getTableData2() {
       const {pageNum2, pageSize2} = this
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
+      api_z.queryParkingOutsideOperationParkingrecordByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
         this.tableData2 = res.data.records || []
         this.total2 = res.data.total
       })
@@ -860,7 +914,7 @@ export default {
     },
     getTableData3() {
       const {pageNum3, pageSize3} = this
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
+      api_z.queryParkingOutsideOperationInrecordByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
         this.tableData3 = res.data.records || []
         this.total3 = res.data.total
       })
@@ -870,7 +924,7 @@ export default {
     },
     getTableData4() {
       const {pageNum4, pageSize4} = this
-      api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
+      api_z.queryParkingOutsideOperationSpecialByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
         this.tableData4 = res.data.records || []
         this.total4 = res.data.total
       })
@@ -880,7 +934,7 @@ export default {
     },
     getTableData5() {
       const {pageNum5, pageSize5} = this
-      api.tcjlListByPage({current: pageNum5, size: pageSize5, ...this.formInline5}).then(res => {
+      api_z.tcjlListByPage({current: pageNum5, size: pageSize5, ...this.formInline5}).then(res => {
         this.tableData5 = res.data.records || []
         this.total5 = res.data.total
       })
@@ -922,7 +976,7 @@ export default {
     .form-div {
       /deep/ .el-input__inner {
         height: 35px;
-        width: 90%;
+        width: 99%;
         border: 1px solid #a6a5a5;
       }
     }

src/pages/index/components/personnel_management.vue

@@ -10,8 +10,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -56,8 +56,8 @@
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
-                    :label="item.carParkName"
-                    :value="item.parkId" />
+                    :label="item.parkName"
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="收入统计">
@@ -220,7 +220,7 @@ export default {
       pageNum1: 1,
       formInline1: {
         carParkingName: '',
-        carParkName:'',
+        parkName:'',
         parkId:''
       },
       title: '',
@@ -237,7 +237,7 @@ export default {
         excptionEvent: '',
         deviceStatus: '',
         vehicleStatus: '',
-        carParkName: '',
+        parkName: '',
         tollmanName: '',
         jiaobanrenyuan:'',
         jiebanrenyuan:''
@@ -293,7 +293,7 @@ export default {
       },
     handleAdd() {
       this.title = '添加'
-      this.formLabelAlign.carParkName = ''
+      this.formLabelAlign.parkName = ''
       this.formLabelAlign.parkId = ''
       this.formLabelAlign.id = ''
       this.formLabelAlign.tollmanFinishId = ''