退押审批bug修改等

src/api/finance/receipt_list.js

@@ -1,18 +1,34 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 收款单列表
 export function getK3ReceiptList(params) {
-    return request({
-      url: '/k3/receipt/list',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: "/k3/receipt/list",
+    method: "get",
+    params,
+  });
+}
 // 收款单详情
 export function getK3ReceiptDetail(params) {
-    return request({
-      url: '/k3/receipt/detail',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: "/k3/receipt/detail",
+    method: "get",
+    params,
+  });
+}
+// 弃审
+export function getK3ReceiptAbandon(params) {
+  return request({
+    url: "/k3/receipt/abandon",
+    method: "post",
+    params,
+  });
+}
+// 导出收款单列表
+export function getK3ReceiptExport(params) {
+  return request({
+    url: "/k3/receipt/export",
+    method: "get",
+    params,
+  });
+}

src/views/basic_data/dealer/dealer_stock.vue

@@ -194,7 +194,7 @@
         label-width="100px"
         label-position="right"
       >
-        <el-form-item label="经销商编码" prop="customerId">
+        <el-form-item label="经销商名称" prop="customerId">
           <el-select
             filterable
             class="selectStyle"
@@ -211,7 +211,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="经销商名称" prop="">
+        <el-form-item label="经销商编码" prop="">
           <el-input disabled v-model="addForm.customerNumber"></el-input>
           <!-- <template slot-scope="scope">
             {{ scope.row }}

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="sty">
-      <el-page-header @back="goBack" content="审批"> </el-page-header>
+      <el-page-header @back="goBack" :content="title"> </el-page-header>
     </div>
     <el-divider></el-divider>
 
@@ -48,7 +48,10 @@
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">厂工程编码(G编码)</div>
           <div class="value">
-            <el-input v-model="detailList.refFactoryNo"></el-input>
+            <el-input
+              :disabled="title == '详情'"
+              v-model="detailList.refFactoryNo"
+            ></el-input>
           </div>
         </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -75,6 +78,7 @@
           <div class="label">寄厂日期</div>
           <div class="value">
             <el-date-picker
+              :disabled="title == '详情'"
               class="selectStyle"
               v-model="detailList.sendFactoryDate"
               type="datetime"
@@ -93,6 +97,7 @@
           <div class="label">安装时间</div>
           <div class="value">
             <el-date-picker
+              :disabled="title == '详情'"
               class="selectStyle"
               v-model="detailList.installDate"
               type="datetime"
@@ -238,12 +243,12 @@
             <template slot-scope="scope">
               <el-image
                 ref="img"
-                :src="imageURL + item.url"
-                :preview-src-list="previewImages"
+                :src="imageURL + scope.row.fileUrl"
                 v-if="checkFileType(scope.row.fileUrl) == 'image'"
                 style="width: 120px; height: 120px"
                 fit="cover"
-              ></el-image>
+              >
+              </el-image>
               <img
                 class="file"
                 src="@/assets/common/word.png"
@@ -308,8 +313,22 @@
         </el-col>
       </el-row>
     </div>
-    <h3>审批</h3>
-    <el-divider></el-divider>
+    <h3
+      v-if="
+        detailList.examineStatus == 'WAIT' ||
+        detailList.examineStatus == 'FAIL' ||
+        detailList.examineStatus == 'OK'
+      "
+    >
+      审批
+    </h3>
+    <el-divider
+      v-if="
+        detailList.examineStatus == 'WAIT' ||
+        detailList.examineStatus == 'FAIL' ||
+        detailList.examineStatus == 'OK'
+      "
+    ></el-divider>
     <div v-if="detailList.examineStatus == 'WAIT'" class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -347,6 +366,7 @@
         </el-col>
       </el-row>
     </div>
+
     <div
       v-if="
         detailList.examineStatus == 'OK' || detailList.examineStatus == 'FAIL'
@@ -362,6 +382,7 @@
           <div class="label">验收日期</div>
           <div class="value">
             <el-date-picker
+              disabled
               prefix-icon="''"
               class="selectStyle"
               v-model="detailList.checkDate"
@@ -377,8 +398,8 @@
           <div class="label">是否退押</div>
           <div class="value">
             <el-radio-group v-model="detailList.isRefundDeposit">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
+              <el-radio disabled :label="true">是</el-radio>
+              <el-radio disabled :label="false">否</el-radio>
             </el-radio-group>
           </div>
         </el-col>
@@ -386,6 +407,7 @@
           <div class="label">验收说明</div>
           <div class="value">
             <el-input
+              disabled
               v-model="detailList.checkNote"
               placeholder="请输入内容"
             ></el-input>
