lihongxiao 2 лет назад
Родитель
Сommit
12df844967

+ 2 - 2
config/dev.env.js

@@ -9,9 +9,9 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//

+ 8 - 0
src/http/moudules/task.js

@@ -907,3 +907,11 @@ export const withdraAaudit = (data) => {
     data
   })
 }
+// 机构结算管理-机构结算明细列表
+export const sysDeptAccountHistoryPage = (data) => {
+  return axios({
+    url: "/sysDeptAccountHistory/queryPage",
+    method: "post",
+    data
+  })
+}

+ 34 - 182
src/views/FinancialManagement/CarInsurance/DeptSettlement/CommissionList.vue

@@ -1,38 +1,5 @@
 <template>
   <div>
-    <div class="basicdata u-f u-f-ajc" v-if="peopleid != 'admin'">
-      <div
-        class="u-f-ajc u-f1 u-f-column"
-        :style="'background:' + basicItem.bgColor"
-        v-for="(basicItem, basicIndex) in basicdata"
-        :key="basicIndex"
-      >
-        <div style="font-size: 14px; color: #666; line-height: 1; color: #fff">
-          {{ basicItem.title }}
-        </div>
-        <div
-          style="
-            font-size: 22px;
-            font-weight: 700;
-            color: #333;
-            line-height: 1;
-            margin-top: 15px;
-            color: #fff;
-          "
-        >
-          ¥{{ basicItem.money }}
-        </div>
-      </div>
-      <div
-        class="u-f-ajc"
-        style="width: 150px; flex-shrink: 1; background: #e3e3e3"
-      >
-        <el-button type="primary" size="small" @click="openVisible"
-          >提现</el-button
-        >
-      </div>
-    </div>
-
     <el-form
       class="queryForm"
       ref="queryFormRef"
@@ -41,75 +8,19 @@
     >
       <el-row style="margin-bottom: 15px">
         <el-col :span="6">
-          <el-form-item label="订单号">
+          <el-form-item label="机构名称">
             <el-input
               size="small"
               clearable
               style="width:220px"
               placeholder="订单号"
-              v-model="queryForm.orderno"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="机构编码">
-            <el-input
-              size="small"
-              clearable
-              style="width:220px"
-              placeholder="机构编码"
-              v-model="queryForm.comcode"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="机构级别">
-            <el-select
-              size="small"
-              v-model="queryForm.comlevel"
-              placeholder="请选择"
-            >
-              <el-option label="一级" value="一级"></el-option>
-              <el-option label="二级" value="二级"></el-option>
-              <el-option label="三级" value="三级"></el-option>
-              <el-option label="四级" value="四级"></el-option>
-              <el-option label="五级" value="五级"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="保单号">
-            <el-input
-              size="small"
-              clearable
-              style="width:220px"
-              placeholder="保单号"
-              v-model="queryForm.policyno"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="车牌号">
-            <el-input
-              size="small"
-              clearable
-              style="width:220px"
-              placeholder="车牌号"
-              v-model="queryForm.licenseno"
+              v-model="queryForm. deptName"
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6" style="height: 40px;">
-              <el-form-item label="结算状态">
-                <el-select v-model="queryForm.settlestatus" placeholder="请选择" clearable size="small">
-                    <el-option label="未结算" value="0"></el-option>
-                    <el-option label="已结算" value="1"></el-option>
-                  </el-select>
-              </el-form-item>
-            </el-col>
           <el-col :span="6">
             <el-form-item label="签单时间">
-              <el-date-picker style="width: 220px;"
+              <el-date-picker 
                 size="small"
                 v-model="queryForm.signDate"
                 type="daterange"
@@ -144,7 +55,7 @@
     >
     </kt-common-table>
 
-    <el-dialog
+    <!-- <el-dialog
       v-dialogDrag
       title="提现"
       :visible.sync="dialogVisible"
@@ -179,7 +90,7 @@
           >确 定</el-button
         >
       </span>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 <script>
