订单功能添加审核拒绝重新审核功能

src/api/hisStore/storeOrderAudit.js

@@ -26,3 +26,12 @@ export const auditBatch = (data) => {
     params: data
   })
 }
+
+// 
+export const auditAgain = (data) => {
+  return request({
+    url: '/store/store/storeOrderAudit/auditAgain',
+    method: 'post',
+    data: data
+  })
+}

src/views/hisStore/storeOrder/list.vue

@@ -153,7 +153,18 @@
                       :value="item.id"
                     />
             </el-select>
-        </el-form-item>
+          </el-form-item>
+         <!-- 审核状态 -->
+          <el-form-item label="审核状态" prop="auditStatus">
+            <el-select style="width:220px" v-model="queryParams.auditStatus" placeholder="请选择审核状态" clearable size="small" >
+            <el-option
+                    v-for="item in auditStatusOptions"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
+            />
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -186,6 +197,16 @@
               v-hasPermi="['store:storeOrder:exportItems']"
             >导出订单明细</el-button>
           </el-col>
+          <!-- 重新审核 -->
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              icon="el-icon-download"
+              size="mini"
+              @click="handleAuditAgain"
+              v-hasPermi="['store:storeOrderAudit:auditAgain']"
+            >重新提交审核</el-button>
+          </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
@@ -274,6 +295,12 @@
               <template slot-scope="scope">
                   <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
               </template>
+          </el-table-column>
+              <!-- 审核状态 -->
+          <el-table-column label="审核状态" align="center" prop="auditStatus" >
+              <template slot-scope="scope">
+                  <el-tag prop="status" v-for="(item, index) in auditStatusOptions"    v-if="scope.row.auditStatus==item.dictValue">{{item.dictLabel}}</el-tag>
+              </template>
           </el-table-column>
           <el-table-column label="运单号" align="center" prop="deliveryId" >
           </el-table-column>
@@ -481,11 +508,29 @@ import QRCode from 'qrcodejs2'
 import { treeselect } from "@/api/company/companyDept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { auditAgain } from "@/api/hisStore/storeOrderAudit";
 export default {
   components: { Treeselect,productOrder,productSelect,addUser,addUserAddress },
   name: "StoreOrder",
   data() {
     return {
+      auditStatusOptions : [
+      {
+        dictLabel: "待审批",
+        dictValue: 0,
+        type: ''
+      },
+      {
+        dictLabel: "审批拒绝",
+        dictValue: 1,
+        type: 'danger'
+      },
+      {
+        dictLabel: "审核通过",
+        dictValue: 4,
+        type: 'success'
+      }
+      ],
       // 部门树选项
       deptOptions: undefined,
       // 是否显示弹出层
@@ -603,7 +648,8 @@ export default {
         shippingType: null,
         isChannel: null,
         isRemind: null,
-        isSysDel: null
+        isSysDel: null,
+        auditStatus:null, // 审批状态
       },
       // 表单参数
       form: {
@@ -661,6 +707,22 @@ export default {
     this.getList();
   },
   methods: {
+    handleAuditAgain(){
+      if (this.ids.length !== 1) {
+        this.$message.warning("请选择一条数据进行重新提交审核");
+        return;
+      }
+
+      var data = {
+        orderId: this.ids[0],
+      }
+
+      auditAgain(data).then(response => {
+        this.$message.success("重新提交审核成功");
+        this.getList();
+        this.open = false;
+      });
+    },
      /** 查询部门下拉树结构 */
      getTreeselect() {
       treeselect().then((response) => {

src/views/hisStore/storeOrder/myList.vue

@@ -109,6 +109,17 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期">
         </el-date-picker>
+      </el-form-item>
+         <!-- 审核状态 -->
+      <el-form-item label="审核状态" prop="auditStatus">
+         <el-select style="width:220px" v-model="queryParams.auditStatus" placeholder="请选择审核状态" clearable size="small" >
+         <el-option
+                v-for="item in auditStatusOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+         />
+         </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -133,6 +144,16 @@
             @click="handleExportItems"
           v-hasPermi="['store:storeOrder:exportItems']"
         >导出订单明细</el-button>
+      </el-col>
+      <!-- 重新审核 -->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleAuditAgain"
+          v-hasPermi="['store:storeOrderAudit:auditAgain']"
+        >重新提交审核</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -202,6 +223,12 @@
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
+      </el-table-column>
+         <!-- 审核状态 -->
+      <el-table-column label="审核状态" align="center" prop="auditStatus" >
+          <template slot-scope="scope">
+              <el-tag prop="status" v-for="(item, index) in auditStatusOptions"    v-if="scope.row.auditStatus==item.dictValue">{{item.dictLabel}}</el-tag>
+          </template>
       </el-table-column>
       <el-table-column label="物流状态" align="center" prop="deliveryStatus" >
           <template slot-scope="scope">
@@ -257,12 +284,31 @@ import productSelect from "../components/productSelect";
 import addUser from "../components/addUser";
 import addUserAddress from "../components/addUserAddress";
 import config from "@/utils/config";
-import QRCode from 'qrcodejs2'
+import QRCode from 'qrcodejs2';
+import { auditAgain } from "@/api/hisStore/storeOrderAudit";
 export default {
   components: { productOrder,productSelect,addUser,addUserAddress },
   name: "StoreOrder",
   data() {
     return {
+      // 审核状态
+      auditStatusOptions : [
+      {
+        dictLabel: "待审批",
+        dictValue: 0,
+        type: ''
+      },
+      {
+        dictLabel: "审批拒绝",
+        dictValue: 1,
+        type: 'danger'
+      },
+      {
+        dictLabel: "审核通过",
+        dictValue: 4,
+        type: 'success'
+      }
+      ],
       deliveryPayStatusOptions:[],
       deliveryStatusOptions:[],
       dateRange: [],
@@ -369,7 +415,8 @@ export default {
         shippingType: null,
         isChannel: null,
         isRemind: null,
-        isSysDel: null
+        isSysDel: null,
+        auditStatus:null, // 审批状态
       },
       // 表单参数
       form: {
@@ -659,6 +706,22 @@ export default {
           this.download(response.msg);
         }).catch(function() {});
     },
+    handleAuditAgain(){
+        if (this.ids.length !== 1) {
+          this.$message.warning("请选择一条数据进行重新提交审核");
+          return;
+        }
+
+        var data = {
+          orderId: this.ids[0],
+        }
+
+        auditAgain(data).then(response => {
+          this.$message.success("重新提交审核成功");
+          this.getList();
+          this.open = false;
+        });
+      },
     handleExportItems() {
       if(this.queryParams.status=='00'){
         this.queryParams.status=null;