@@ -396,12 +418,7 @@
     <br />
     <!-- 按钮 -->
     <!-- detailList.examineStatus != 'OK' || detailList.examineStatus != 'FAIL' -->
-    <div
-      class="btn-group clearfix"
-      v-if="
-        detailList.examineStatus == 'SAVE' || detailList.examineStatus == 'WAIT'
-      "
-    >
+    <div class="btn-group clearfix" v-if="detailList.examineStatus == 'WAIT'">
       <div class="fl">
         <el-button type="primary" size="small" @click="adoptFn"
           >审批通过</el-button
@@ -434,6 +451,7 @@ export default {
   },
   data() {
     return {
+      title: "审批",
       imageURL: this.$imageUrl,
       listLoading: false, // 列表加载loading
       dataList: [], // 列表数据
@@ -507,6 +525,13 @@ export default {
       const res = await getDepositManageDetail(data);
       console.log(res);
       this.detailList = res.data;
+      if (
+        res.data.examineStatus == "SAVE" ||
+        res.data.examineStatus == "OK" ||
+        res.data.examineStatus == "FAIL"
+      ) {
+        this.title = "详情";
+      }
     },
     goBack() {
       this.$parent.showSurrender = true;
@@ -522,4 +547,7 @@ export default {
 .label {
   width: 150px !important;
 }
+.selectStyle {
+  width: 100%;
+}
 </style>

src/views/engin_deposit/refund_list.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <div v-if="showSurrender">
-      <el-radio-group v-model="examine" size="">
-        <el-radio-button label="全部"></el-radio-button>
-        <el-radio-button label="待审核"></el-radio-button>
-        <el-radio-button label="审核驳回"></el-radio-button>
-        <el-radio-button label="审核通过"></el-radio-button>
-        <el-radio-button label="已退押金"></el-radio-button>
+      <el-radio-group @change="changeRadioFn" v-model="examine" size="">
+        <el-radio-button label="">全部</el-radio-button>
+        <el-radio-button label="SAVE">保存</el-radio-button>
+        <el-radio-button label="WAIT">待审核</el-radio-button>
+        <el-radio-button label="FAIL">审核驳回</el-radio-button>
+        <el-radio-button label="OK">审核通过</el-radio-button>
       </el-radio-group>
       <br /><br />
       <!-- 筛选条件 -->
@@ -35,14 +35,14 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+            <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="customerKeyword">
                 <el-input
                   v-model="searchForm.customerKeyword"
                   placeholder="请输入"
                 ></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程名称" prop="refProjectName">
                 <el-input
@@ -88,7 +88,7 @@
               </el-form-item>
             </el-col> -->
 
-            <el-col :xs="24" :sm="24" :lg="24">
+            <el-col :xs="24" :sm="24" :lg="18">
               <el-form-item label="" class="fr">
                 <el-button size="small" @click="resetFn">清空</el-button>
                 <el-button size="small" type="primary" @click="searchFn"
@@ -247,7 +247,7 @@ export default {
         endDeliverTime: "",
       }, //搜索表单
       listLoading: false, // 列表加载loading
-      examine: "全部",
+      examine: "",
       showSurrender: true,
       detailId: "",
       selectData: [],
@@ -271,6 +271,25 @@ export default {
     });
   },
   methods: {
+    //切换radio
+    changeRadioFn(v) {
+      this.examine = v;
+      this.getDataList({
+        pageSize: this.pageSize,
+        pageNum: this.currentPage,
+        confirmName: "",
+        createName: "",
+        customerKeyword: "",
+        endDeliverTime: "",
+        enginOrderNo: "",
+        enginOrderType: "",
+        examineStatus: this.examine,
+        refEnginRecordNo: "",
+        refProjectName: "",
+        refUseUnit: "",
+        startDeliverTime: "",
+      });
+    },
     //导出
     exportFn() {
       if (this.selectData.length) {
@@ -300,7 +319,7 @@ export default {
         createName: "",
         enginOrderNo: "",
         enginOrderType: "",
-        examineStatus: "",
+        examineStatus: this.examine,
         refUseUnit: "",
         ...this.searchForm,
       });

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

@@ -21,7 +21,7 @@
               <el-input
                 disabled
                 v-model="searchForm.billType"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -30,7 +30,7 @@
               <el-input
                 disabled
                 v-model="searchForm.code"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -39,7 +39,7 @@
               <el-input
                 disabled
                 v-model="searchForm.source"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -48,7 +48,7 @@
               <el-input
                 disabled
                 v-model="searchForm.theTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -57,7 +57,7 @@
               <el-input
                 disabled
                 v-model="searchForm.endTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -66,7 +66,7 @@
               <el-input
                 disabled
                 v-model="searchForm.totalAmount"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -75,7 +75,7 @@
               <el-input
                 disabled
                 v-model="searchForm.createBy"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -84,7 +84,7 @@
               <el-input
                 disabled
                 v-model="searchForm.createTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -93,7 +93,7 @@
               <el-input
                 disabled
                 v-model="searchForm.examineStatus"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -102,7 +102,7 @@
               <el-input
                 disabled
                 v-model="searchForm.remark"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>

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

@@ -192,36 +192,38 @@
         </el-table>
       </div>
     </div>
-
-    <span>审批记录</span>
-    <el-divider></el-divider>
-    <div class="diy-table-1">
-      <el-row :gutter="0">
-        <el-col :span="8" class="item">
-          <div class="label">审批人</div>
-          <div class="value">{{ this.examineBy }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">审批结果</div>
-          <div class="value">
-            <el-radio-group v-model="examineStatus">
-              <el-radio disabled label="OK">通过</el-radio>
-              <el-radio disabled label="FAIL">驳回</el-radio>
-            </el-radio-group>
-          </div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">审批时间</div>
-          <div class="value">{{ this.examineTime }}</div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">审批说明</div>
-          <div class="value">
-            {{ this.examineRemark }}
-          </div>
-        </el-col>
-      </el-row>
+    <div v-if="searchForm.examineStatus != '待审核'">
+      <span>审批记录</span>
+      <el-divider></el-divider>
+      <div class="diy-table-1">
+        <el-row :gutter="0">
+          <el-col :span="8" class="item">
+            <div class="label">审批人</div>
+            <div class="value">{{ this.examineBy }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">审批结果</div>
+            <div class="value">
+              <el-radio-group v-model="examineStatus">
+                <el-radio disabled label="OK">通过</el-radio>
+                <el-radio disabled label="FAIL">驳回</el-radio>
+              </el-radio-group>
+            </div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">审批时间</div>
+            <div class="value">{{ this.examineTime }}</div>
+          </el-col>
+          <el-col :span="24" class="item">
+            <div class="label">审批说明</div>
+            <div class="value">
+              {{ this.examineRemark }}
+            </div>
+          </el-col>
+        </el-row>
+      </div>
     </div>
+
     <br />
   </div>
 </template>
@@ -273,7 +275,12 @@ export default {
         theTime: res.data.theTime,
         endTime: res.data.endTime,
         totalAmount: res.data.totalAmount,
-        examineStatus: res.data.examineStatus == "OK" ? "已通过" : "驳回",
+        examineStatus:
+          res.data.examineStatus == "OK"
+            ? "已通过"
+            : res.data.examineStatus == "FAIL"
+            ? "不通过"
+            : "待审核",
         remark: res.data.remark,
       };
       this.dataList = res.data.items;

src/views/finance/receipt_list.vue

@@ -97,7 +97,11 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fr">
-          <el-button type="primary" size="small">导出</el-button>
+          <ExportButton
+            :exUrl="'/k3/receipt/export'"
+            :exParams="exParams"
+            class="exportClass"
+          />
         </div>
       </div>
       <!-- 列表 -->
@@ -118,7 +122,17 @@
               prop="billType"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                {{
+                  scope.row.billType == 1
+                    ? "收款单"
+                    : scope.row.billType == 2
+                    ? "退款单"
+                    : ""
+                }}
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="单据编码"
@@ -249,6 +263,16 @@
                 <el-button
                   type="text"
                   class="textColor"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    scope.row.status == 'C'
+                  "
+                  @click="NoExamineFn(scope.row.id)"
+                  >弃审</el-button
+                >
+                <el-button
+                  type="text"
+                  class="textColor"
                   @click="seeFn(scope.row.id)"
                   >查看</el-button
                 >
@@ -276,7 +300,11 @@
 </template>
 
 <script>
-import { getK3ReceiptList } from "@/api/finance/receipt_list";
+import {
+  getK3ReceiptList,
+  getK3ReceiptAbandon,
+  getK3ReceiptExport,
+} from "@/api/finance/receipt_list";
 import ReceiptListDetail from "./components/receipt_list-detail";
 export default {
   components: {
@@ -302,10 +330,23 @@ export default {
       detailId: null,
     };
   },
+  computed: {
+    exParams() {
+      return {
+        ...this.searchForm,
+      };
+    },
+  },
   created() {
     this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
   },
   methods: {
+    //弃审
+    async NoExamineFn(id) {
+      await getK3ReceiptAbandon({ id });
+      this.$message.success("弃审成功");
+      this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
+    },
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;