申请售后是否检查erp状态，聚水潭批量查询订单状态

src/api/hisStore/storeAfterSales.js

@@ -92,3 +92,12 @@ export function audit2(data) {
   })
 }
 
+// ERP订单异常状态确认
+export function confirmErpStatus(data) {
+  return request({
+    url: '/store/store/storeAfterSales/confirmErpStatus',
+    method: 'post',
+    data: data
+  })
+}
+

src/views/hisStore/components/productAfterSalesOrder.vue

@@ -14,9 +14,11 @@
         <div class="operate-container">
           <span style="margin-left: 20px" class="color-danger">售后状态：
             <el-tag prop="status" v-for="(item, index) in salesStatusOptions"    v-if="afterSales.salesStatus==item.dictValue">{{item.dictLabel}}</el-tag>
+            <el-tag v-if="afterSales.erpExceptionStatus === 1" type="danger" size="mini" style="margin-left: 8px;">erp订单状态异常</el-tag>
           </span>
           <div class="operate-button-container"  >
             <el-button size="mini"  v-hasPermi="['store:storeAfterSales:edit']" v-show="afterSales.salesStatus==0&&afterSales.status===1"  @click="addDelivery">编辑物流</el-button>
+            <el-button size="mini"  v-hasPermi="['store:storeAfterSales:edit']" v-show="afterSales.salesStatus==0&&afterSales.status===0&&afterSales.erpExceptionStatus===1" @click="handleConfirmErpStatus">ERP订单状态确认</el-button>
             <el-button size="mini"  v-hasPermi="['store:storeAfterSales:audit1']" v-show="afterSales.salesStatus==0&&afterSales.status===0" @click="handleAudit1">平台审核</el-button>
             <el-button size="mini"  v-hasPermi="['store:storeAfterSales:audit2']" v-show="afterSales.salesStatus==0&&afterSales.status===2" @click="handleAudit2">仓库审核</el-button>
             <el-button size="mini"  v-hasPermi="['store:storeAfterSales:refund']" @click="handleRefund"  v-show="afterSales.salesStatus==0&&afterSales.status===3">财务审核</el-button>
@@ -90,6 +92,9 @@
             <el-descriptions-item label="售后二级原因" v-if="afterSales!=null">
               <span>{{ afterSales.reasonValue2 || afterSales.reasonLevel2Text || '-' }}</span>
             </el-descriptions-item>
+            <el-descriptions-item label="ERP异常状态" v-if="afterSales!=null">
+              <span>{{ erpExceptionStatusText(afterSales.erpExceptionStatus) }}</span>
+            </el-descriptions-item>
 
         </el-descriptions>
         <div style="margin: 20px 0px">
@@ -274,7 +279,7 @@
 </template>
 
 <script>
-import {getStoreAfterSales,cancel,refund,audit1,audit2,updateStoreAfterSales,listRefundReason} from "@/api/hisStore/storeAfterSales";
+import {getStoreAfterSales,cancel,refund,audit1,audit2,updateStoreAfterSales,listRefundReason,confirmErpStatus} from "@/api/hisStore/storeAfterSales";
 
 import productOrder from "./productOrder";
 export default {
@@ -401,6 +406,34 @@ export default {
         this.$refs.productOrder.getOrder(orderId);
       }, 500);
     },
+    erpExceptionStatusText(status) {
+      if (status === 1) {
+        return '异常';
+      }
+      if (status === 2) {
+        return '已处理';
+      }
+      return '-';
+    },
+    handleConfirmErpStatus() {
+      const id = this.afterSales.id;
+      this.$confirm('请选择ERP订单状态确认结果', 'ERP订单状态确认', {
+        confirmButtonText: '通过',
+        cancelButtonText: '不通过',
+        distinguishCancelAndClose: true,
+        type: 'warning'
+      }).then(() => {
+        return confirmErpStatus({ salesId: id, erpExceptionStatus: 2 });
+      }).catch(action => {
+        if (action === 'cancel') {
+          return confirmErpStatus({ salesId: id, erpExceptionStatus: 1 });
+        }
+        return Promise.reject();
+      }).then(() => {
+        this.getStoreAfterSales(id);
+        this.msgSuccess('操作成功');
+      }).catch(() => {});
+    },
     handleAudit1(){
       var id=this.afterSales.id;
       this.$confirm('确定审请通过?', "警告", {

src/views/hisStore/storeAfterSales/index.vue

@@ -173,7 +173,7 @@
       </el-col>
 	    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table  height="500" border v-loading="loading" :data="storeAfterSalesList" @selection-change="handleSelectionChange">
+    <el-table  height="500" border v-loading="loading" :data="storeAfterSalesList" :row-class-name="tableRowClassName" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
@@ -417,6 +417,12 @@ export default {
       };
       this.resetForm("form");
     },
+    tableRowClassName({ row }) {
+      if (row.erpExceptionStatus === 1) {
+        return 'erp-exception-row';
+      }
+      return '';
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -525,3 +531,8 @@ export default {
   }
 };
 </script>
+<style scoped>
+::v-deep .el-table .erp-exception-row > td {
+  background-color: #fde2e2 !important;
+}
+</style>

src/views/system/config/config.vue

@@ -612,6 +612,33 @@
               inactive-color="#ff4949">
             </el-switch>
           </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="商城首页模块一展示" prop="enableHomeModuleOneShow" label-width="180px">
+                <el-switch
+                  v-model="form7.enableHomeModuleOneShow"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="商城首页模块二展示" prop="enableHomeModuleTwoShow" label-width="180px">
+                <el-switch
+                  v-model="form7.enableHomeModuleTwoShow"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="取消商城聚水潭订单校验" prop="cancelStoreJstOrderCheck">
+            <el-switch
+              v-model="form7.cancelStoreJstOrderCheck"
+              active-color="#13ce66"
+              inactive-color="#ff4949">
+            </el-switch>
+          </el-form-item>
 
           <el-form-item  label="年支付金额限制" prop="yearPayPrice">
             <el-input-number v-model="form7.yearPayPrice" :precision="2" :step="0.1"></el-input-number>