其他应收单隐藏字段,退押审批通过后可以编辑备注,经销商钱包对应关系新增下载模板,导入功能

src/api/engin_deposit/refund_list.js

@@ -24,6 +24,14 @@ export function getDepositManageExamine(data) {
     data,
   });
 }
+// 编辑退押
+export function getDepositManageEdit(data) {
+  return request({
+    url: "/deposit-manage/edit",
+    method: "post",
+    data,
+  });
+}
 // 押金管理导出
 export function getDepositManagExport(params) {
   return request({

src/views/basic_data/dealer/dealer_stock.vue

@@ -58,6 +58,20 @@
           >
         </el-popconfirm>
       </div>
+      <div class="fr">
+        <el-button type="primary" size="small" @click="downLoadFn"
+          >下载模板</el-button
+        >
+        <el-upload
+          class="import-btn"
+          action=""
+          :http-request="handleImport"
+          :file-list="importFileList"
+          :show-file-list="false"
+        >
+          <el-button type="primary" size="small">导入</el-button>
+        </el-upload>
+      </div>
     </div>
 
     <div class="mymain-container">
@@ -323,10 +337,12 @@ import {
   getWalletCustomerList,
 } from "@/api/basic_data/dealer";
 import { getDealerList } from "@/api/basic_data/dealer";
+import { downloadFiles, handleImport } from "@/utils/util";
 
 export default {
   data() {
     return {
+      importFileList: [],
       isDisabled: true,
       title: "",
       dialogForm: false,
@@ -431,6 +447,33 @@ export default {
     },
   },
   methods: {
+    // 导入
+    async handleImport(param) {
+      const file = param.file;
+
+      const formData = new FormData();
+      formData.append("file", file);
+
+      let result = await handleImport("/customer/pt/importData", formData);
+
+      console.log(result);
+      this.importFileList = [];
+      if (result.code == 200) {
+        this.$message.success("导入成功");
+        await this.getList({
+          customerName: this.searchForm.customerName,
+          pageNum: 1,
+          pageSize: 10,
+        });
+      } else {
+        this.$message.error(result.message);
+      }
+    },
+    //下载模板
+    downLoadFn() {
+      downloadFiles("/customer/pt/download");
+    },
+
     // //改变产品大类
     // changeSelectFn(value) {
     //   // const res = this.categoryList.filter((v) => v.productCategoryId == value);
@@ -641,6 +684,10 @@ export default {
 .add-right {
   margin-right: 10px;
 }
+.import-btn {
+  margin-left: 10px;
+  display: inline-block;
+}
 // ::v-deep .selectStyle .el-input--suffix {
 //   width: 200%;
 // }

src/views/engin_deposit/components/refund_list-detail.vue

@@ -464,19 +464,43 @@
             ></el-input>
           </div>
         </el-col>
+        <el-col :xs="12" :sm="24" :lg="24" class="item dateS">
+          <div class="label">审批通过后备注</div>
+          <div class="value">
+            <el-input
+              v-model="detailList.examineAfterRemark"
+              placeholder="请输入内容"
+            ></el-input>
+          </div>
+        </el-col>
       </el-row>
     </div>
     <br />
     <!-- 按钮 -->
     <!-- detailList.examineStatus != 'OK' || detailList.examineStatus != 'FAIL' -->
-    <div class="btn-group clearfix" v-if="detailList.examineStatus == 'WAIT'">
+    <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small" @click="adoptFn"
+        <el-button
+          v-if="detailList.examineStatus == 'WAIT'"
+          type="primary"
+          size="small"
+          @click="adoptFn"
           >审批通过</el-button
         >
-        <el-button type="primary" size="small" @click="rejectFn"
+        <el-button
+          v-if="detailList.examineStatus == 'WAIT'"
+          type="primary"
+          size="small"
+          @click="rejectFn"
           >审批驳回</el-button
         >
+        <el-button
+          v-if="detailList.examineStatus == 'OK'"
+          type="primary"
+          size="small"
+          @click="saveFn"
+          >保存</el-button
+        >
       </div>
     </div>
   </div>
@@ -490,6 +514,7 @@ import {
   getDepositManageDetail,
   getDepositManageExamine,
   getDepositManageDownZip,
+  getDepositManageEdit,
 } from "@/api/engin_deposit/refund_list";
 export default {
   props: {
@@ -523,6 +548,14 @@ export default {
     this.getData({ id: this.detailId });
   },
   methods: {
+    //审批通过后可以编辑
+    async saveFn() {
+      console.log(this.detailList);
+      await getDepositManageEdit(this.detailList);
+      this.$message.success("保存成功");
+      this.goBack();
+      this.$emit("updateList");
+    },
     //批量下载
     async batchDownloadFn() {
       downloadFiles("/deposit-manage/downZip", { parentId: this.detailId });

src/views/finance/components/receivable_list-add.vue

@@ -219,7 +219,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             label="不含税金额"
             prop="afterTaxAmount"
@@ -243,7 +243,7 @@
             <template slot-scope="scope">
               <el-input type="number" v-model="scope.row.tax"></el-input>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             label="*总金额"
@@ -501,8 +501,8 @@ export default {
         departmentId: "",
         customerWalletId: "",
         invoiceType: "",
-        afterTaxAmount: "",
-        tax: "",
+        // afterTaxAmount: "",
+        // tax: "",
         totalAmount: "",
         taxRate: 13,
       });

src/views/finance/components/receivable_list-approval.vue

@@ -195,7 +195,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             label="不含税金额"
             prop="afterTaxAmount"
@@ -208,7 +208,7 @@
             prop="tax"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column
             align="center"
             label="总金额"

src/views/finance/components/receivable_list-detail.vue

@@ -177,7 +177,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             label="不含税金额"
             prop="afterTaxAmount"
@@ -190,7 +190,7 @@
             prop="tax"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column
             align="center"
             label="总金额"