@@ -198,89 +109,35 @@ export default {
       peopledeptid: "",
 
       dialogVisible: false, //提现对话框
-
-      basicdata: [
-        {
-          title: "可提现余额",
-          money: "0.00",
-          bgColor: "#FFC958",
-          color: "#fff",
-        },
-        { title: "提现中", money: "0.00", bgColor: "#9DC9F2", color: "#fff" },
-        { title: "累计提现", money: "0.00", bgColor: "#C464E0", color: "#fff" },
-        { title: "已到账", money: "0.00", bgColor: "#64AF1C", color: "#fff" },
-      ],
-
       queryForm: {},
       pageResult: {},
       pageRequest: {
         //查询的默认条件
         pageNum: 1,
         pageSize: 10,
-        columnFilters: {
-          orderno: {
-            name: "orderno",
-            value: "",
-          },
-          policyno: {
-            name: "policyno",
-            value: "",
-          },
-
-          comcode: {
-            name: "comcode",
-            value: "",
-          },
-          comlevel: {
-            name: "comlevel",
-            value: "",
-          },
-          licenseno: {
-            name: "licenseno",
-            value: "",
-          },
-          startdate: {
-            name: "startdate",
-            value: "",
-          },
-          settlestatus: {
-            name: "settlestatus",
-            value: "",
-          },
-          enddate: {
-            name: "enddate",
-            value: "",
-          },
-        },
       },
       columns: [
         //数据列
-        { prop: "orderno", label: "订单号", minWidth: 160 },
-        { prop: "policyno", label: "保单号", minWidth: 160 },
-        { prop: "licenseno", label: "车牌号", minWidth: 90 },
-        { prop: "settlestatus", label: "结算状态"},
-        { prop: "signDate", label: "签单时间"},
-        { prop: "riskcode", label: "险种", minWidth: 90 },
-        { prop: "inscompany", label: "保险公司", minWidth: 90 },
-        { prop: "agreeid", label: "协议号", minWidth: 160 },
-        { prop: "comlevel", label: "机构级别", minWidth: 100 },
-        { prop: "comcode", label: "机构编码", minWidth: 120 },
-        { prop: "keeprate", label: "佣金费用", minWidth: 100 },
-        { prop: "keepamount", label: "佣金金额", minWidth: 100 },
-        { prop: "addrate", label: "追加比例", minWidth: 100 },
-        { prop: "addamount", label: "追加金额", minWidth: 100 },
+        { prop: "deptId", label: "机构代码" },
+        { prop: "deptName", label: "机构名称" },
+        { prop: "amount", label: "金额"},
+        { prop: "surplusAmount", label: "账户剩余金额"},
+        { prop: "documentary", label: "类型"},
+        { prop: "suborder", label: "来源订单" },
+        { prop: "remark", label: "备注", },
+        { prop: "createTime", label: "创建时间",  },
       ],
     };
   },
   created() {
-    this.peopleid = Cookies.get("user");
-    if (this.peopleid != "admin") {
-      this.peopledeptid = Cookies.get("user").split("D")[0];
-      this.pageRequest.columnFilters.deptid.value = this.peopledeptid;
-    } else {
-      this.peopledeptid = "";
-      this.pageRequest.columnFilters.deptid.value = this.peopledeptid;
-    }
+    // this.peopleid = Cookies.get("user");
+    // if (this.peopleid != "admin") {
+    //   this.peopledeptid = Cookies.get("user").split("D")[0];
+    //   this.pageRequest.columnFilters.deptid.value = this.peopledeptid;
+    // } else {
+    //   this.peopledeptid = "";
+    //   this.pageRequest.columnFilters.deptid.value = this.peopledeptid;
+    // }
     this.deptAccount();
   },
   mounted() {},
