前端

src/App.vue

@@ -15,5 +15,7 @@ export default {
     background-color: #2f53eb;
     border-color: #2f53eb;
 }
-
+.el-icon-circle-close{
+  color:#fff;
+}
 </style>

src/api/cargoOwnerManagement.js

@@ -88,4 +88,12 @@ export function theRecharge(data) {
     method: 'post',
      data: data,
   })
-}
+}
+// 禁用
+export function forbidden(data) {
+  return request({
+    url: '/commonUser/editUserInfo',
+    method: 'post',
+     data: data,
+  })
+}

src/api/driverManagement.js

@@ -79,3 +79,11 @@ export function editInfo(data) {
     data: data,
   })
 }
+// 禁用
+export function forbidden(data) {
+  return request({
+    url: '/commonUser/editUserInfo',
+    method: 'post',
+     data: data,
+  })
+}

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -303,6 +303,17 @@
           @click="enlarge(paySee.payeeAddressUrl)"
         /> -->
     </el-dialog>
+    <el-dialog title="禁用天数" :close-on-click-modal='false' :visible.sync="forbiddenshow" width="400px" :before-close="forbiddenshowClose">
+       <el-form ref="form" label-width="80px">
+            <el-form-item label="禁用天数">
+              <el-input placeholder="输入禁用天数，当天起算" v-model="disabledDays"></el-input>
+            </el-form-item>
+            <div class="form_btn">
+              <el-button @click="forbiddenshowClose">取消</el-button>
+              <el-button @click="submitforbidden" type="primary">确定</el-button>
+            </div>
+          </el-form>
+    </el-dialog>
     <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index: 9999" />
   </div>
 </template>
