提交

src/api/business/financial/collection.js

@@ -56,7 +56,14 @@ export function setCollectionStatus(data) {
   })
 }
 
-
+// 删除收款
+export function delCollection(id) {
+  request.defaults.baseURL = '/ezhizao-yzbh-financial'
+  return request({
+    url: '/business/collection/del/' + id,
+    method: 'Delete'
+  })
+}
 
 export function getCreditTermByCompId(query) {
   request.defaults.baseURL = '/ezhizao-yzbh-financial'
@@ -106,14 +113,6 @@ export function updateCollection(data) {
   })
 }
 
-// 删除划款管理
-export function delCollection(id) {
-  request.defaults.baseURL = '/ezhizao-yzbh-financial'
-  return request({
-    url: '/business/collection/' + id,
-    method: 'delete'
-  })
-}
 
 export function exportCollection(query) {
   request.defaults.baseURL = '/ezhizao-yzbh-financial'

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

@@ -256,6 +256,13 @@
                 <span>{{ rowNum(form.arriveAmount) }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="订单备注：">
+                <span style="word-break: break-all">{{
+                  form.orderRemark
+                }}</span>
+              </el-form-item>
+            </el-col>
             <el-col v-if="form.status === 1" :span="6">
               <el-form-item label="审核意见：" required>
                 <span>{{ form.verifyComment }}</span>
@@ -266,14 +273,14 @@
                 <span>{{ form.verifyComment }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="备注：">
+            <el-col :span="6">
+              <el-form-item label="收款备注：">
                 <el-input
                   v-if="editStatus"
                   v-model.trim="form.remark"
                   size="small"
                   type="text"
-                  placeholder="备注"
+                  placeholder="收款备注"
                   :clearable="true"
                 />
                 <span v-else style="word-break: break-all">{{
@@ -618,11 +625,10 @@ function open(id) {
   reset();
   visible.value = true;
   editStatus.value = true;
-  // console.log(virtual_address.value)
   getCollection(id).then((res) => {
     form.value = res.data;
+    console.log("form", form.value);
     editStatus.value = false;
-    // editStatus.value = true
   });
 }
 

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

@@ -2,6 +2,16 @@
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['business:collection:remove']"
+        >删除</el-button
+      >
+
       <el-dropdown>
         <el-button type="primary" size="small">
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
@@ -208,7 +218,10 @@
 
 <script setup name="Company">
 import contractForm from "./form";
-import { listCollection } from "@/api/business/financial/collection";
+import {
+  listCollection,
+  delCollection,
+} from "@/api/business/financial/collection";
 import importExcelDialog from "./importExcelDialog.vue";
 const { proxy } = getCurrentInstance();
 /** 字典数组区 */
@@ -386,7 +399,7 @@ function handleDelete(row) {
   proxy.$modal
     .confirm("是否确认删除选中的数据项？")
     .then(function () {
-      return delOrder(_ids);
+      return delCollection(_ids);
     })
     .then(() => {
       getList();