1

src/views/base/auditing-list.vue

@@ -40,6 +40,16 @@
       <el-form-item label="供应商" prop="cvenName">
         <el-input type="text" size="mini" v-model="queryModel.cvenName"></el-input>
       </el-form-item>
+      <el-form-item label="审核时间" prop="updateTime">
+        <el-date-picker
+          type="daterange"
+          size="mini"
+          v-model="queryModel.updateTime"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="审核状态" prop="state">
         <el-select
           v-model="queryModel.state"
@@ -86,6 +96,7 @@
       <el-table-column prop="workflowDetailName" label="工作流程" width="180"></el-table-column>
       <el-table-column prop="cpbvCode" label="发票号" width="180"></el-table-column>
       <el-table-column prop="cvenName" label="供应商" width="380"></el-table-column>
+      <el-table-column prop="updateTime" label="审核时间" width="180"></el-table-column>
       <el-table-column prop="stateName" label="审核状态" width="180"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
@@ -93,7 +104,7 @@
           <!-- <el-button size="mini" type="primary" @click="handleFPRZD(row)">发票入账单</el-button> -->
           <el-button v-if="row.state == 2 && row.isPrinted" size="mini" type="info" @click="handleBilling(row)">发票入账单</el-button>
           <el-button v-if="row.state == 2 && !row.isPrinted" size="mini" type="success" @click="handleBilling(row)">发票入账单</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row)">撤回</el-button>
+          <el-button v-if="row.state == 1 && row.isRecall" size="mini" type="danger" @click="handleDelete(row)">撤回</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -139,6 +150,7 @@ export default {
         workflowDetailId: "",
         cpbvCode: "",
         cvenName: "",
+        updateTime: "",
         state: "",
       },
       loading: false,
@@ -174,6 +186,7 @@ export default {
       formData.append("workflowDetailId", self.queryModel.workflowDetailId);
       formData.append("cpbvCode", self.queryModel.cpbvCode);
       formData.append("cvenName", self.queryModel.cvenName);
+      formData.append("updateTime", self.queryModel.updateTime);
       formData.append("state", self.queryModel.state);
 
       if (this.field != null) {
@@ -261,26 +274,12 @@ export default {
     handleDelete(record) {
       var self = this;
 
-      self
-        .$confirm("是否确认撤回?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-        .then(() => {
-          // auditingApi.remove(record.id).then(function (response) {
-          //   var jsonData = response.data;
-
-          //   if (jsonData.result) {
-          //     self.changePage(self.pageIndex);
-
-          //     self.$message({
-          //       type: "success",
-          //       message: "撤回成功!",
-          //     });
-          //   }
-          // });
-
+      self.$confirm("是否确认撤回?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+      .then(() => {
         var formData = new FormData();
         formData.append("auditingId", record.id);
         formData.append("opinion", "数据错误，撤回。");

src/views/base/auditing-next.vue

@@ -60,11 +60,11 @@ export default {
   },
   methods: {
     closeDialog() {
-      this.$emit("close", false);
+      this.$emit("close", "0");
     },
     handleSubmit() {
       var self = this;
-      
+
       var formData = new FormData();
       formData.append("auditingId", self.businessKey);
       formData.append("opinion", self.opinion);
@@ -75,10 +75,15 @@ export default {
 
         if (jsonData.result) {
           self.$message({message: "提交成功!", type: "success"});
-          self.$emit("close", true);
+          if(jsonData.data){
+            self.$emit("close", "3");
+          }
+          else{
+            self.$emit("close", "1");
+          }
         } else {
           self.$message({message: jsonData.message + "",type: "warning"});
-          self.$emit("close", false);
+          self.$emit("close", "0");
         }
       })
       .catch((error) => {
@@ -98,10 +103,10 @@ export default {
 
         if (jsonData.result) {
           self.$message({message: "驳回成功!", type: "success"});
-          self.$emit("close", true);
+          self.$emit("close", "2");
         } else {
           self.$message({message: jsonData.message + "",type: "warning"});
-          self.$emit("close", false);
+          self.$emit("close", "0");
         }
       })
       .catch((error) => {

src/views/base/auditing-pending.vue

@@ -35,11 +35,18 @@
       :title="modalTitle"
       @close="onDetailModalClose"
     ></auditing-next>
+    <auditing-billing
+      v-if="showBilling"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalCloseEx"
+    ></auditing-billing>
   </div>
 </template>
 <script>
 import Constant from "@/constant";
 import AuditingDetail from "./auditing-detail";
+import AuditingBilling from "./auditing-billing";
 import AuditingNext from "./auditing-next";
 import auditingApi from "@/api/base/auditing";
 import workflowDetailApi from "@/api/base/workflowDetail";
@@ -59,8 +66,10 @@ export default {
       totalElements: 0,
       pageSizeList: [10, 20, 30],
       showNext: false,
+      showBilling: false,
       modalTitle: "",
       businessKey: "",
+      printId: "",
     };
   },
   methods: {
@@ -95,21 +104,35 @@ export default {
       this.modalTitle = "审核";
       this.businessKey = record.id;
       this.showNext = true;
+      this.printId = record.id;
     },
     onDetailModalClose(refreshed) {
       //保存成功后回调
       this.showNext = false;
 
-      if (refreshed) {
+      if (refreshed == "1" || refreshed == "2") {
+        this.changePage(this.pageIndex);
+      }
+
+      if (refreshed == "3") {
         this.changePage(this.pageIndex);
+
+        this.modalTitle = "发票入账单";
+        this.businessKey = this.printId;
+        this.showBilling = true;
       }
     },
+    onDetailModalCloseEx(refreshed) {
+      //保存成功后回调
+      this.showBilling = false;
+    },
   },
   mounted: function () {
     this.changePage(1);
   },
   components: {
     "auditing-next": AuditingNext,
+    "auditing-billing": AuditingBilling,
   },
 };
 </script>