@@ -314,7 +325,8 @@ import {
   getBillList,
   editInfo,
   getInfo,
-  theRecharge
+  theRecharge,
+  forbidden
 } from '@/api/cargoOwnerManagement';
 export default {
   components: {
@@ -349,12 +361,19 @@ export default {
       rechargeShow: false,
       imageUrl: '',
       rechargeData: {bankCard:''},
+      forbiddenshow:false,
+      disabledDays:'',
+      forbiddendata:{},
     };
   },
   mounted() {
     this.getList();
   },
   methods: {
+    forbiddenshowClose(){
+        this.disabledDays=''
+        this.forbiddenshow=false
+      },
     seeInfo(val) {
       this.listLoading = true;
       getInfo({
@@ -493,45 +512,71 @@ export default {
         });
     },
     switchChange(row, num) {
-      var _examine = {};
-      _examine.id = row.id;
-      let title;
-      if (num == 1) {
-        _examine.flag = 3;
-        title = '禁用后客户将无法使用所有功能，是否确定禁用？';
-      } else if (num == 2) {
-        title = '确定重新启用该用户？';
-        _examine.flag = 4;
-      }
-      this.$confirm(title, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        this.listLoading = true;
-        toExamine(_examine)
-          .then((response) => {
-            if (num == 1) {
-              this.$notify({
-                title: '成功',
-                message: '禁用成功！',
-                type: 'success',
-              });
-            } else if (num == 2) {
-              this.$notify({
-                title: '成功',
-                message: '启用成功！',
-                type: 'success',
-              });
-            }
-            this.getList();
-            this.listLoading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      });
-    },
+        console.log(1111111)
+        this.forbiddendata=row
+        var _examine = {};
+        _examine.id = row.commonId;
+        let title;
+        if (num == 1) {
+          // _examine.flag = 3;
+          // title = "禁用后客户将无法使用所有功能，是否确定禁用？";
+          this.forbiddenshow=true
+          
+        } else if (num == 2) {
+          title = "确定重新启用该用户？";
+          _examine.disableFlag = 2;
+          _examine.identityFlag = 1;
+          this.$confirm(title, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          this.listLoading = true;
+          forbidden(_examine)
+            .then((response) => {
+                this.$notify({
+                  title: "成功",
+                  message: "启用成功！",
+                  type: "success",
+                });
+              this.getList();
+              this.listLoading = false;
+            })
+            .catch(() => {
+              this.listLoading = false;
+            });
+        });
+        }
+      },
+      submitforbidden(){
+          if(!this.disabledDays){
+            this.$message.error("禁用天数不能为空");
+            return
+          }if(this.disabledDays<2){
+            this.$message.error("禁用天数输入错误");
+            return
+          }
+          var _examine={}
+          _examine.id = this.forbiddendata.commonId
+          _examine.disableFlag = 1;
+          _examine.identityFlag = 1;
+          _examine.disabledDays = this.disabledDays;
+          this.listLoading = true;
+          forbidden(_examine)
+            .then((response) => {
+                this.$notify({
+                  title: "成功",
+                  message: "禁用成功！",
+                  type: "success",
+                });
+                this.forbiddenshow=false
+              this.getList();
+              this.listLoading = false;
+            })
+            .catch(() => {
+              this.listLoading = false;
+            });
+      },
     newInfo(row) {
       this.Info.newsTypeKey = 1;
       this.Info.newsType = '系统消息';

src/views/driverManagement/identityExamine.vue

@@ -302,6 +302,17 @@
         </div>
       </div>
     </el-dialog>
+    <el-dialog title="禁用天数" :close-on-click-modal='false' :visible.sync="forbiddenshow" width="400px" :before-close="forbiddenshowClose">
+       <el-form ref="form" label-width="80px">
+            <el-form-item label="禁用天数">
+              <el-input placeholder="输入禁用天数，当天起算" v-model="disabledDays"></el-input>
+            </el-form-item>
+            <div class="form_btn">
+              <el-button @click="forbiddenshowClose">取消</el-button>
+              <el-button @click="submitforbidden" type="primary">确定</el-button>
+            </div>
+          </el-form>
+    </el-dialog>
     <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
   </div>
 </template>
@@ -312,6 +323,7 @@
     postNews,
     billSee,
     editInfo,
+    forbidden
   } from "@/api/driverManagement";
   export default {
     data() {
@@ -330,6 +342,7 @@
         userInfo: false,
         fujianInfo: false,
         rejectInfo: false,
+        forbiddendata:{},
         form: {
           id: "",
           rejectReasonDescription: "",
@@ -350,7 +363,9 @@
         // iconShow: true,
         //图片预览
         srcList: [],
+        forbiddenshow:false,
         imgsVisible: false,
+        disabledDays:''
       };
     },
 
@@ -362,6 +377,7 @@
         import("element-ui/packages/image/src/image-viewer"),
     },
     methods: {
+      
       closeImgViewer() {
          this.srcList = []
         this.imgsVisible = false;
@@ -493,6 +509,10 @@
         this.Info = {};
         this.sendInfo = false;
       },
+      forbiddenshowClose(){
+        this.disabledDays=''
+        this.forbiddenshow=false
+      },
       submitInfo() {
         if (!this.Info.newsTitle) {
           this.$message.error("标题不能为空");
@@ -529,44 +549,70 @@
           });
       },
       switchChange(row, num) {
+        console.log(1111111)
+        this.forbiddendata=row
         var _examine = {};
-        _examine.id = row.id;
+        _examine.id = row.commonId;
         let title;
         if (num == 1) {
-          _examine.flag = 3;
-          title = "禁用后客户将无法使用所有功能，是否确定禁用？";
+          // _examine.flag = 3;
+          // title = "禁用后客户将无法使用所有功能，是否确定禁用？";
+          this.forbiddenshow=true
+          
         } else if (num == 2) {
           title = "确定重新启用该用户？";
-          _examine.flag = 4;
-        }
-        this.$confirm(title, "提示", {
+          _examine.disableFlag = 2;
+          _examine.identityFlag = 2;
+          this.$confirm(title, "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
           this.listLoading = true;
-          toExamine(_examine)
+          forbidden(_examine)
             .then((response) => {
-              if (num == 1) {
                 this.$notify({
                   title: "成功",
-                  message: "禁用成功！",
+                  message: "启用成功！",
                   type: "success",
                 });
-              } else if (num == 2) {
+              this.getList();
+              this.listLoading = false;
+            })
+            .catch(() => {
+              this.listLoading = false;
+            });
+        });
+        }
+      },
+      submitforbidden(){
+          if(!this.disabledDays){
+            this.$message.error("禁用天数不能为空");
+            return
+          }if(this.disabledDays<2){
+            this.$message.error("禁用天数输入错误");
+            return
+          }
+          var _examine={}
+          _examine.id = this.forbiddendata.commonId
+          _examine.disableFlag = 1;
+          _examine.identityFlag = 2;
+          _examine.disabledDays = this.disabledDays;
+          this.listLoading = true;
+          forbidden(_examine)
+            .then((response) => {
                 this.$notify({
                   title: "成功",
-                  message: "启用成功！",
+                  message: "禁用成功！",
                   type: "success",
                 });
-              }
+                this.forbiddenshow=false
               this.getList();
               this.listLoading = false;
             })
             .catch(() => {
               this.listLoading = false;
             });
-        });
       },
       account(row) {
         this.paySee = row.hyDriverPayeeInfoList;

src/views/settlementManagement/driverFeeSettlement.vue

@@ -31,6 +31,9 @@
               <div :class="searchType == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
                 已支付
               </div>
+              <div :class="searchType == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
+                已到账
+              </div>
               <div :class="searchType == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
                 暂缓中
               </div>