src/api/hisStore/storeOrder.js

@@ -386,3 +386,12 @@ export function healthExportShippingOrder(query) {
     params: query
   })
 }
+
+// 订单确认审核
+export function auditStoreOrder(data) {
+  return request({
+    url: '/store/store/storeOrder/batchAudit',
+    method: 'post',
+    data: data
+  })
+}

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -1083,6 +1083,7 @@ export default {
         { key: 'payRemain', label: '物流代收金额', checked: false },
         { key: 'createTime', label: '下单时间', checked: true },
         { key: 'payTime', label: '支付时间', checked: true },
+        { key: 'deliverySendTime', label: '发货时间', checked: false },
         { key: 'payType', label: '支付方式', checked: true },
         { key: 'status', label: '订单状态', checked: true },
         { key: 'barCode', label: '商品编码', checked: false },

src/views/hisStore/storeOrder/index.vue

@@ -272,6 +272,12 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+      <el-form-item label="是否审核" prop="isAudit">
+        <el-select   v-model="queryParams.isAudit" placeholder="请选择" clearable size="small" >
+          <el-option key="1"  label="是" value="1" />
+          <el-option key="0"  label="否" value="0" />
+        </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>
@@ -290,6 +296,17 @@
       <el-col :span="1.5">
             <el-button  plain type="info" icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['store:storeOrder:importExpress']">导入银行回单</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-s-check"
+          size="mini"
+          :disabled="multiple"
+          @click="handleOrderAudit"
+          v-hasPermi="['store:storeOrder:batchAudit']"
+        >确认审核
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
             type="warning"
@@ -552,6 +569,13 @@
           <span v-else class="no-products">暂无商品</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否审核" align="center" prop="isAudit" width="100px">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isAudit == 1 ? 'success' : 'info'" size="small">
+            {{ scope.row.isAudit == 1 ? '是' : '否' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="status" >
           <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>
@@ -1022,7 +1046,7 @@ import {
   getOrderItemsNum,
   importDeliveryNoteExpressTemplate, exportStoreOrderDetails, exportStoreOrderItemsDetails,getErpAccount,
   queryErpPhone,
-  saveErpPhone,editErpPhone,batchCreateErpOrder,batchSetErpOrder
+  saveErpPhone,editErpPhone,batchCreateErpOrder,batchSetErpOrder,auditStoreOrder
 } from '@/api/hisStore/storeOrder'
 import { getUserList } from "@/api/hisStore/user";
 import { getAddressList } from "@/api/hisStore/userAddress";
@@ -1135,6 +1159,7 @@ export default {
         { key: 'couponPrice', label: '优惠券金额', checked: false },
         { key: 'createTime', label: '下单时间', checked: true },
         { key: 'payTime', label: '支付时间', checked: true },
+        { key: 'deliverySendTime', label: '发货时间', checked: false },
         { key: 'payType', label: '支付方式', checked: true },
         { key: 'status', label: '订单状态', checked: true },
         { key: 'barCode', label: '商品编码', checked: false },
@@ -1144,7 +1169,7 @@ export default {
         { key: 'deliveryName', label: '快递公司', checked: false },
         { key: 'deliveryId', label: '快递单号', checked: false },
         { key: 'remark', label: '备注', checked: false },
-
+        { key: 'isAudit', label: '是否审核', checked: false },
       ],
 
       itemlist : [],
@@ -1268,6 +1293,7 @@ export default {
         deptId:null,
         isUpload:null,
         productName:null,
+        isAudit:null,
       },
       // 表单参数
       form: {
@@ -2301,6 +2327,26 @@ export default {
       }).catch(() => {
       });
     },
+
+    /** 订单确认审核 */
+    handleOrderAudit(){
+      if (this.ids.length === 0) {
+        this.$message.warning('请至少勾选一条订单进行审核');
+        return;
+      }
+      this.$confirm('是否确认审核选中的订单?', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return auditStoreOrder({ orderIds: this.ids, isAudit: 1 });
+      }).then((response) => {
+        this.getList();
+        this.msgSuccess(response.msg || "审核成功");
+      }).catch(() => {
+      });
+    },
+
     /** 导出按钮操作 */
     handleOrderExport() {
       // 打开字段选择对话框
@@ -2484,6 +2530,7 @@ export default {
     // 提交发货单
     submitDeliveryNote() {
       const uploadFiles = this.$refs.upload.uploadFiles;
+      console.log(uploadFiles)
       if (uploadFiles.length === 0) {
         this.$message.error('请选择要上传的文件');
         return;