bug fixed

src/api/article_liao.js

@@ -14,7 +14,7 @@ export default {
   optPersonnelManagementShiftDetail(params){
     return axios.get('/opt/personnel/management/shift/detail', {params})
   },
-//获取交接班记录分页
+  // 新增交接班记录分页
   optPersonnelManagementShiftAdd(params){
   return axios.post('/opt/personnel/management/shift/add', params)
 },

src/pages/index/components/pakking_lot.vue

@@ -60,7 +60,7 @@
                     :value="item.id" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="入场时间">
+              <el-form-item label="营业开始时间">
                 <el-time-picker
                   v-model="formLabelAlign.inTime"
                   :picker-options="{selectableRange: '0:00:00 - 23:59:59'}"
@@ -68,7 +68,7 @@
                   placeholder="选择时间">
                 </el-time-picker>
               </el-form-item>
-              <el-form-item label="离场时间">
+              <el-form-item label="营业结束时间">
                 <el-time-picker
                   v-model="formLabelAlign.outTime"
                   :picker-options="{selectableRange: '12:00:00 - 23:59:59'}"
@@ -76,9 +76,9 @@
                   placeholder="选择时间">
                 </el-time-picker>
               </el-form-item>
-              <el-form-item label="停车场管理员">
-                <el-input v-model="formLabelAlign.managerName"></el-input>
-              </el-form-item>
+<!--              <el-form-item label="停车场管理员">-->
+<!--                <el-input v-model="formLabelAlign.managerName"></el-input>-->
+<!--              </el-form-item>-->
             </el-form>
           </div>
           <span slot="footer" class="dialog-footer">
@@ -449,17 +449,17 @@ export default {
           key: 'parkName'
         },
         {
-          label: '入场时间',
+          label: '营业开始时间',
           key: 'inTime'
         },
         {
-          label: '离场时间',
+          label: '营业结束时间',
           key: 'outTime'
         },
-        {
-          label: '停车场管理员',
-          key: 'managerName'
-        },
+        // {
+        //   label: '停车场管理员',
+        //   key: 'managerName'
+        // },
       ],
       carParkingNameValue: '',
       carParkingNameOptions: [],

src/pages/index/components/parking_card.vue

@@ -303,7 +303,7 @@ export default {
       this.dialogVisible = true
     },
     deleteRow (record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api.deleteEckRule({id: record.id}).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData1()

src/pages/index/components/payment_merchant.vue

@@ -37,7 +37,7 @@
             width="200">
             <template slot-scope="scope" style="display: inline-block">
               <el-button type="primary" @click="handleEdit(scope.row)" slot="reference">修改</el-button>
-              <el-popconfirm title="确定删除吗？" @confirm="deleteRow2(scope.row)">
+              <el-popconfirm title="确定删除吗？" @confirm="deleteRow(scope.row)">
                 <el-button type="danger" slot="reference">删除</el-button>
               </el-popconfirm>
             </template>
@@ -154,6 +154,14 @@ export default {
       this.formLabelAlign = {...row}
       this.dialogVisible = true
     },
+    deleteRow(record) {
+      api.deleteZfsh([{id: record.id}]).then(res => {
+        if (res.code === 200) {
+          this.$message({type: 'success', message: '删除成功!'})
+          this.getTableData()
+        }
+      })
+    },
     getTableData() {
       this.loading = true
       const {pageNum, pageSize} = this

src/pages/index/components/personnel_management.vue

@@ -324,16 +324,30 @@ export default {
     },
     //人员
     getPeople(){
-      api_l.optPersonnelManagementBasicPage({}).then(res => {
-        this.peopleOptions = res.data.records
+      api_l.optPersonnelDic({}).then(res => {
+        this.peopleOptions = res.data || []
       })
     },
     handleConfirm() {
       if (this.title === '修改') {
-        api_l.optPersonnelManagementShiftAdd({id:this.formLabelAlign.id,tollmanFinishId:this.formLabelAlign.tollmanFinishId,tollmanReceiveId:this.formLabelAlign.tollmanReceiveId,incomeFee: this.formLabelAlign.incomeFee, parkingNum: this.formLabelAlign.parkingNum, excptionEvent: this.formLabelAlign.excptionEvent, deviceStatus: this.formLabelAlign.deviceStatus, vehicleStatus: this.formLabelAlign.vehicleStatus}).then(res => {
-          this.getTableData1()
+        api_l.optPersonnelManagementShiftEdit(this.formLabelAlign).then(res => {
+          this.$message({
+            message: '修改成功!',
+            type: 'success'
+          })
           this.dialogVisible = false
+          this.getTableData1()
         })
+      } else {
+        api_l.optPersonnelManagementShiftAdd(this.formLabelAlign).then(res => {
+          this.$message({
+            message: '修改成功!',
+            type: 'success'
+          })
+          this.dialogVisible = false
+          this.getTableData1()
+          }
+        )
       }
     },
     onSubmit2() {