Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/payCredit/generanView.vue

@@ -9,7 +9,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="业务员类型">
-            <el-select v-model="form.attrType">
+            <el-select v-model="form.attrType" clearable>
               <el-option value="1" label="前线人员"></el-option>
               <el-option value="2" label="后线人员"></el-option>
               <el-option value="3" label="合伙人"></el-option>
@@ -23,7 +23,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="统计日期">
-            <el-date-picker v-model="form.createTime" type="daterange" range-separator="至" start-placeholder="开始时间"
+            <el-date-picker v-model="form.createTime" clearable type="daterange" range-separator="至" start-placeholder="开始时间"
               end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
           </el-form-item>
         </el-col>

src/views/payCredit/index.vue

@@ -60,7 +60,7 @@
             <span>提现金额总计: {{ totalAmount || 0 }}</span>
           </el-col>
         </el-form>
-        <el-table :data="firstData4" height="calc(100% - 194px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData4" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="userJzgInfoId" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -150,7 +150,7 @@
             <span>提现金额总计: {{ totalAmount || 0 }}</span>
           </el-col>
         </el-form>
-        <el-table :data="firstData1" height="calc(100% - 194px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData1" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="userJzgInfoId" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -249,7 +249,7 @@
             <span>提现金额总计: {{ totalAmount || 0 }}</span>
           </el-col>
         </el-form>
-        <el-table :data="firstData2" height="calc(100% - 194px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData2" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="userJzgInfoId" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -336,7 +336,7 @@
             <span>提现金额总计: {{ totalAmount || 0 }}</span>
           </el-col>
         </el-form>
-        <el-table :data="firstData3" height="calc(100% - 194px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData3" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="userJzgInfoId" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -377,7 +377,7 @@
             <el-button size="large" icon="Plus" />
           </el-upload>
         </el-form-item>
-        <el-form-item prop="c" label="付款账户">
+        <el-form-item prop="accountName" label="付款账户">
           <el-input placeholder="请填入" v-model="drawForm.accountName" @click="payAccount" />
         </el-form-item>
       </el-form>
@@ -403,7 +403,7 @@
       <el-table ref="AccountRef" row-key="id" style="margin: 24px 0; max-height: 400px" @select="handleSelect"
         :data="accountData">
         <el-table-column type="selection" width="80"></el-table-column>
-        <el-table-column prop="accountName" label="账户名称"></el-table-column>
+        <!-- <el-table-column prop="bankCardNum" label="账户名称"></el-table-column> -->
         <el-table-column prop="bankCardNum" label="银行卡号"></el-table-column>
         <el-table-column prop="bankName" label="开户行"></el-table-column>
         <el-table-column prop="bankNum" label="开户行号"></el-table-column>
@@ -469,6 +469,12 @@ let firstData4 = ref([{}])
 // 驳回
 let refuseReason = ref('')
 const handlePay = (row) => {
+  drawForm.value = {
+    voucherId: '',
+    picId: '',
+    accountId: '',
+    accountName: ''
+  }
   drawShow.value = true
   drawForm.value.id = row.id
 }
@@ -658,7 +664,7 @@ const handleAccountCancel = () => {
 }
 const handleAccountSubmit = () => {
   payAccountShow.value = false
-  drawForm.value.accountName = selectItem.value.accountName
+  drawForm.value.accountName = selectItem.value.bankCardNum
   drawForm.value.accountId = selectItem.value.accountId
 }
 const handleCancelVerifyAmount = () => {
@@ -682,6 +688,7 @@ const handleVerifyAmount = () => {
         message: res.msg,
         type: 'success'
       })
+      drawShow.value = false
       initData(activeName.value)
     }
   })

src/views/payCredit/myTask.vue

@@ -40,8 +40,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <p style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</p>
-        <el-table :data="firstData1" height="calc(100% - 196px)" style="width: 100%; margin-top: 20px;">
+        <div style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</div>
+        <el-table :data="firstData1" height="calc(100% - 164px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
             <template #default="scope">
@@ -55,11 +55,6 @@
           <el-table-column prop="bankName" label="银行"></el-table-column>
           <el-table-column prop="accountName" label="姓名"></el-table-column>
           <el-table-column prop="bankName" label="开户行"></el-table-column>
-          <el-table-column label="操作" fixed="right" width="200">
-            <template #default="scope">
-              <el-button link type="primary" size="small">领取</el-button>
-            </template>
-          </el-table-column>
         </el-table>
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"
@@ -108,9 +103,9 @@
             </el-col>
           </el-row>
         </el-form>
-        <p style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</p>
+        <div style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</div>
 
-        <el-table :data="firstData2" height="calc(100% - 144px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData2" height="calc(100% - 164px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
             <template #default="scope">
@@ -124,11 +119,6 @@
           <el-table-column prop="bankName" label="银行"></el-table-column>
           <el-table-column prop="accountName" label="姓名"></el-table-column>
           <el-table-column prop="bankName" label="开户行"></el-table-column>
-          <el-table-column label="操作" fixed="right" width="200">
-            <template #default="scope">
-              <el-button link type="primary" size="small">领取</el-button>
-            </template>
-          </el-table-column>
         </el-table>
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"
@@ -177,9 +167,9 @@
             </el-col>
           </el-row>
         </el-form>
-        <p style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</p>
+        <div style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</div>
 
-        <el-table :data="firstData3" height="calc(100% - 144px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData3" height="calc(100% - 164px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
             <template #default="scope">
@@ -193,11 +183,6 @@
           <el-table-column prop="bankName" label="银行"></el-table-column>
           <el-table-column prop="accountName" label="姓名"></el-table-column>
           <el-table-column prop="bankName" label="开户行"></el-table-column>
-          <el-table-column label="操作" fixed="right" width="200">
-            <template #default="scope">
-              <el-button link type="primary" size="small">领取</el-button>
-            </template>
-          </el-table-column>
         </el-table>
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"

src/views/platform/index.vue

@@ -217,7 +217,7 @@
             @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="非车险验收" name="2" class="h-full">
+      <!-- <el-tab-pane label="非车险验收" name="2" class="h-full">
         <el-form v-model="receivableForm" label-width="100">
           <el-row :gutter="20">
             <el-col :span="8">
@@ -392,7 +392,7 @@
             layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange"
             @current-change="handleCurrentChange"></el-pagination>
         </div>
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
     <el-dialog v-model="addShow" width="800" title="添加应收">
       <div class="add-content">
@@ -499,7 +499,8 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="">
-                  <el-date-picker v-model="editForm.signTime" type="date" format="YYYY-MM-DD"></el-date-picker>
+                  <el-date-picker v-model="editForm.signTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -833,7 +834,6 @@ const handleSelectAll2 = (row: any) => {
   }
 }
 
-// 批量修改比例
 // 批量修改比例
 let batchEditShow = ref(false)
 let feeRate = ref(null)

src/views/receivable/documentary/index.vue

@@ -483,7 +483,8 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="">
-                  <el-date-picker v-model="editForm.signTime" type="date" format="YYYY-MM-DD"></el-date-picker>
+                  <el-date-picker v-model="editForm.signTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>