@@ -302,22 +159,22 @@ export default {
       });
     },
     getOrderList() {
-      this.pageRequest.columnFilters.orderno.value = this.queryForm.orderno;
-      this.pageRequest.columnFilters.comlevel.value = this.queryForm.comlevel;
-      this.pageRequest.columnFilters.comcode.value = this.queryForm.comcode;
-      this.pageRequest.columnFilters.licenseno.value = this.queryForm.licenseno;
-      this.pageRequest.columnFilters.policyno.value = this.queryForm.policyno;
-      this.pageRequest.columnFilters.settlestatus.value = this.queryForm.settlestatus;
+      // this.pageRequest.columnFilters.orderno.value = this.queryForm.orderno;
+      // this.pageRequest.columnFilters.comlevel.value = this.queryForm.comlevel;
+      // this.pageRequest.columnFilters.comcode.value = this.queryForm.comcode;
+      // this.pageRequest.columnFilters.licenseno.value = this.queryForm.licenseno;
+      // this.pageRequest.columnFilters.policyno.value = this.queryForm.policyno;
+      // this.pageRequest.columnFilters.settlestatus.value = this.queryForm.settlestatus;
       this.pageRequest.pageNum = 1;
       this.findPage();
     },
     dateChange(e){
       if (e == null) {
-        this.pageRequest.columnFilters.startdate.value = ''
-        this.pageRequest.columnFilters.enddate.value = ''
+        this.pageRequest.createTimeStart = ''
+        this.pageRequest.createTimeEnd = ''
       } else {
-        this.pageRequest.columnFilters.startdate.value=e[0];
-        this.pageRequest.columnFilters.enddate.value=e[1];
+        this.pageRequest.createTimeStart=e[0];
+        this.pageRequest.createTimeEnd=e[1];
       }
     },
     //确认是否关闭对话框
@@ -328,10 +185,6 @@ export default {
         })
         .catch((_) => {});
     },
-    openVisible() {
-      this.deptAccount();
-      this.dialogVisible = true;
-    },
     closeVisible() {
       this.withdrawal = "";
     },
@@ -369,11 +222,10 @@ export default {
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
       that.$api.task
-        .queryDeptFee(that.pageRequest)
+        .sysDeptAccountHistoryPage(that.pageRequest)
         .then((res) => {
-          res.data.content.forEach(row=>{
-            row.settlestatus=row.settlestatus==='1'?'已结算':'未结算'
-          })
+          res.data.content=res.data.records
+          res.data.content.forEach(val=>val.documentary=val.documentary=='1'?'提现':'收入')
           that.pageResult = res.data;
         })
         .then(data != null ? data.callback : "");

+ 20 - 15
src/views/FinancialManagement/CarInsurance/DeptSettlement/SettledCommissionList.vue

@@ -6,8 +6,10 @@
         <el-row style="margin-bottom: 15px;">
           <el-col :span="8">
             <el-form-item label="录入时间">
-              <el-date-picker style="margin-left: 20px;width:90%" size="small" v-model="queryForm.date" type="daterange"
-                align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+              <el-date-picker  size="small" v-model="queryForm.date" type="daterange"
+                align="left"  @change="dateChange"
+                range-separator="至"
+                value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -50,16 +52,11 @@
           status:'2'
         },
         columns: [ //数据列
-          {prop: "applyno",label: "提现单号",minWidth: 160},
-          {prop: "deptid",label: "机构代码",minWidth: 100},
-          {prop: "deptname",label: "机构名称",minWidth: 100},
-          {prop: "accountbalance",label: "可提现账户余额",minWidth: 100},
-          {prop: "applyamount",label: "提现金额",minWidth: 100},
-          {prop: "balance",label: "账户余额",minWidth: 100},
-          {prop: "disrate",label: "服务费",minWidth: 100},
-          {prop: "bankname",label: "开户行",minWidth: 100},
-          {prop: "accountno",label: "账号",minWidth: 100},
-          {prop: "createtime",label: "申请时间",minWidth: 130}
+          {prop: "id",label: "提现单号",},
+          {prop: "deptId",label: "机构代码",},
+          {prop: "name",label: "机构名称"},
+          {prop: "amount",label: "提现金额"},
+          {prop: "createTime",label: "申请时间"}
         ],
         //------------协议下拉框数据   begin-----------------
         agreementtypeoptions: [], //协议类型
@@ -145,14 +142,22 @@
           this.pageRequest.pageNum = data.pageRequest.pageNum;
           this.pageRequest.pageSize = data.pageRequest.pageSize;
         }
