Parcourir la source

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

lihongxiao il y a 2 ans
Parent
commit
367d3ccec4

+ 2 - 2
src/components/Form/retrievalForm.vue

@@ -1,8 +1,8 @@
 <template>
   <el-form ref="form" :model="formData" :inline="true" :label-width="labelWidth" size="small">
     <el-row>
-      <el-col :span="6" v-for="field in formFields" :key="field.label">
-        <el-form-item :label="field.label" v-show="field.Retained !== false">
+      <el-col :span="6" v-for="field in formFields" :key="field.label" v-show="field.Retained !== false">
+        <el-form-item :label="field.label" >
           <template v-if="field.type === 'input'">
             <el-input v-model="formData[field.name]" :placeholder="'请输入' + field.label"></el-input>
           </template>

+ 10 - 0
src/http/moudules/insCompany.js

@@ -648,3 +648,13 @@ export const getDeptIdsByCompanyId = (insCompanyId) => {
     method: "get",
   })
 }
+
+
+//批量修改是否启用
+export const agreementSelection = (data) => {
+  return axios({
+    url: '/plt/agreement/batch',
+    method: "post",
+    data
+  })
+}

+ 4 - 4
src/http/moudules/letter.js

@@ -726,7 +726,7 @@ export const orderStatushuatai = (data) => {
   })
 }
 
