审核功能

src/api/hisStore/storeOrderAudit.js

@@ -21,7 +21,7 @@ export const audit = (data) => {
 // 批量审核
 export const auditBatch = (data) => {
   return request({
-    url: '/store/storeOrderAudit/auditBatch',
+    url: '/store/store/storeOrderAudit/auditBatch',
     method: 'get',
     params: data
   })

src/views/hisStore/storeOrderAudit/audit.vue

@@ -13,6 +13,18 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="订单号" prop="orderCode">
+            <el-input
+            style="width:220px"
+              v-model="queryParams.orderCode"
+              placeholder="请输入订单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="收件人" prop="realName">
             <el-input
@@ -37,23 +49,13 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="createTimeRange">
-            <el-date-picker
-            style="width:220px"
-              clearable size="small"
-              v-model="createTimeRange"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
+        
 
       </el-row>
 
-       <el-row :gutter="20">
+
+      
+      <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="订单金额" prop="orderAmountRange">
             <el-input
@@ -88,11 +90,21 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="审核时间" prop="auditRange">
+          
+        </el-col>
+        <el-col :span="6">
+          
+        </el-col>
+
+      </el-row>
+
+      <el-row :gutter="20"> 
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="createTimeRange">
             <el-date-picker
             style="width:220px"
               clearable size="small"
-              v-model="auditRange"
+              v-model="createTimeRange"
               type="daterange"
               value-format="yyyy-MM-dd"
               start-placeholder="开始日期"
@@ -101,20 +113,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label="审核时间" prop="auditTimeRange">
+            <el-date-picker
+            style="width:220px"
+              clearable size="small"
+              v-model="auditTimeRange"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           
         </el-col>
-
+        <el-col :span="6">
+          <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>
+          </el-form-item>
+        </el-col>
       </el-row>
-      
-      
-      
-      
-      <!-- 订单金额 范围两个输入 -->
-      
-      <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>
-      </el-form-item>
+
     </el-form>
 
     <!-- 使用 el-row 布局将 tabs 和 批量操作按钮放在同一行 -->
@@ -156,11 +175,11 @@
     class="scrollable-table"
     @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" fixed="left"></el-table-column>
-      <el-table-column label="订单号" align="center" prop="orderCode" width="200" fixed="left" />
+      <el-table-column type="selection" width="55" ></el-table-column>
+      <el-table-column label="订单号" align="center" prop="orderCode" width="180"  />
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="所属员工" align="center" prop="companyUserName" />
-      <el-table-column label="审核状态" align="center" prop="status" width="150">
+      <el-table-column label="审核状态" align="center" prop="status" width="100">
         <template slot-scope="scope">
           <el-tag prop="status" v-for="item in statusOptions"
                   :type="item.type"
@@ -169,7 +188,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="订单类型" align="center" prop="orderType" width="150" >
+      <el-table-column label="订单类型" align="center" prop="orderType" width="100" >
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in orderTypeOptions"    v-if="scope.row.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
@@ -186,14 +205,14 @@
           {{ scope.row.totalPrice ? parseFloat(scope.row.totalPrice).toFixed(2) : '0.00' }}
         </template>
       </el-table-column>
-      <el-table-column label="手机号" align="center" prop="userPhone"  width="150"/>
-      <el-table-column label="审核时间" align="center" prop="companyAuditTime"  width="180"/>
+      <el-table-column label="手机号" align="center" prop="userPhone"  width="120"/>
+      <el-table-column label="审核时间" align="center" prop="companyAuditTime"  width="160"/>
       <el-table-column label="审核人" align="center" prop="companyAuditUserName" />
       <!-- <el-table-column label="总后台审核时间" align="center" prop="adminAuditTime" />
       <el-table-column label="总后台审核人" align="center" prop="adminAuditUserName" /> -->
       <el-table-column label="被拒原因" align="center" prop="reason" show-overflow-tooltip />
       <!-- <el-table-column label="提交时间" align="center" prop="createTime" /> -->
-      <el-table-column label="创建时间" align="center" prop="orderCreateTime" width="180"/>
+      <el-table-column label="创建时间" align="center" prop="orderCreateTime" width="160"/>
       <el-table-column label="操作" fixed="right" align="center" width="80" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-popover
@@ -304,7 +323,7 @@ export default {
       selectedRows: [], // 添加这行来存储选中的行
        batchAuditDialogVisible: false, // 批量审核对话框显示控制
       createTimeRange:[],
-      auditRange:[], // 审核时间
+      auditTimeRange:[], // 审核时间
       orderTypeOptions:[], // 订单类型
       activeName: '00',
       loading: false,
@@ -343,6 +362,7 @@ export default {
       // 这里需要调用批量审核接口，假设有一个批量审核的API
       
         const ids = this.selectedRows.map(item => item.id).join(",");
+        console.log("批量审核订单IDs:", ids);
   
       // 示例：调用批量审核API
       auditBatch({ids}).then(response => {
@@ -384,6 +404,11 @@ export default {
       this.createTimeRange = [];
       this.queryParams.beginTime = null;
       this.queryParams.endTime = null;
+      this.auditTimeRange = [];
+      this.queryParams.auditBeginTime = null;
+      this.queryParams.auditEndTime = null;
+
+
       
       // 手动重置订单金额范围
       this.queryParams.orderAmountSmall = null;
@@ -393,13 +418,15 @@ export default {
     },
     getList() {
       this.loading = true
+      console.log("+++++++++++++++++"+this.createTimeRange)
+      console.log("+++++++++++++++++"+this.auditTimeRange)
       if(this.createTimeRange!=null&&this.createTimeRange.length==2){
         this.queryParams.beginTime=this.createTimeRange[0]
         this.queryParams.endTime=this.createTimeRange[1]
       }
-      if(this.auditRange!=null&&this.auditRange.length==2){
-        this.queryParams.auditBeginTime=this.auditRange[0]
-        this.queryParams.auditEndTime=this.auditRange[1]
+      if(this.auditTimeRange!=null&&this.auditTimeRange.length==2){
+        this.queryParams.auditBeginTime=this.auditTimeRange[0]
+        this.queryParams.auditEndTime=this.auditTimeRange[1]
       }
       list(this.queryParams).then(response => {
         const {rows, total} = response