-        that.$api.task.payApplyFindPage(that.pageRequest)
+        that.$api.task.WithdrawqueryStatus(that.pageRequest)
           .then(res => {
-            console.log(res.data)
+            res.data.content= res.data.records
             that.pageResult = res.data;
           })
           .then(data != null ? data.callback : "");
       },
-
+      dateChange(e){
+      if (e == null) {
+        this.pageRequest.createTimeStart = ''
+        this.pageRequest.createTimeEnd = ''
+      } else {
+        this.pageRequest.createTimeStart=e[0];
+        this.pageRequest.createTimeEnd=e[1];
+      }
+    },
       // 格式化日期,如月、日、时、分、秒保证为2位数
       formatNumber(n) {
        n = n.toString()

+ 11 - 2
src/views/FinancialManagement/CarInsurance/DeptSettlement/UnsettledCommissionList.vue

@@ -6,7 +6,7 @@
         <el-row style="margin-bottom: 15px;">
           <el-col :span="8">
             <el-form-item label="录入时间">
-              <el-date-picker style="margin-left: 20px;width:90%" size="small" v-model="queryForm.date" type="daterange"
+              <el-date-picker  size="small" v-model="queryForm.date" type="daterange"  @change="dateChange"  value-format="yyyy-MM-dd"
                 align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
@@ -85,6 +85,15 @@
 
     },
     methods: {
+      dateChange(e){
+      if (e == null) {
+        this.pageRequest.createTimeStart = ''
+        this.pageRequest.createTimeEnd = ''
+      } else {
+        this.pageRequest.createTimeStart=e[0];
+        this.pageRequest.createTimeEnd=e[1];
+      }
+    },
 		handlePrint(){
 			this.$api.task.excelExport(this.pageRequest).then(res=>{
 				console.log(res)
@@ -150,7 +159,7 @@
         }
         that.$api.task.WithdrawqueryStatus(that.pageRequest)
           .then(res => {
-            console.log(res.data)
+            res.data.content= res.data.records
             that.pageResult = res.data;
           })
           .then(data != null ? data.callback : "");

+ 11 - 3
src/views/FinancialManagement/CarInsurance/DeptSettlement/UnsettledCommissionListExamine.vue

@@ -6,7 +6,7 @@
         <el-row style="margin-bottom: 15px;">
           <el-col :span="8">
             <el-form-item label="录入时间">
-              <el-date-picker style="margin-left: 20px;width:90%" size="small" v-model="queryForm.date" type="daterange"
+              <el-date-picker  size="small" v-model="queryForm.date"  value-format="yyyy-MM-dd" type="daterange"  @change="dateChange"
                 align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
@@ -146,13 +146,21 @@
         }
         that.$api.task.WithdrawqueryStatus(that.pageRequest)
           .then(res => {
-            console.log(res.data)
+            res.data.content= res.data.records
             that.pageResult = res.data;
           })
           .then(data != null ? data.callback : "");
       },
+      dateChange(e){
+      if (e == null) {
+        this.pageRequest.createTimeStart = ''
+        this.pageRequest.createTimeEnd = ''
+      } else {
+        this.pageRequest.createTimeStart=e[0];
+        this.pageRequest.createTimeEnd=e[1];
+      }
+    },
       handleButton3({row,index}) {
-        console.log(row,222222222);
         this.$prompt('是否审核通过,输入驳回原因', '提示', {
           confirmButtonText: '审核驳回',
           cancelButtonText: '审核通过',

+ 3 - 0
src/views/Sys/Post/Index.vue

@@ -169,16 +169,19 @@ export default {
         {
             type:'text',
             label:'查看',
+            perm:'sys:post:view',
             click:(row, index) => {return this.detailFun(row)},
           },
           {
             type:'text',
             label:'修改',
+            perm:'sys:post:upload',
             click:(row, index) => {return this.modifyFun(row)},
           },
           {
             type:'text',
             label:'删除',
+            perm:'sys:post:delete',
             click:(row, index) => {return this.deleteFun(row)},
           },
         ]