no message

src/api/business/production/deduction.js

@@ -40,6 +40,15 @@ export function updateDeduction(data) {
   })
 }
 
+export function update(data) {
+  request.defaults.baseURL = '/ezhizao-yzbh-production'
+  return request({
+    url: '/business/deduction/update',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除划款管理
 export function delDeduction(id) {
   request.defaults.baseURL = '/ezhizao-yzbh-production'

src/views/business/deduction/index.vue

@@ -88,6 +88,20 @@
           <span v-else>--</span>
         </template>
       </el-table-column>
+      <el-table-column label="划款方式" prop="remark" width="100" align="center">
+        <template #default="scope">
+          <div style="display: flex; align-items: center;">
+            <span v-if="scope.row.payWay === 1">对公划款</span>
+            <span v-if="scope.row.payWay === 2">扫描支付</span>
+            <el-icon :size="15" style="color: #409eff; margin-left: 5px;cursor: pointer;"
+              @click="changePayWay(scope.row)" v-if="(scope.row.status === 0 || scope.row.status === 1)&& tenant.versionId !== '4'"> 
+              <Edit />
+            </el-icon>
+          </div>
+        </template>
+      </el-table-column>
+
+
       <el-table-column label="状态" width="100" align="center">
         <template #default="scope">
           <span v-if="scope.row.status === 0">待确认扣款</span>
@@ -148,15 +162,27 @@
             <el-form-item label="扣款金额：">
               <div>{{ form.amount }}</div>
             </el-form-item>
+            <el-form-item label="划款方式：">
+              <div>
+                {{ 
+                  form.payWay === 1 
+                    ? '对公划款' 
+                    : form.payWay === 2 
+                    ? '扫描支付' 
+                    : '' 
+                }}
+              </div>
+              
+            </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="凭证附件：" required>
-              <el-col v-for="(o, index) in form.files" :key="o.UUID" :span="8" style="margin-bottom: 10px; position: relative">
+              <el-col v-for="(o, index) in form.files" :key="o.UUID" :span="8"
+                style="margin-bottom: 10px; position: relative">
                 <el-card :body-style="{ padding: '0px' }">
                   <el-image :src="`${baseUrl}${o.fileUrl}`" class="image" style="max-width: 100%; height: 200px"
-                    :preview-teleported="true" fit="contain" :preview-src-list="srcList" :initial-index="index"
-                    />
-                    <!-- <div style="padding: 14px">
+                    :preview-teleported="true" fit="contain" :preview-src-list="srcList" :initial-index="index" />
+                  <!-- <div style="padding: 14px">
                       <div class="bottom clearfix">
                         {{ o.fileName }}
                       </div>
@@ -197,7 +223,7 @@
               </el-table> -->
             </el-form-item>
           </el-col>
-         
+
         </el-row>
       </el-form>
       <template #footer>
@@ -257,6 +283,46 @@
         </div>
       </template>
     </el-dialog>
+
+
+    <el-dialog title="确认扣款" v-model="showConfirmFlag" width="400px" append-to-body draggable>
+      <div>
+        <p>您确定要进行扣款吗？</p>
+      </div>
+      <el-form :model="payWayFrom" ref="showConfirmFlagRef" size="small" label-width="100">
+        <el-form-item label="划款方式：" prop="payWay">
+          <el-select v-model="payWayFrom.payWay" placeholder="请选择扣款方式" :clearable="true">
+            <el-option label="对公划款" :value="1" />
+            <el-option label="扫描支付" :value="2" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" icon="Finished" size="small" @click="showConfirmSubmit">确 定</el-button>
+          <el-button icon="close" size="small" @click="showConfirmFlag = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <el-dialog title="修改划款方式" v-model="changePayWayFlag" width="400px" append-to-body draggable>
+      <div>
+        <p>您确定要进行扣款吗？</p>
+      </div>
+      <el-form :model="payWayFrom" ref="changePayWayFlagRef" size="small" label-width="100">
+        <el-form-item label="划款方式：" prop="payWay">
+          <el-select v-model="payWayFrom.payWay" placeholder="请选择扣款方式" :clearable="true">
+            <el-option label="对公划款" :value="1" />
+            <el-option label="扫描支付" :value="2" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" icon="Finished" size="small" @click="changePayWaySubmit">确 定</el-button>
+          <el-button icon="close" size="small" @click="changePayWayFlag = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -264,7 +330,7 @@
   import {
     listDeduction,
     exportDeposition,
-    saveDeduction
+    saveDeduction,update
   } from "@/api/business/production/deduction";
   import MergeTaxViewDialog from "./MergeTaxViewDialog";
   import feedbackDialog from "./feedbackDialog";
@@ -296,6 +362,11 @@
   const baseUrl = ref(import.meta.env.VITE_APP_BASE_API);
   const showViewer = ref(false);
   const currentFileList = ref([]);
+  const payWayFrom = ref({
+  });
+  const changePayWayFlag = ref(false);
+  const confirmRow = ref({});
+  const showConfirmFlag = ref(false);
   const showIndex = ref(0);
   const srcList = ref([]);;
   const queryRadio = ref("全部");
@@ -485,7 +556,17 @@
       })
       .catch(() => { });
   }
-
+  function changePayWay(row) {
+    changePayWayFlag.value = true;
+    payWayFrom.value.id = row.id
+    payWayFrom.value.payWay = row.payWay
+  }
+function changePayWaySubmit(){
+  update(payWayFrom.value).then(res=>{
+    changePayWayFlag.value = false;
+    getList();
+  })
+}
   /** 导出按钮操作 */
   function handleExport() {
     exportDeposition(queryParams.value);
@@ -641,13 +722,29 @@
   }
 
   function showConfirm(row) {
-    proxy.$modal.confirm("确认扣款么？").then((res) => {
-      row.confirmId = useUserStore().user.userId;
-      row.confirmDate = proxy.moment().format("YYYY-MM-DD HH:mm:ss");
-      row.status = 1;
-      saveDeduction(row).then((res) => {
-        getList();
-      });
+    showConfirmFlag.value = true;
+    row.confirmId = useUserStore().user.userId;
+    row.confirmDate = proxy.moment().format("YYYY-MM-DD HH:mm:ss");
+
+    confirmRow.value = row;
+  }
+
+  function confirmDeduction(row) {
+    // proxy.$modal.confirm("确认扣款么？").then((res) => {
+    //   row.confirmId = useUserStore().user.userId;
+    //   row.confirmDate = proxy.moment().format("YYYY-MM-DD HH:mm:ss");
+    //   row.status = 1;
+    //   saveDeduction(row).then((res) => {
+    //     getList();
+    //   });
+    // });
+  }
+  function showConfirmSubmit() {
+    confirmRow.value.status = 1;
+    confirmRow.value.payWay = payWayFrom.value.payWay;
+    saveDeduction(confirmRow.value).then((res) => {
+      showConfirmFlag.value = false;
+      getList();
     });
   }
 

src/views/business/financial/collection/index.vue

@@ -30,7 +30,10 @@
         <el-input v-model="queryParams.contractNo" style="width: 150px" placeholder="请输入合同编号" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
-
+      <el-form-item label="收款账户：" prop="subsidiaryName">
+        <el-input v-model="queryParams.subsidiaryName" style="width: 150px" placeholder="请输入收款账户" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
       <el-form-item prop="applierTime" label="审核时间：">
         <el-date-picker v-model="queryParams.dateFilter" type="daterange" clearable format="YYYY - MM - DD "
           value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期" end-placeholder="业务日期"
@@ -95,6 +98,8 @@
           <span v-else-if="scope.row.arriveStatus === 2" style="color: #cd853f">部分支付</span>
         </template>
       </el-table-column>
+      <el-table-column label="收款账户" prop="subsidiaryName" align="center"/>
+       
       <el-table-column v-if="getShowStatus(14)" label="到账日期" prop="actuallyDate" align="center">
         <template #default="scope">
           {{ (scope.row.arriveDate) }} {{scope.row.arriveTime}}