-//华泰见费出单结果查询
+//华泰缴费状态查询
 export const updateOrderInfoHuatai = (data) => {
   return axios({
     url: "/order/huaTaiApi/paymentEnquiry",
@@ -951,11 +951,11 @@ export const sysUsergetInsOrders = (data) => {
   })
 }
 //银行卡查询
-export const getUserBankList = () => {
+export const getUserBankList = (data) => {
   return axios({
     url: "/userBank/getUserBankList",
-    method: "get",
-
+    method: "post",
+    data
   })
 }
 //删除银行卡

+ 49 - 4
src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -79,17 +79,19 @@
           <el-col :span="6">
             <el-form-item>
               <kt-button label="查询" :size="overSize" type="primary" perms="agreement:input:query" @click="queryEsmInfo" />
+              <el-button :disabled="agreementSelectionList.length==0"  label="批量修改" :size="overSize" type="danger"  @click="agreementSelectionVisible=true">批量修改</el-button>
               <kt-button label="添加协议" :size="overSize" type="success" perms="agreement:input:add" @click="handleAdd" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-table :size="overSize" :data="pageResult" height="600" border v-loading="loading" highlight-current-row stripe
+      <el-table :size="overSize" :data="pageResult" height="600" border v-loading="loading" @selection-change="agreementSelectionChange" highlight-current-row stripe
         :header-cell-style="{
           background: '#F2F7FC',
           fontWeight: '700',
           color: '#606266',
         }">
+          <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="id" label="编号" width="50" align="center"></el-table-column>
         <el-table-column prop="agreementCode" label="协议代码" align="center" width="180"></el-table-column>
         <el-table-column prop="agreementName" label="协议名称" align="center"></el-table-column>
@@ -207,7 +209,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="合作公司" prop="partnerCompaniesId">
-                  <el-cascader :disabled="operType == 'EDIT'" style="width: 100%" v-model="agreement.partnerCompaniesId"
+                  <el-cascader  style="width: 100%" v-model="agreement.partnerCompaniesId"
                     :show-all-levels="false" :options="ztreeNodes" :props="optionProps" @change="handleChange" clearable
                     filterable></el-cascader>
                 </el-form-item>
@@ -303,7 +305,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-             
+
               <el-col :span="12">
                 <el-form-item label="险种组合类">
                   <el-select v-model="productFilterList" multiple placeholder="选择险种" style="width: 100%"
@@ -964,7 +966,7 @@
               </el-col>
             </el-row>
             <el-row>
-             
+
               <el-col :span="12">
                 <el-form-item label="对接人" prop="dockingPerson">
                   <el-input v-model="agreementsHistoryInfo.agreement.dockingPerson" placeholder="请添加对接人"
@@ -1251,6 +1253,19 @@
         <el-button size="small" type="primary" @click="batchCostsubmit">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="批量修改" :visible.sync="agreementSelectionVisible" width="30%">
+      <div>
+        <span>选择协议状态</span>
+        <el-select :size="overSize" v-model="agreementvalidStatus" placeholder="请选择" clearable>
+                <el-option label="禁用" :value="0"></el-option>
+                <el-option label="启用" :value="1"></el-option>
+              </el-select>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="agreementSelectionVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="agreementSelectionSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -2211,6 +2226,9 @@ export default {
       // 轨迹
       ddgjdialogVisible: false,
       trajectoryTable: [],
+      agreementSelectionList:[],//批量修改id集合
+      agreementvalidStatus:"",
+      agreementSelectionVisible:false,
     };
   },
   computed: {
@@ -2313,6 +2331,33 @@ export default {
     this.findLeftTreeData();
   },
   methods: {
+    agreementSelectionSubmit() {
+      this.$api.insCompany.agreementSelection({
+        agreementIds: this.agreementSelectionList,
+        validStatus: this.agreementvalidStatus,
+      }).then((res) => {
+        if (res.code == '200') {
+          this.agreementSelectionVisible=false;
+          this.findPage();
+          this.$message({
+            type: 'success',
+            message: res.msg,
+          });
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    },
+    agreementSelectionChange(val){
+      let list=[];
+      val.forEach(element => {
+        list.push(element.id)
+      });
+      this.agreementSelectionList=list;
+    },
     handleNodeClick(data, self, child) {
       this.labelData = data.name;//展示部分
       this.agreement.deptId= data.id

+ 22 - 5
src/views/Core/PersonalPanel.vue

@@ -37,17 +37,20 @@
           钱包
         </li>
     </div>
-    <div class="textItem logout"> 
+    <div class="textItem logout">
       <li>
-        <p>10.00</p>
+        <p v-if="MoneyData.handlingFee">{{ MoneyData.handlingFee.toFixed(2) }}</p>
+        <p v-else>0.00</p>
         <p>手续金额(元)</p>
       </li>
       <li>
-        <p>240.00</p>
+        <p v-if="MoneyData.documentary">{{ MoneyData.documentary.toFixed(2) }}</p>
+        <p v-else>0.00</p>
         <p>跟单金额(元)</p>
       </li>
       <li>
-        <p>10.00</p>
+        <p v-if="MoneyData.promotion">{{ MoneyData.promotion.toFixed(2) }}</p>
+        <p v-else>0.00</p>
         <p>推广金额(元)</p>
       </li>
       <!-- <el-button @click="logout" size="small" type="primary" plain>退出登录</el-button> -->
@@ -161,6 +164,7 @@ export default {
           type:'input',
           disabled:true
         },],
+        MoneyData:{},
 
     }
   },
@@ -171,11 +175,24 @@ export default {
       //     this.user.deptName = deptRes.data.name;
       //   });
       // }
+      this.allamount();
   },
   mounted() {
     this.user.createTime = this.user.createTime.substr(0,10)
   },
   methods: {
+    allamount() {
+      this.$api.letter.getSysAllAmount().then((res) => {
+        if (res.code == '200') {
+          this.MoneyData = res.data;
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    },
     // 个人中心
     personalInformation(){
       this.backupVisible=true
@@ -285,7 +302,7 @@ export default {
   overflow: hidden;
   border-bottom: 1px solid #F1F3F6;
   li{
-   
+
     width: 90px;
     height: 70px;
     text-align: center;

+ 111 - 144
src/views/FinancialManagement/AcountWithdrawal/AcountBalance.vue

@@ -1,106 +1,67 @@
 <template>
   <div>
-    <Split :gutterSize="2" style="height: calc(100vh - 120px)">
-      <!-- 左侧树Start -->
-      <SplitArea :size="leftSplitWidth" :minSize="240">
-        <div>
-          <el-divider></el-divider>
-          <tree
-            :setting="ztreeSetting"
-            :nodes="ztreeNodes"
-            @onClick="onZTreeClick"
-            @onCreated="onZTreeCreated"
-          />
-        </div>
-      </SplitArea>
-      <!-- 左侧树End -->
-      <!-- 右侧列表页面Start -->
-      <SplitArea :size="rightSplitWidth">
-        <div class="queryFrom" title="检索区">
-          <el-form ref="queryFormRef" :model="pageRequest" label-width="80px">
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="工号">
-                  <el-input
-                    clearable
-                    size="small"
-                    placeholder="工号"
-                    v-model="pageRequest.userId"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="机构名称">
-                  <el-cascader
-                    class="widths"
-                    size="small"
-                    :options="institutionOptions"
-                    v-model="pageRequest.deptId"
-                    :props="{
-                      checkStrictly: true,
-                      value: 'id',
-                      label: 'name',
-                    }"
-                    @change="handleChange"
-                    clearable
-                  ></el-cascader>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item label-width="20px">
-                  <el-button @click="queryBalance" type="primary" size="small"
-                    >查询</el-button
-                  >
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-        <kt-common-table
-          :showBatchDelete="false"
-          :showSysUserAccountCardList = "true"
-          :showBatchPrint="false"
-          :showOperation="true"
-          :data="pageResult"
-          :columns="columns"
-          @findPage="queryBalance"
-          :isshowpagination="true"
-          button2Name="提现"
-          button2Background="#409eff"
-          permsButton1="expenseManagement:expenseRequest:details"
-          @handleButton2="withdraw"
-        >
-        </kt-common-table>
-      </SplitArea>
+    <!-- 右侧列表页面Start -->
+    <SplitArea :size="rightSplitWidth">
+      <div class="queryFrom" title="检索区">
+        <el-form ref="queryFormRef" :model="pageRequest" label-width="80px">
+          <el-row>
+            <el-col :span="5">
+              <el-form-item label="工号">
+                <el-input clearable size="small" placeholder="工号" v-model="pageRequest.userId"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="姓名">
+                <el-input clearable size="small" placeholder="姓名" v-model="pageRequest.userName"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="机构名称">
+                <el-cascader class="widths" size="small" :options="institutionOptions" v-model="pageRequest.deptId"
+                  :props="{
+                    checkStrictly: true,
+                    value: 'id',
+                    label: 'name',
+                  }" @change="handleChange" clearable></el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label-width="20px">
+                <el-button @click="queryBalance" type="primary" size="small">查询</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <kt-common-table :showBatchDelete="false" :showSysUserAccountCardList="true" :showBatchPrint="false"
+        :showOperation="true" :data="pageResult" :columns="columns" @findPage="queryBalance" :isshowpagination="true"
+        button2Name="提现" button2Background="#409eff" @handleButton2="withdrawButton">
+      </kt-common-table>
+    </SplitArea>
     </Split>
     <div class="popupBox">
-      <el-dialog
-        :visible.sync="dialogVisible"
-        title="提现"
-        @close="dialogVisible = false"
-      >
-        <el-select v-model="selectedValue" placeholder="请选择提现费用">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-input
-          v-model="amount"
-          placeholder="请输入提现金额"
-          style="margin-top: 20px"
-        ></el-input>
-        <el-input
-          v-model="fromBankCardId"
-          placeholder="请输入提现银行卡号"
-          style="margin-top: 20px"
-        ></el-input>
+      <el-dialog :visible.sync="dialogVisible" title="提现" @close="dialogVisible = false" width="40%">
+        <el-form ref="form" :model="withdrawForm" label-width="100px">
+          <el-form-item label="提现费用" >
+            <el-select v-model="withdrawForm.amountStatus" placeholder="请选择提现费用" style="width: 300px;">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="提现金额">
+            <el-input v-model="withdrawForm.amount" placeholder="请输入提现金额" style="width: 300px;"></el-input>
+          </el-form-item>
+          <el-form-item label="银行卡">
+            <el-select clearable filterable   v-model="withdrawForm.fromBankCardId" placeholder="请选择银行卡" style="width: 300px;">
+              <el-option v-for="(item, index) in sysUserAccountCardList" :key="index"
+                :label="item.bankNumber + '-' + item.bankAccount" :value="item.bankNumber">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="handleConfirm">确 定</el-button>
+          <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+          <el-button size="small" type="primary" @click="handleConfirm">确 定</el-button>
         </span>
       </el-dialog>
     </div>
@@ -118,12 +79,14 @@ export default {
   },
   data() {
     return {
+      withdrawForm: {
+        userId: "",
+        amountStatus: "",
+        amount: "",
+        fromBankCardId: "",
+      },
       //提现弹窗相关
       dialogVisible: false, //弹窗是否出现
-      selectedValue: "", //提现类型
-      amount: "", //体现金额
-      userId: "", //提现id
-      fromBankCardId: "", //提现银行卡号
       options: [
         { value: "1", label: "手续费佣金" },
         { value: "2", label: "非跟单佣金" },
@@ -178,6 +141,9 @@ export default {
         { prop: "documentary", label: "非跟单费", minWidth: 100 },
         { prop: "promotion", label: "分销费 (推广费)", minWidth: 100 },
         { prop: "zgCoin", label: "掌柜币", minWidth: 100 },
+        { prop: "zgCoinAmountWithdrawal", label: "掌柜币提现总金额", minWidth: 100 },
+        { prop: "zgCoinAmountAccount", label: "掌柜币已到账金额", minWidth: 100 },
+        { prop: "zgCoinAmountPayment", label: "掌柜币支付中金额", minWidth: 100 },
         {
           prop: "handlingAmountWithdrawal",
           label: "手续费提现总金额",
@@ -224,7 +190,7 @@ export default {
           minWidth: 120,
         },
       ],
-      secondarycolumn:[
+      secondarycolumn: [
         {
           prop: "bankAccount", label: "银行", minWidth: 160
         },
@@ -234,7 +200,8 @@ export default {
         {
           prop: "bankNumber", label: "银行卡号", minWidth: 160
         }
-      ]
+      ],
+      sysUserAccountCardList: [],
     };
   },
   created() {
@@ -256,23 +223,18 @@ export default {
     //体现操作
     handleConfirm() {
       this.dialogVisible = false;
-      let data = {};
-      data.userId = this.userId;
-      data.amountStatus = this.selectedValue;
-      data.amount = this.amount;
-      data.fromBankCardId = this.fromBankCardId;
-      this.$api.dept.withdraw(data).then((res) => {
+      this.$api.dept.withdraw(this.withdrawForm).then((res) => {
         if (res.code == 200) {
+          this.queryBalance();
           this.$message({
-            showClose: true,
+            message:'success',
             message: "提现成功",
           });
-        }else{
+        } else {
           this.$message({
-          showClose: true,
-          message: res.msg,
-          type: 'error'
-        });
+            message: res.msg,
+            type: 'error'
+          });
         }
         (this.userId = ""),
           (this.selectedValue = ""),
@@ -281,9 +243,10 @@ export default {
       });
     },
     //提现条件
-    withdraw(index) {
-      let row = index.row;
-      this.userId = row.userId;
+    withdrawButton({ index, row }) {
+      this.sysUserAccountCardList = [];
+      this.withdrawForm.userId = row.userId;
+      this.sysUserAccountCardList = row.sysUserAccountCardList;
       this.dialogVisible = !this.dialogVisible;
     },
     //联级选择器触发事件
@@ -317,32 +280,32 @@ export default {
         });
     },
     /**Split 开始 */
-    changeTreeWidth(widthVal){
-        // 初始化树的宽度
-        // this.leftSplitWidth = Math.ceil(widthVal/this.$refs.elMain.$el.clientWidth*100);
-        // this.rightSplitWidth = 100-(this.leftSplitWidth)
-      },
-      /**Split 结束 */
+    changeTreeWidth(widthVal) {
+      // 初始化树的宽度
+      // this.leftSplitWidth = Math.ceil(widthVal/this.$refs.elMain.$el.clientWidth*100);
+      // this.rightSplitWidth = 100-(this.leftSplitWidth)
+    },
+    /**Split 结束 */
 
-      //--left tree start-------
-      findLeftTreeData: function() {
-        // 获取数据
-        this.$api.dept.findTree().then(res => {
-          this.ztreeNodes = res.data;
-        });
-      },
-      onZTreeCreated: function(ztreeObj) {
-        this.ztreeObj = ztreeObj;
-        // onCreated 中操作ztreeObj对象展开第一个节点
-        ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
-        this.currentTreeNode=ztreeObj.getNodes()[0];
-      },
-      onZTreeClick: function(evt, treeId, treeNode) {
-        // 点击事件
-        this.currentTreeNode = treeNode;
-        this.pageRequest.deptId = this.currentTreeNode.id;
-        this.queryBalance();
-      },
+    //--left tree start-------
+    findLeftTreeData: function () {
+      // 获取数据
+      this.$api.dept.findTree().then(res => {
+        this.ztreeNodes = res.data;
+      });
+    },
+    onZTreeCreated: function (ztreeObj) {
+      this.ztreeObj = ztreeObj;
+      // onCreated 中操作ztreeObj对象展开第一个节点
+      ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
+      this.currentTreeNode = ztreeObj.getNodes()[0];
+    },
+    onZTreeClick: function (evt, treeId, treeNode) {
+      // 点击事件
+      this.currentTreeNode = treeNode;
+      this.pageRequest.deptId = this.currentTreeNode.id;
+      this.queryBalance();
+    },
     //--left tree end-------
   },
 };
@@ -358,6 +321,7 @@ export default {
   margin: 15px;
   padding: 20px;
 }
+
 .queryFrom:before {
   content: attr(title);
   position: absolute;
@@ -370,12 +334,15 @@ export default {
 .queryFrom .el-row {
   margin: 10px 0px;
 }
+
 .queryFrom .el-form-item {
   margin-bottom: 0px;
 }
+
 .queryFrom .queryButton .el-form-item__content {
   margin-left: 0px !important;
 }
+
 /* 顶部查询条件样式End */
 .el-cascader {
   width: 100%;

+ 131 - 178
src/views/FinancialManagement/AcountWithdrawal/ExtendFee.vue

@@ -2,98 +2,62 @@
   <div>
     <el-main ref="elMain" style="padding: 0px">
       <Split :gutterSize="2" style="height: calc(100vh - 120px)">
-           <!-- 左侧树Start -->
-           <SplitArea :size="leftSplitWidth" :minSize="240">
+        <!-- 左侧树Start -->
+        <SplitArea :size="leftSplitWidth" :minSize="240">
           <div>
             <el-divider></el-divider>
-            <tree :setting="ztreeSetting" :nodes="ztreeNodes" @onClick="onZTreeClick" @onCreated="onZTreeCreated"/>
+            <tree :setting="ztreeSetting" :nodes="ztreeNodes" @onClick="onZTreeClick" @onCreated="onZTreeCreated" />
           </div>
         </SplitArea>
         <!-- 左侧树End -->
-    <!-- 搜索区域Start -->
-     <!-- 右侧列表页面Start -->
-     <SplitArea :size="rightSplitWidth">
-    <el-form
-      class="queryForm"
-      ref="queryFormRef"
-      :inline="true"
-      size="small"
-      :model="queryForm"
-      label-width="80px"
-    >
-      <el-row>
-        <el-col :span="7">
-          <el-form-item label="订单号">
-            <el-input
-              style="width: 220px"
-              clearable
-              placeholder="订单号"
-              v-model="queryForm.orderNo"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item label="工号">
-            <el-input
-              style="width: 220px"
-              clearable
-              placeholder="工号"
-              v-model="queryForm.userId"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item label="交强保单号">
-            <el-input
-              style="width: 220px"
-              clearable
-              placeholder="交强保单号"
-              v-model="queryForm.jqPolicyNo"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item label="商业保单号">
-            <el-input
-              style="width: 220px"
-              clearable
-              placeholder="商业保单号"
-              v-model="queryForm.syPolicyNo"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+        <!-- 搜索区域Start -->
+        <!-- 右侧列表页面Start -->
+        <SplitArea :size="rightSplitWidth">
+          <el-form class="queryForm" ref="queryFormRef" :inline="true" size="small" :model="queryForm" label-width="80px">
+            <el-row>
+              <el-col :span="7">
+                <el-form-item label="订单号">
+                  <el-input style="width: 220px" clearable placeholder="订单号" v-model="queryForm.orderNo"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="工号">
+                  <el-input style="width: 220px" clearable placeholder="工号" v-model="queryForm.userId"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="交强保单号">
+                  <el-input style="width: 220px" clearable placeholder="交强保单号" v-model="queryForm.jqPolicyNo"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="商业保单号">
+                  <el-input style="width: 220px" clearable placeholder="商业保单号" v-model="queryForm.syPolicyNo"></el-input>
+                </el-form-item>
+              </el-col>
 
-        <el-col :span="7">
-          <el-form-item label="姓名">
-            <el-input
-              style="width: 220px"
-              clearable
-              placeholder="姓名"
-              v-model="queryForm.userName"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item label="车牌号">
-            <el-input
-              style="width: 220px"
-              clearable
-              placeholder="车牌号"
-              v-model="queryForm.licenseNo"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item label="保险公司">
-            <el-input
-              style="width: 220px"
-              clearable
-              placeholder="请输入保险公司"
-              v-model="queryForm.insCompany"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <!-- <el-col :span="8" style="height: 40px">
+              <el-col :span="7">
+                <el-form-item label="姓名">
+                  <el-input style="width: 220px" clearable placeholder="姓名" v-model="queryForm.userName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="车牌号">
+                  <el-input style="width: 220px" clearable placeholder="车牌号" v-model="queryForm.licenseNo"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="业务员">
+                  <el-input style="width: 220px" clearable placeholder="业务员" v-model="queryForm.operatorName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="保险公司">
+                  <el-input style="width: 220px" clearable placeholder="请输入保险公司"
+                    v-model="queryForm.insCompany"></el-input>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="8" style="height: 40px">
           <el-form-item label="结算状态">
             <el-select
               v-model="queryForm.settlestatus"
@@ -106,9 +70,9 @@
             </el-select>
           </el-form-item>
         </el-col> -->
-        <el-col :span="11">
-          <el-form-item label="签单时间">
-            <!-- <el-date-picker
+              <el-col :span="11">
+                <el-form-item label="签单时间">
+                  <!-- <el-date-picker
               style="width: 220px"
               size="small"
               v-model="queryForm.signDate"
@@ -120,39 +84,24 @@
               end-placeholder="结束日期"
             >
             </el-date-picker> -->
-            <el-date-picker
-              v-model="queryForm.signTimeStart"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item>
-            <el-button @click="queryEsmInfo" type="primary" size="small"
-              >查询</el-button
-            >
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <kt-common-table
-      permsDelete="sys:user:delete"
-      :showBatchDelete="false"
-      :showBatchPrint="true"
-      permsButton3="sys:user:edit"
-      :data="pageResult"
-      :columns="columns"
-      @findPage="findPage"
-      :showOperation="false"
-      @handlePrint="handlePrint"
-    >
-    </kt-common-table>
-     </SplitArea>
-    </Split>
+                  <el-date-picker v-model="queryForm.signTimeStart" type="datetimerange" range-separator="至"
+                    value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  <el-button @click="queryEsmInfo" type="primary" size="small">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <kt-common-table permsDelete="sys:user:delete" :showBatchDelete="false" :showBatchPrint="true"
+            permsButton3="sys:user:edit" :data="pageResult" :columns="columns" @findPage="findPage" :showOperation="false"
+            @handlePrint="handlePrint">
+          </kt-common-table>
+        </SplitArea>
+      </Split>
     </el-main>
   </div>
 </template>
@@ -187,7 +136,8 @@ export default {
         startdate: "",
         settlestatus: "",
         enddate: "",
-        signTimeStart :''
+        signTimeStart: '',
+        operatorName: ""
       },
       columns: [
         //数据列
@@ -195,6 +145,7 @@ export default {
         // { prop: "policyno", label: "保单号", minWidth: 100 },
         { prop: "jqPolicyNo", label: "交强保单号", minWidth: 100 },
         { prop: "syPolicyNo", label: "商业保单号", minWidth: 100 },
+        { prop: "operatorName", label: "业务员", minWidth: 100 },
         { prop: "licenseNo", label: "车牌号", minWidth: 100 },
         { prop: "product", label: "险种", minWidth: 100 },
         { prop: "deptName", label: "机构", minWidth: 100 },
@@ -210,30 +161,30 @@ export default {
       //------------协议下拉框数据   begin-----------------
       agreementtypeoptions: [], //协议类型
       //------------协议下拉框数据   end-----------------
-       /**Split 开始 */
-       leftSplitWidth: 15,
-        rightSplitWidth: 85,
-        /**Split 结束 */
+      /**Split 开始 */
+      leftSplitWidth: 15,
+      rightSplitWidth: 85,
+      /**Split 结束 */
 
-        //----ztreeLeft begin---------
-        ztreeObj: null,
-        ztreeSetting: {
-          check: {
-            enable: false
-          },
-          data: {
-            simpleData: {
-              enable: true,
-              pIdKey: "parentId"
-            }
-          },
-          view: {
-            showIcon: false
+      //----ztreeLeft begin---------
+      ztreeObj: null,
+      ztreeSetting: {
+        check: {
+          enable: false
+        },
+        data: {
+          simpleData: {
+            enable: true,
+            pIdKey: "parentId"
           }
         },
-        ztreeNodes: [],
-        currentTreeNode: null,
-        //----ztreeLeft end---------
+        view: {
+          showIcon: false
+        }
+      },
+      ztreeNodes: [],
+      currentTreeNode: null,
+      //----ztreeLeft end---------
     };
   },
   created() {
@@ -241,7 +192,7 @@ export default {
     this.getDictItems("agreementtype");
     this.findLeftTreeData();// 获取机构树的数据
   },
-  mounted() {},
+  mounted() { },
   methods: {
     handlePrint() {
       this.$api.task.excelExport(this.pageRequest).then((res) => {
@@ -296,7 +247,8 @@ export default {
       this.pageRequest.licenseNo = this.queryForm.licenseNo;
       this.pageRequest.insCompany = this.queryForm.insCompany;
       this.pageRequest.settlestatus = this.queryForm.settlestatus;
-      if(this.queryForm.signTimeStart){
+      this.pageRequest.operator = this.queryForm.operatorName;
+      if (this.queryForm.signTimeStart) {
         this.pageRequest.signTimeStart = this.queryForm.signTimeStart[0]
         this.pageRequest.signTimeEnd = this.queryForm.signTimeStart[1]
       }
@@ -310,9 +262,9 @@ export default {
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
-      } 
+      }
       // else  {
-      //   this.pageRequest.pageNum = 1; 
+      //   this.pageRequest.pageNum = 1;
       //   this.pageRequest.pageSize = 20;
       // }
 
@@ -333,43 +285,44 @@ export default {
         })
         .then(data != null ? data.callback : "");
     },
-     /**Split 开始 */
-     changeTreeWidth(widthVal){
-        // 初始化树的宽度
-        this.leftSplitWidth = Math.ceil(widthVal/this.$refs.elMain.$el.clientWidth*100);
-        this.rightSplitWidth = 100-(this.leftSplitWidth)
-      },
-      /**Split 结束 */
+    /**Split 开始 */
+    changeTreeWidth(widthVal) {
+      // 初始化树的宽度
+      this.leftSplitWidth = Math.ceil(widthVal / this.$refs.elMain.$el.clientWidth * 100);
+      this.rightSplitWidth = 100 - (this.leftSplitWidth)
+    },
+    /**Split 结束 */
 
-      //--left tree start-------
-      findLeftTreeData: function() {
-        // 获取数据
-        this.$api.dept.findTree().then(res => {
-          this.ztreeNodes = res.data;
-        });
-      },
-      onZTreeCreated: function(ztreeObj) {
-        this.ztreeObj = ztreeObj;
-        // onCreated 中操作ztreeObj对象展开第一个节点
-        ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
-        this.currentTreeNode=ztreeObj.getNodes()[0];
-      },
-      onZTreeClick: function(evt, treeId, treeNode) {
-        // 点击事件
-        this.currentTreeNode = treeNode;
-        this.pageRequest.deptId = this.currentTreeNode.id;
-        this.findPage();
-      },
-      //--left tree end-------
+    //--left tree start-------
+    findLeftTreeData: function () {
+      // 获取数据
+      this.$api.dept.findTree().then(res => {
+        this.ztreeNodes = res.data;
+      });
+    },
+    onZTreeCreated: function (ztreeObj) {
+      this.ztreeObj = ztreeObj;
+      // onCreated 中操作ztreeObj对象展开第一个节点
+      ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
+      this.currentTreeNode = ztreeObj.getNodes()[0];
+    },
+    onZTreeClick: function (evt, treeId, treeNode) {
+      // 点击事件
+      this.currentTreeNode = treeNode;
+      this.pageRequest.deptId = this.currentTreeNode.id;
+      this.findPage();
+    },
+    //--left tree end-------
   },
 };
 </script>
 <style scoped>
-/deep/ .el-form-item__label{
+/deep/ .el-form-item__label {
   width: 90px !important;
-  text-align:left;
+  text-align: left;
 }
-.el-form{
+
+.el-form {
   padding-left: 10px;
 }
 </style>

+ 67 - 20
src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyintasks.vue

@@ -6,16 +6,16 @@
       @expand-change="handleRowChange" ref="expandTable"
       :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }">
       <el-table-column prop="orderno" label="订单号" align="center"></el-table-column>
-      <el-table-column prop="username" label="业务员" align="center">
+      <el-table-column prop="username" label="业务员" align="center" width="220">
         <template slot-scope="scope">
           <span>{{ scope.row.username }}({{ scope.row.userid }})</span>
         </template>
       </el-table-column>
       <el-table-column prop="managementSource" label="机构来源" align="center">
         <template slot-scope="scope">
-          <el-tag v-if=" scope.row.managementSource=='渠道'" >渠道</el-tag>
-          <el-tag v-if=" scope.row.managementSource=='个代'" type="success">个代</el-tag>
-          <el-tag v-if=" scope.row.managementSource=='电销'" type="warning">电销</el-tag>
+          <el-tag v-if="scope.row.managementSource == '渠道'">渠道</el-tag>
+          <el-tag v-if="scope.row.managementSource == '个代'" type="success">个代</el-tag>
+          <el-tag v-if="scope.row.managementSource == '电销'" type="warning">电销</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="agreementName" label="协议名称" align="center"></el-table-column>
@@ -32,7 +32,7 @@
       <el-table-column prop="licenseno" label="车牌号" width="180" align="center"></el-table-column>
       <el-table-column prop="insuredname" label="投保人姓名" align="center" width="150"></el-table-column>
       <el-table-column prop="product" label="投保险种" align="center" width="200"></el-table-column>
-      <el-table-column prop="auditStatus" label="状态" align="center">
+      <el-table-column prop="auditStatus" label="状态" align="center" width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.auditStatus == '0'" type="success" size="small">未审核</el-tag>
           <el-tag v-if="scope.row.auditStatus == '1'" type="warning" size="small">审核通过</el-tag>
@@ -43,10 +43,11 @@
       <el-table-column prop="createtime" label="录单日期" align="center" width="200"></el-table-column>
       <el-table-column prop="signingTime" label="签单时间" align="center" width="200"></el-table-column>
       <el-table-column prop="payDate" label="支付时间" align="center" width="200"></el-table-column>
-      <el-table-column label="操作" align="center" min-width="100" fixed="right">
+      <el-table-column label="操作" align="center" min-width="150" fixed="right">
         <template slot-scope="scope">
           <kt-button label="查看详情" type="text" perms="carInsurance:expenseVerification:pendingReview:review"
             @click="OrderDetails(scope.row)" />
+          <kt-button label="轨迹" type="text" @click="trajectory(scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -58,8 +59,30 @@
     </div>
     <!-- 车辆报价新页面 -->
     <detailsDialog ref="detailsDialog" :orderInfo="orderInfo" :feeOrderNewVoList="feeOrderNewVoList"
-      @updatedCost="updatedCost" @adusitFUn="adusitFUn" auditStatus="1" >
+      @updatedCost="updatedCost" @adusitFUn="adusitFUn" auditStatus="1">
     </detailsDialog>
+    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+      <div slot="title" class="">
+        <span>订单轨迹</span>
+      </div>
+      <div style="height: 300px; overflow-y: auto">
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1" finish-status="success">
+          <el-step :title="auditstatusCap(item.auditstatus)" :key="item.id" v-for="item in trajectoryTable">
+            <template slot="description">
+              <template v-if="item.auditstatus == '0'">
+                <div>保险公司:{{ item.insCompany }}</div>
+                <div>创建用户:{{ item.operator }}</div>
+              </template>
+              <template v-else>
+                <span>审核人:{{ item.operator }}</span>
+                <span style="margin-left: 10px;">审核人工号:{{ item.audituser }}</span>
+                <div v-if="item.operatorTime">审核时间:{{ item.operatorTime }}</div>
+              </template>
+            </template>
+          </el-step>
+        </el-steps>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -77,6 +100,8 @@ export default {
   },
   data() {
     return {
+      ddgjdialogVisible: false,
+      trajectoryTable: [],
       feeOrderNewVoList: {},
       isAuditing: {},
       oldFeeInfo: [],//原始跟单费用比例
@@ -95,11 +120,11 @@ export default {
       pageRequest: {
         pageNum: 1,
         pageSize: 20,
-        auditStatus:1,
+        auditStatus: 1,
         userId: "",
       },
       retrievalFields: [
-      {
+        {
           name: 'provinceId',
           label: '省机构名称',
           type: 'select',
@@ -125,12 +150,12 @@ export default {
           options: []
         },
 
-        {
-          name: 'taskNo',
-          label: '任务池号',
-          type: 'input',
+        // {
+        //   name: 'taskNo',
+        //   label: '任务池号',
+        //   type: 'input',
 
-        },
+        // },
         {
           name: 'orderNo',
           label: '订单号',
@@ -230,7 +255,7 @@ export default {
           type: 'date',
           list: 'signList'
         },
-          {
+        {
           name: ["payStartDateStr", "payEndDateStr"],
           label: '支付时间',
           type: 'date',
@@ -310,6 +335,28 @@ export default {
     window.removeEventListener('resize', this.getDimensions);
   },
   methods: {
+    auditstatusCap(val) {
+      if (val == "0") {
+        return "未审核";
+      }
+      if (val == "1") {
+        return "审核通过";
+      }
+      if (val == "2") {
+        return "审核驳回";
+      }
+    },
+    trajectory(row) {
+      this.$api.task.getFeeAuditHistory(row.orderno).then((res) => {
+        if (res.code == 200 && res.data.length > 0) {
+          this.trajectoryTable = res.data
+          this.ddgjdialogVisible = true
+        }
+        else {
+          this.$message.error('暂无数据!')
+        }
+      });
+    },
     //获取机构数据
     areaqueryList(level, parentId, filed) {
       this.$api.task.queryListByParentId(level, parentId).then((res) => {
@@ -400,9 +447,9 @@ export default {
           })
           console.log(data)
           this.feeOrderNewVoList = {
-              deptManagerFee: data.deptManagerFee,
-              list: [...data.entranceFee,...data.exportFee],
-            }
+            deptManagerFee: data.deptManagerFee,
+            list: [...data.entranceFee, ...data.exportFee],
+          }
           this.$message({
             type: 'success',
             message: res.msg,
@@ -430,7 +477,7 @@ export default {
         if (res.code == 200) {
           this.$message({
             type: 'success',
-            message:"审核通过",
+            message: "审核通过",
           });
           this.findPage();
           // this.quotedetailsdialogVisible = false;
@@ -663,7 +710,7 @@ export default {
             })
             this.feeOrderNewVoList = {
               deptManagerFee: data.deptManagerFee,
-              list: [...data.entranceFee,...data.exportFee],
+              list: [...data.entranceFee, ...data.exportFee],
             }
           }
           res.data.carinfo.carnature = this.natureOfVehicleUseCap(res.data.carinfo.carnature)

+ 3 - 5
src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -68,13 +68,11 @@
         <span>订单轨迹</span>
       </div>
       <div style="height: 300px; overflow-y: auto">
-        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1" finish-status="success">
           <el-step :title=" auditstatusCap(item.auditstatus)" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
               <div>保险公司:{{ item.insCompany }}</div>
-              <span>创建用户:{{ item.operator }}</span>
-              <span style="margin-left: 10px;">审核人:{{ item.audituser }}</span>
-              <div>审核时间:{{ item.audittime }}</div>
+              <div>创建用户:{{ item.operator }}</div>
             </template>
           </el-step>
         </el-steps>
@@ -348,7 +346,7 @@ export default {
         if(res.code==200 && res.data.length>0){
           this.trajectoryTable=res.data
           this.ddgjdialogVisible=true
-        } 
+        }
         else{
           this.$message.error('暂无数据!')
         }

+ 49 - 25
src/views/Letter/Wallet/AmountManagement.vue

@@ -205,14 +205,15 @@
           <h3>提现金额</h3>
           <div style="border-bottom: 1px solid #999;" class="flex ">
             <span style="font-size: 45px;font-weight: bold;color: #333;">¥</span>
-            <input type="text" class="no-border" @input="suminput">
+            <el-input v-model="extract" class="no-border" @input="suminput"></el-input>
           </div>
           <div class="" style="padding:10px">
-            <span v-if="is_out" style="color: red;">输入金额超过可提现金额,账户余额{{ MoneyData.handlingFee }}元</span>
-            <span v-else-if="is_lowest" style="color: red;">最低{{ lowest }}元起提现,账户余额{{ MoneyData.handlingFee }}元</span>
+            <span v-if="is_out" style="color: red;">输入金额超过可提现金额,账户余额 {{ MoneyData[accountBalance] }} 元</span>
+            <span v-else-if="is_lowest" style="color: red;">最低{{ lowest }}元起提现,账户余额 {{ MoneyData[accountBalance] }}
+              元</span>
             <template v-else>
-              <span class="amountHint">当前可提现余额{{ MoneyData.handlingFee }}元</span>
-              <span class="allHint" @click="">全部提现</span>
+              <span class="amountHint">当前可提现余额{{ MoneyData[accountBalance] }}元</span>
+              <span class="allHint" @click="allwithdrawal">全部提现</span>
             </template>
 
           </div>
@@ -238,11 +239,12 @@ export default {
   // 数据存放区域
   data() {
     return {
+      accountBalance: "",
       is_out: false,
       is_lowest: false,
       is_post: false,
       lowest: 20,
-      extract: 0,
+      extract: null,
       bankCardInfo: {},
       withdrawalVisible: false,//提现弹窗
       detailsVisible: false,//详情弹窗
@@ -371,20 +373,30 @@ export default {
       ],
     }
   },
+  watch: {
+    "extract": {
+      handler(val) {
+        if (val) {
+          this.extract = val.toString().replace(/[^\d.]/g, '');
+        }
+      },
+    },
+  },
   // 生命周期函数
   created() {
     this.formQuery.amountStatus = this.$route.query.type;
     switch (this.formQuery.amountStatus) {
       case 1:
-        this.pageTitle = "手续金额"
+        this.pageTitle = "手续金额";
+        this.accountBalance = 'handlingFee';
         break;
       case 2:
         this.pageTitle = "跟单金额"
-
+        this.accountBalance = 'documentary';
         break;
       case 3:
         this.pageTitle = "推广金额"
-
+        this.accountBalance = 'promotion';
         break;
     }
     this.amountType = this.$route.query.type;
@@ -395,6 +407,10 @@ export default {
   },
   // 方法函数
   methods: {
+    allwithdrawal() {
+      this.extract =parseFloat(this.MoneyData[this.accountBalance]);
+      this.checkMoney();
+    },
     withdrawalRequest() {
       let params = {
         amount: this.extract,
@@ -409,7 +425,7 @@ export default {
           });
           this.allamount();
           this.FindPage();
-          this.withdrawalVisible=false;
+          this.withdrawalVisible = false;
         } else {
           this.$message({
             type: 'error',
@@ -419,9 +435,9 @@ export default {
       });
     },
     suminput(e) {
-      if (e.data) {
-        this.extract = this.extract * 10 + parseInt(e.data);
-        console.log(this.extract)
+      console.log(e)
+      if (e) {
+        this.extract = e;
         this.checkMoney();
       } else {
         if (this.extract && this.extract > 0) {
@@ -437,7 +453,7 @@ export default {
       if (!this.extract || this.extract < this.lowest) {
         this.is_lowest = true;
         this.is_post = false;
-      } else if (this.extract > this.MoneyData.handlingFee) {
+      } else if (this.extract > this.MoneyData[this.accountBalance]) {
         this.is_out = true;
         this.is_lowest = false;
         this.is_post = false;
@@ -449,16 +465,18 @@ export default {
       if (parseFloat(this.extract).toString() == 'NaN') {
         this.is_post = false;
         this.$message({
-            type: 'error',
-            message: '输入金额不合法',
-          });
+          type: 'error',
+          message: '输入金额不合法',
+        });
       }
     },
     bankselection(data) {
       this.bankCardInfo = data;
     },
     banklist() {
-      this.$api.letter.getUserBankList().then((res) => {
+      this.$api.letter.getUserBankList({
+        auditStatus: '1',
+      }).then((res) => {
         if (res.code == '200') {
           this.bankList.map(val => {
             res.data.map(ele => {
@@ -703,6 +721,18 @@ export default {
   .el-dialog__footer {
     padding: 10px;
   }
+
+  .no-border {
+    .el-input__inner {
+      border: none;
+      outline: none;
+      background: transparent;
+      font-size: 45px;
+      font-weight: bold;
+      height: 100%;
+    }
+
+  }
 }
 
 .withdrawalinput {
@@ -760,13 +790,7 @@ export default {
     cursor: pointer;
   }
 
-  input.no-border {
-    border: none;
-    outline: none;
-    background: transparent;
-    font-size: 45px;
-    font-weight: bold;
-  }
+
 }
 
 .dialogCentent,

+ 115 - 29
src/views/Letter/Wallet/BankCard.vue

@@ -1,35 +1,94 @@
 <!-- 模板区域 -->
 <template>
-  <div id="body" class="flex f-wrap  a-c">
+  <div id="body">
     <!-- 模板内容 -->
-    <div class="bankClass " @click="bankAddVisible = true">
-      <div class="add flex j-c a-c">
-        <img src="../../../../static/bankadd.png" alt="">
-        <span>添加银行卡提现</span>
+    <el-radio-group v-model="bankType" style="margin: 0 40px 30px;" >
+      <el-radio-button label="0">未审核</el-radio-button>
+      <el-radio-button label="1">已审核</el-radio-button>
+      <el-radio-button label="2">审核驳回</el-radio-button>
+    </el-radio-group>
+    <div class="flex f-wrap  a-c">
+      <div class="bankClass " @click="bankAddVisible = true">
+        <div class="add flex j-c a-c">
+          <img src="../../../../static/bankadd.png" alt="">
+          <span>添加银行卡提现</span>
+        </div>
       </div>
-    </div>
-    <div class="bankdata flex f-c j-s" :style="{ background: item.stylelist.background }"
-      v-for="(item, index) in cardPackList" :key="index">
-      <img class="Backgroundimage" src="../../../../static/bankLogo/img1.png" alt="">
-      <div class="flex j-s a-start">
-        <div class="flex">
-          <div class="logo">
-            <img :src="item.stylelist.logo" mode="">
+      <template v-if="bankType == 0">
+        <div class="bankdata flex f-c j-s" :style="{ background: item.stylelist.background }"
+          v-for="(item, index) in cardPackList1" :key="index">
+          <img class="Backgroundimage" src="../../../../static/bankLogo/img1.png" alt="">
+          <div class="flex j-s a-start">
+            <div class="flex">
+              <div class="logo">
+                <img :src="item.stylelist.logo" mode="">
+              </div>
+              <div class="banktitle flex f-c">
+                <span>{{ item.bankAccount }}</span>
+                <span>储蓄卡</span>
+              </div>
+            </div>
+            <img src="../../../../static/bankdel.png" mode="" style="width: 24px;height: 24px;" @click="bankdel(item.id)"
+              v-loading.fullscreen.lock="Loading">
           </div>
-          <div class="banktitle flex f-c">
-            <span>{{ item.bankAccount }}</span>
-            <span>储蓄卡</span>
+          <div class="bank flex j-s a-c">
+            <div>****</div>
+            <div>****</div>
+            <div>****</div>
+            <span>{{ item.bankNumber.slice(-4) }}</span>
           </div>
         </div>
-        <img src="../../../../static/bankdel.png" mode="" style="width: 24px;height: 24px;" @click="bankdel(item.id)"
-          v-loading.fullscreen.lock="Loading">
-      </div>
-      <div class="bank flex j-s a-c">
-        <div>****</div>
-        <div>****</div>
-        <div>****</div>
-        <span>{{ item.bankNumber.slice(-4) }}</span>
-      </div>
+      </template>
+      <template v-if="bankType == 1">
+        <div class="bankdata flex f-c j-s" :style="{ background: item.stylelist.background }"
+          v-for="(item, index) in cardPackList2" :key="index">
+          <img class="Backgroundimage" src="../../../../static/bankLogo/img1.png" alt="">
+          <div class="flex j-s a-start">
+            <div class="flex">
+              <div class="logo">
+                <img :src="item.stylelist.logo" mode="">
+              </div>
+              <div class="banktitle flex f-c">
+                <span>{{ item.bankAccount }}</span>
+                <span>储蓄卡</span>
+              </div>
+            </div>
+            <img src="../../../../static/bankdel.png" mode="" style="width: 24px;height: 24px;" @click="bankdel(item.id)"
+              v-loading.fullscreen.lock="Loading">
+          </div>
+          <div class="bank flex j-s a-c">
+            <div>****</div>
+            <div>****</div>
+            <div>****</div>
+            <span>{{ item.bankNumber.slice(-4) }}</span>
+          </div>
+        </div>
+      </template>
+      <template v-if="bankType == 2">
+        <div class="bankdata flex f-c j-s" :style="{ background: item.stylelist.background }"
+          v-for="(item, index) in cardPackList3" :key="index">
+          <img class="Backgroundimage" src="../../../../static/bankLogo/img1.png" alt="">
+          <div class="flex j-s a-start">
+            <div class="flex">
+              <div class="logo">
+                <img :src="item.stylelist.logo" mode="">
+              </div>
+              <div class="banktitle flex f-c">
+                <span>{{ item.bankAccount }}</span>
+                <span>储蓄卡</span>
+              </div>
+            </div>
+            <img src="../../../../static/bankdel.png" mode="" style="width: 24px;height: 24px;" @click="bankdel(item.id)"
+              v-loading.fullscreen.lock="Loading">
+          </div>
+          <div class="bank flex j-s a-c">
+            <div>****</div>
+            <div>****</div>
+            <div>****</div>
+            <span>{{ item.bankNumber.slice(-4) }}</span>
+          </div>
+        </div>
+      </template>
     </div>
     <el-dialog title="添加银行卡" :visible.sync="bankAddVisible" width="28%">
       <div class="dialogCentent">
@@ -61,6 +120,7 @@ export default {
   // 数据存放区域
   data() {
     return {
+      bankType: "1",
       bankAddform: {
         "bankNumber": "",
         "bankAccount": "",
@@ -69,7 +129,9 @@ export default {
       },
       bankAddVisible: false,
       Loading: false,
-      cardPackList: [],
+      cardPackList1: [],
+      cardPackList2: [],
+      cardPackList3: [],
       list: [{
         value: '1',
         label: '中国工商银行'
@@ -267,14 +329,19 @@ export default {
       });
 
     },
-    banklist() {
+    banklist(type) {
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });
-      this.$api.letter.getUserBankList().then((res) => {
+      this.$api.letter.getUserBankList({
+        auditStatus: '',
+      }).then((res) => {
+        let list1 = [];
+        let list2 = [];
+        let list3 = [];
         if (res.code == '200') {
           res.data.map(val => {
             let name = this.bankList.find(ele => ele.bankName === val.bankAccount)
@@ -288,8 +355,21 @@ export default {
                 background: 'linear-gradient(90deg, rgba(229, 166,0,0.7) 0%, #e5a600 100%)',
               }
             }
+            switch (val.auditStatus) {
+              case "0":
+                list1.push(val);
+                break;
+              case "1":
+                list2.push(val);
+                break;
+              case "2":
+                list3.push(val);
+                break;
+            }
           })
-          this.cardPackList = res.data;
+          this.cardPackList1 = list1;
+          this.cardPackList2 = list2;
+          this.cardPackList3 = list3;
           loading.close();
         } else {
           this.$message({
@@ -315,6 +395,12 @@ export default {
   .el-dialog__footer {
     padding: 10px;
   }
+
+  .el-radio-button__orig-radio:checked+.el-radio-button__inner {
+    background-color: #2D4D89;
+    border-color: #2D4D89;
+    box-shadow: -1px 0 0 0 #2D4D89;
+  }
 }
 
 .dialogCentent {

+ 16 - 9
src/views/Task/daikeComponents/KtLetter.vue

@@ -4216,7 +4216,7 @@ export default {
         // appnum:Number(list.appnum)
       };
       this.guoRenInsuranceDataTable = list.son;
-      this.guoRenaccidentalDrivingVo=Object.assign({...list,...this.guoRenaccidentalDrivingVo}) 
+      this.guoRenaccidentalDrivingVo=Object.assign({...list,...this.guoRenaccidentalDrivingVo})
 
     },
     // 选择意外险类型
@@ -4442,7 +4442,8 @@ export default {
       let selectRow = row.find(item => {
         return item.id == val;
       });
-      this.totalCompanyList[index].apiType = obj.apiType;
+      let info=row.find(ele=>ele.id==val);
+      this.totalCompanyList[index].apiType = info.apiType;
       this.totalCompanyList[index].underwritingDescription = val
         ? selectRow.underwritingDescription
         : ""; //重新赋值修改选中协议承保描述
@@ -4648,7 +4649,7 @@ export default {
     //安盛驾意险选择
     ASDrivingRadio(row) {
       this.anshengInsurancetype = row.projectCode;
-      this.anshengaccidentalDrivingVo=Object.assign({...row,...this.anshengaccidentalDrivingVo}) 
+      this.anshengaccidentalDrivingVo=Object.assign({...row,...this.anshengaccidentalDrivingVo})
       // this.anshengaccidentalDrivingVo.projectCode = row.projectCode;
       // this.anshengaccidentalDrivingVo.projectName = row.projectName;
     },
@@ -5687,15 +5688,16 @@ export default {
     },
     //华泰报价
     huatai(num, id) {
+      let type=this.totalCompanyList[num].apiType;
+      let api = type == 2 ? "pythonquote" : "huataiquote";
       let isTaxSource = this.totalCompanyList[num].isTaxSource;
       let params = {
         orderNo: this.orderno,
         companyId: id,
         agreementId: this.totalCompanyList[num].agreementId,
         isTaxSource: isTaxSource == 1 ? isTaxSource : null,
-
       };
-      this.$api.letter.huataiquote(params).then(res => {
+      this.$api.letter[api](params).then(res => {
         this.totalCompanyList[num].msg = res.msg;
         if (!!res.msg && res.msg.indexOf("不存在有效协议") >= 0) {
           this.totalCompanyList[num].quoteCode = "4";
@@ -6654,13 +6656,19 @@ export default {
                   });
                 break;
               case "华泰财险":
-                await this.$api.letter
-                  .insHuataisubmitImage({
+              let HtApiImage = "";
+              HtApiImage =
+                  this.apiType == 2
+                    ? "pythonsubmitImage"
+                    : "insHuataisubmitImage";
+                await this.$api.letter[HtApiImage]({
                     companyId: this.companyId
                   })
                   .then(res => {
                     if (res.code == "200") {
                       var _this = this;
+                      let HtApiaudit = "";
+                      HtApiaudit = this.apiType == 2 ? "pythonaudit" : "yonganaudit";
                       let engageList = [];
                       this.zijinengageList.forEach(val => {
                         engageList.push({
@@ -6670,8 +6678,7 @@ export default {
                           riskCode: val.riskCode
                         });
                       });
-                      _this.$api.letter
-                        .huataiaudit({
+                      _this.$api.letter[HtApiaudit]({
                           companyId: this.companyId,
                           engageList
                         })

Fichier diff supprimé car celui-ci est trop grand
+ 272 - 399
src/views/Task/daikeComponents/KtOrder.vue


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff