Finish Hotfix-64

src/api/finance/receivable_list.js

@@ -65,11 +65,11 @@ export function getFinanceOtherReceDelete(params) {
     params,
   });
 }
-// // 其他应收单-弃审
-// export function getFinanceOtherReceAbandon(params) {
-//   return request({
-//     url: "/finance/other/rece/abandon",
-//     method: "post",
-//     params,
-//   });
-// }
+// 其他应收单-弃审
+export function getFinanceOtherReceAbandon(params) {
+  return request({
+    url: "/finance/other/rece/abandon",
+    method: "post",
+    params,
+  });
+}

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

@@ -158,7 +158,7 @@
           <div class="label">备注</div>
           <div class="value">{{ detailList.applyNote }}</div>
         </el-col>
-        <el-col v-if="isCustomer" :xs="24" :sm="24" :lg="16" class="item">
+        <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="16" class="item">
           <div class="label">格力内部备注</div>
           <!-- <div class="value">{{  detailList.geLiInerNote}}</div> -->
           <div class="value">

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

@@ -158,11 +158,11 @@
           <div class="label">备注</div>
           <div class="value">{{ detailList.applyNote }}</div>
         </el-col>
-        <el-col v-if="isCustomer" :xs="24" :sm="24" :lg="16" class="item">
+        <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="16" class="item">
           <div class="label">格力内部备注</div>
           <!-- <div class="value">{{  detailList.geLiInerNote}}</div> -->
           <div class="value">
-            <el-input v-model="detailList.geLiInerNote" placeholder="请输入内容"></el-input>
+            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.geLiInerNote" placeholder="请输入内容"></el-input>
           </div>
 
         </el-col>

src/views/finance/receivable_list.vue

@@ -121,13 +121,8 @@
                       scope.row.examineStatus == 'FAIL') &&
                     $checkBtnRole('examine', $route.meta.roles)
                   " type="text" class="textColor" @click="approvalFn(scope.row.id)">审批</el-button>
-                <!-- <el-button
-                  type="text"
-                  class="textColor"
-                  v-show="scope.row.examineStatus == 'OK'"
-                  @click="unApprovalFn(scope.row.id)"
-                  >弃审</el-button
-                > -->
+                <el-button type="text" class="textColor" v-show="scope.row.examineStatus == 'SAVE'" @click="bringFn(scope.row.id)">提审</el-button>
+                <el-button type="text" class="textColor" v-show="scope.row.examineStatus == 'OK' || scope.row.examineStatus == 'FAIL'" @click="unApprovalFn(scope.row.id)">弃审</el-button>
                 <el-button type="text" class="textColor" @click="detailFn(scope.row.id)">详情</el-button>
               </template>
             </el-table-column>
@@ -151,6 +146,7 @@ import { getCustomerList } from "@/api/finance/wallet";
 import {
   getFinanceOtherReceList,
   getFinanceOtherReceDelete,
+  getFinanceOtherReceApply,
   getFinanceOtherReceAbandon,
 } from "@/api/finance/receivable_list";
 import ReceivableListAdd from "./components/receivable_list-add";
@@ -208,16 +204,26 @@ export default {
       });
       this.customerList = res.data.records;
     },
-    // //弃审
-    // async unApprovalFn(id) {
-    //   await getFinanceOtherReceAbandon({ id });
-    //   this.$message.success("弃审成功");
-    //   this.getDataList({
-    //     pageNum: 1,
-    //     pageSize: this.pageSize,
-    //     examineStatus: this.examine,
-    //   });
-    // },
+    //提审
+    async bringFn(id) {
+      await getFinanceOtherReceApply({ id });
+      this.$message.success("提审成功");
+      this.getDataList({
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        examineStatus: this.examine,
+      });
+    },
+    //弃审
+    async unApprovalFn(id) {
+      await getFinanceOtherReceAbandon({ id });
+      this.$message.success("弃审成功");
+      this.getDataList({
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        examineStatus: this.examine,
+      });
+    },
     //radio切换'
     changeRadioGroupFn(v) {
       this.getDataList({