Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/http/moudules/task.js

@@ -165,7 +165,14 @@ export const insPayApplyAudit = (data) => {
     data
   })
 }
-
+//可提现余额审核驳回
+export const insPayauditReject = (data) => {
+  return axios({
+    url: '/sysAmountAuditing/rejectAmount',
+    method: 'post',
+    data
+  })
+}
 // 可提现余额查询
 export const payAccount = (data) => {
   return axios({
@@ -1202,7 +1209,7 @@ export const batchInvoic = (data) => {
     data
   })
 }
- 
+
 export const allOtherAmount = (data) => {
   return axios({
     url: "/fnc/plyFee/allOtherAmount",
@@ -1293,7 +1300,7 @@ export const invicdetai = (data) => {
     method: "post",
     data
   })
-} 
+}
 export const otherSettldetail = (data) => {
   return axios({
     url: "/fnc/plyFee/otherSettldetail",
@@ -1515,4 +1522,4 @@ export const updateNoHand = (data) => {
     method: "put",
     data
   })
-}
+}

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryUnsettled.vue

@@ -332,6 +332,7 @@ export default {
         loading: true,
         isShowIndex: true,
         operationWidth: '130',
+        tableHeight:'auto',
         optBtns:[
           {
             type:'primary',

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue

@@ -239,6 +239,7 @@ export default {
         loading: true,
         isShowIndex: true,
         operationWidth: 150,
+        tableHeight:'auto',
         optBtns:[
           {
             type:'primary',

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryUnsettled.vue

@@ -346,6 +346,7 @@ export default {
         loading: true,
         isShowIndex: true,
         operationWidth: '130',
+        tableHeight:'auto',
         optBtns:[
           {
             type:'primary',
@@ -497,7 +498,6 @@ export default {
         });
     },
     handleSearchList1(data) {
-      console.log(data, '1111111111111111111')
       this.findPageNewDetail({...this.findPageDetailListNew, ...data})
     },
     haldNewDetail(row) {

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicingUnsettled.vue

@@ -212,6 +212,7 @@ export default {
                 loading: true,
                 isShowIndex: true,
                 operationWidth: 150,
+                tableHeight:'auto',
                 optBtns: [
                     {
                         type: 'primary',

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresPending.vue

@@ -2,13 +2,7 @@
   <div>
     <el-main ref="elMain" style="padding: 0px;">
       <el-row>
-        <el-form
-          :inline="true"
-          :model="queryForm"
-          class="demo-form-inline"
-          label-width="130px"
-          size="small"
-        >
+        <el-form :inline="true" :model="queryForm" class="demo-form-inline" label-width="130px" size="small">
           <el-form-item label="业务员工号">
             <el-input v-model="queryForm.userId" placeholder="业务员工号" clearable></el-input>
           </el-form-item>
@@ -22,13 +16,8 @@
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
           <el-form-item label="提现时间">
-            <el-date-picker
-              v-model="queryForm.date"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期">
+            <el-date-picker v-model="queryForm.date" type="datetimerange" range-separator="至" value-format="yyyy-MM-dd"
+              start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
           <el-form-item>
@@ -36,45 +25,39 @@
           </el-form-item>
         </el-form>
       </el-row>
-      <kt-common-table
-        button2Type="text"
-        button3Type="text"
-        :showBatchDelete="false"
-        :showBatchPrint="true"
-        permsButton3="sys:withdrawalProceduresPending:examine"
-        permsButton2="sys:withdrawalProceduresPending:examinepay"
-        :data="pageResult"
-        :columns="columns"
-        @findPage="findPage"
-        button3Name="审核并支付"
-        @handleButton3="handleButton3"
-        button2Name="审核提现"
-        @handleButton2="handleButton2"
-      ></kt-common-table>
-      <el-dialog
-      :visible.sync="dialogVisibleBatch"
-      width="35%"
-      :before-close="handleCloseBatch">
-      <p >凭证号 ：<el-input style="width: 200px;" v-model="voucherId" placeholder="请输入凭证号"></el-input></p>
-      <div style="display: flex">上传图片：  <el-upload
-                action="#"
-                :auto-upload="false"
-                accept=".png, .jpg, .jpeg"
-                :show-file-list="false"
-                :on-change="drivingupload">
-                <img v-if="qrCodeImage" :src="qrCodeImage"  class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-          </div>
+      <kt-common-table button2Type="text" button3Type="text" button4Type="text" :showBatchDelete="false"
+        :showBatchPrint="true" permsButton3="sys:withdrawalProceduresPending:examine"
+        permsButton2="sys:withdrawalProceduresPending:examinepay" :data="pageResult" :columns="columns"
+        @findPage="findPage" button3Name="审核并支付" @handleButton3="handleButton3" button4Name="审核驳回"
+        @handleButton4="handleButton4" button2Name="审核提现" @handleButton2="handleButton2"></kt-common-table>
+      <el-dialog :visible.sync="dialogVisibleBatch" width="35%" :before-close="handleCloseBatch">
+        <p>凭证号 ：<el-input style="width: 200px;" v-model="voucherId" placeholder="请输入凭证号"></el-input></p>
+        <div style="display: flex">上传图片： <el-upload action="#" :auto-upload="false" accept=".png, .jpg, .jpeg"
+            :show-file-list="false" :on-change="drivingupload">
+            <img v-if="qrCodeImage" :src="qrCodeImage" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="small" @click="dialogVisibleBatch = false">取 消</el-button>
+          <el-button size="small" type="primary" @click="handleSumbit()">确 定</el-button>
+        </span>
+      </el-dialog>
+    </el-main>
+    <el-dialog title="驳回弹窗" :visible.sync="auditRejectdialogVisible" width="30%" @open="auditRejectdialogOpen">
+      <div>
+        <span></span>
+        <el-input type="textarea" placeholder="请输入内容" v-model="auditRejectInput" maxlength="100" show-word-limit>
+        </el-input>
+      </div>
       <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisibleBatch = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="handleSumbit()">确 定</el-button>
+        <el-button size="small" @click="auditRejectdialogVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="auditRejectSubmit">确 定</el-button>
       </span>
     </el-dialog>
-    </el-main>
   </div>
 </template>
-  <script>
+<script>
 import Cookies from "js-cookie";
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import KtButton from "@/views/Core/KtButton";
@@ -86,11 +69,14 @@ export default {
   },
   data() {
     return {
-      dialogVisibleBatch:false,
-      voucherId:'',
-      qrCodeImage:'',
-      picId:'',
-      rowlist:{},
+      auditRejectId:"",
+      auditRejectInput: "",
+      auditRejectdialogVisible: false,
+      dialogVisibleBatch: false,
+      voucherId: '',
+      qrCodeImage: '',
+      picId: '',
+      rowlist: {},
       // 右侧列表查询数据Start
       queryForm: {},
       pageResult: {},
@@ -119,7 +105,7 @@ export default {
   },
   created() {
   },
-  mounted() {},
+  mounted() { },
   methods: {
     handlePrint(index, row) {
       this.$api.task.AmountReview(this.pageRequest).then(res => {
@@ -145,7 +131,7 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
-      if (this.queryForm.date && this.queryForm.date.length>0) {
+      if (this.queryForm.date && this.queryForm.date.length > 0) {
         this.queryForm.startTime = this.queryForm.date[0];
         this.queryForm.endTime = this.queryForm.date[1];
       } else {
@@ -153,7 +139,7 @@ export default {
         this.queryForm.endTime = "";
       }
       that.$api.task
-        .payqueryPage({ ...this.pageRequest, ...this.queryForm,amountStatus:'1' })
+        .payqueryPage({ ...this.pageRequest, ...this.queryForm, amountStatus: '1' })
         .then(res => {
           if (res.code == 200) {
             that.pageResult = res.data;
@@ -169,32 +155,32 @@ export default {
       params.append("type", "image");
       this.$api.letter.uploadFile(params).then(res => {
         if (res.code == "200") {
-          this.picId=res.data.id
+          this.picId = res.data.id
         } else {
           this.$message({ message: res.msg, type: "warning" });
         }
       });
     },
-    handleSumbit(){
-      this.$api.task.AmountReview({ ...this.rowlist, status: '1',picId:this.picId,voucherId:this.voucherId }).then(res => {
-          if (res.code == 200) {
-            this.dialogVisibleBatch = false
-            this.findPage();
-            this.$message({
-              type: "success",
-              message: res.msg
-            });
-          }
-          else {
-            this.$message.error(res.msg)
-          }
-        })
+    handleSumbit() {
+      this.$api.task.AmountReview({ ...this.rowlist, status: '1', picId: this.picId, voucherId: this.voucherId }).then(res => {
+        if (res.code == 200) {
+          this.dialogVisibleBatch = false
+          this.findPage();
+          this.$message({
+            type: "success",
+            message: res.msg
+          });
+        }
+        else {
+          this.$message.error(res.msg)
+        }
+      })
     },
     handleButton2({ row, index }) {
-      this.dialogVisibleBatch=true
-      this.rowlist=row
-      this.picId=''
-      this.voucherId=''
+      this.dialogVisibleBatch = true
+      this.rowlist = row
+      this.picId = ''
+      this.voucherId = ''
       // this.$api.task.AmountReview(row).then(res => {
       //   if (res.code == 200) {
       //     this.$message({
@@ -233,6 +219,31 @@ export default {
           });
         });
     },
+    handleButton4({ row, index }) {
+      this.auditRejectId=row.id;
+      this.auditRejectdialogVisible = true;
+    },
+    auditRejectSubmit(){
+      let params = {
+        id: this.auditRejectId,
+        rejectReason: this.auditRejectInput
+      }
+      this.$api.task.insPayauditReject(params).then((res) => {
+        if (res.code == '200') {
+      this.auditRejectdialogVisible = false;
+          this.findPage();
+          this.$message({
+            type: 'success',
+            message: res.msg,
+          });
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    },
 
     // 格式化日期，如月、日、时、分、秒保证为2位数
     formatNumber(n) {
@@ -260,16 +271,17 @@ export default {
   }
 };
 </script>
-  
-  
-  <style scoped>
-  .avatar-uploader .el-upload {
+
+
+<style scoped>
+.avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
   cursor: pointer;
   position: relative;
   overflow: hidden;
 }
+
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -279,6 +291,7 @@ export default {
   text-align: center;
   border: 1px dashed #d9d9d9;
 }
+
 .avatar {
   border: 1px dashed #d9d9d9;
   padding: 5px;
@@ -288,4 +301,3 @@ export default {
   display: block;
 }
 </style>
-