优化

src/views/audit/store/components/storeTag.vue

@@ -0,0 +1,28 @@
+<template>
+  <span v-if="propValue > 0 && propValue < 100" class="color01">{{ propValue }}</span>
+  <span v-else-if="propValue <= 0" class="color02">{{ propValue }}</span>
+  <span v-else>{{ propValue }}</span>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import VueViews from '@/benyun/compVue/VueViews'
+@Component({components:{}})
+export default class StoreTag extends VueViews {
+
+  @Watch('propValue')
+  propValueChange(v:any){
+    
+  }
+
+}
+</script>
+
+<style scoped>
+.color01{
+  color: coral;
+}
+.color02{
+  color: red;
+}
+</style>

src/views/audit/store/index.vue

@@ -12,6 +12,7 @@
 	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 	import api from "@/api/currency";
 	import batchbyOneModal from './components/batchbyOneModal.vue'
+	import storeTag from './components/storeTag.vue'
 	@Component({components:{batchbyOneModal}})
 	export default class Store extends Vue {
 		timeNum = 0;
@@ -206,6 +207,7 @@
 								// width: '150px',
 								title: v.name,
 								field: 'custom' + i,
+								component:storeTag
 							});
 						});
 						(this as any).$refs.moduleView.setTableConfig(moduleConfig);

src/views/oms/B2BOrder/components/orderTable.vue

@@ -20,10 +20,10 @@
       </template>
     </vxe-column>
     <vxe-column field="rawSourceId" title="线上订单号" width="140"> </vxe-column>
-    <vxe-column field="isSubmitted" title="提交状态" width="100">
+    <vxe-column field="isSubmitted" title="审核状态" width="100">
       <template #default="{ row }">
-        <el-tag v-if="row.isSubmitted == 1" size="small">已提交</el-tag>
-        <el-tag v-else type="warning" size="small"> 未提交 </el-tag>
+        <el-tag v-if="row.isSubmitted == 1" size="small">已审核</el-tag>
+        <el-tag v-else type="warning" size="small"> 未审核 </el-tag>
       </template>
     </vxe-column>
     <vxe-column field="product" title="商品" width="140">
@@ -133,7 +133,7 @@
         <el-button type="text" size="mini" v-if="showMerge(row)" @click="mergeHandle(row)">合并</el-button>
         <el-button type="text" size="mini" v-if="showSplit(row)" @click="splitHandle(row)">拆分</el-button>
         <!-- <el-button type="text" size="mini" v-if="showSend(row)" @click="sendGoods(row)">发货</el-button> -->
-        <el-button type="text" size="mini" v-if="row.status == 'Delivering'  || row.status == 'Sent'" @click="sendGoodsDetail(row)">发货明细</el-button>
+        <el-button type="text" size="mini" v-if="(row.status == 'Delivering'  || row.status == 'Sent') && row.isSubmitted == 1" @click="sendGoodsDetail(row)">发货明细</el-button>
       </template>
     </vxe-column>
   </vxe-table>

src/views/oms/B2BOrder/components/orderTool.vue

@@ -10,9 +10,9 @@
     <el-button type="text" @click="handle('importOrder')">导入订单</el-button>
     <div class="split"></div>
     <el-dropdown split-button type="text" @click="handle('smt')" @command="handleCommand">
-        提交
+        审核
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item command="reSmt">反提交</el-dropdown-item>
+        <el-dropdown-item command="reSmt">反审核</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
     <!-- <el-button type="text">设快递</el-button>

src/views/oms/B2BOrder/index.vue

@@ -31,7 +31,7 @@
               </div>
             </template>
           </order-checkbox>
-          <order-radio title="提交状态" keyName="isSubmitted" ref="searchComsubmitStatus" :options="submitOption" noLimit @radioChange="onChangeSmt" />
+          <order-radio title="审核状态" keyName="isSubmitted" ref="searchComsubmitStatus" :options="submitOption" noLimit @radioChange="onChangeSmt" />
           <order-radio title="买家留言" keyName="buyerMessageFilter" ref="searchCom05" :options="buyerMessageOptions" noLimit @radioChange="onChange($event,'buyerMessageFilter')">
             <template v-slot:buyerMessage>
               <el-input style="width: 140px;" v-model="value.buyerMessageContent" size="mini" placeholder="留言内容"></el-input>
@@ -420,10 +420,10 @@ export default class Order extends Vue {
 
   //审批状态
   submitOption:Array<any>=[{
-    label:'未提交',
+    label:'未审核',
     value:0
   },{
-    label:'已提交',
+    label:'已审核',
     value:1
   }]
 
@@ -492,6 +492,7 @@ export default class Order extends Vue {
     this.getList();
     this.getProvince();
     this.getQuestionList();
+    this.getQuesttion();
   }
   //自动拆分
   autoSplit(){
@@ -871,7 +872,7 @@ export default class Order extends Vue {
     }
     if(msg){
       this.$message({
-        message:'订单“'+msg + '”未提交，不能生成采购单！'
+        message:'订单“'+msg + '”未审核，不能生成采购单！'
       })
       return
     }
@@ -972,13 +973,13 @@ export default class Order extends Vue {
     }
     if(smtMst){
       this.$message({
-        message:'订单“'+smtMst + '”已提交，不能重复操作！'
+        message:'订单“'+smtMst + '”已审核，不能重复操作！'
       })
       return
     }
     if(msg){
       this.$message({
-        message:'订单“'+msg + '”未付款，不能提交！'
+        message:'订单“'+msg + '”未付款，不能审核！'
       })
       return
     }
@@ -988,7 +989,7 @@ export default class Order extends Vue {
     }).then((res:any) => {
       this.load = false;
         (this as any).$message({
-          message: res.msg?res.msg:'订单提交成功！',
+          message: res.msg?res.msg:'订单审核成功！',
           type: 'success'
         });
       this.getList();
@@ -1014,7 +1015,7 @@ export default class Order extends Vue {
     }
     if(smtMst){
       this.$message({
-        message:'订单“'+smtMst + '”未提交，不能进行此操作！'
+        message:'订单“'+smtMst + '”未审核，不能进行此操作！'
       })
       return
     }
@@ -1024,7 +1025,7 @@ export default class Order extends Vue {
     }).then((res:any) => {
       this.load = false;
         (this as any).$message({
-          message: res.msg?res.msg:'订单取消提交成功！',
+          message: res.msg?res.msg:'订单取消审核成功！',
           type: 'success'
         });
       this.getList();
@@ -1138,6 +1139,28 @@ export default class Order extends Vue {
       this.load = false;
     })
   }
+  //获取订单异常并提示
+  getQuesttion(){
+    let params:any={};
+    params.pageNo = 1;
+    params.pageSize = 200;
+    let data={
+      statusList: [ "Question"],
+      businessType: "B2B"
+    }
+    this.load = true;
+    query(params,data).then((res:any) => {
+      if(res.data.total > 0){
+        this.$notify.error({
+          title: '提示',
+          message: '有'+res.data.total+'条订单出现异常，请及时查看！',
+          position: 'bottom-right'
+        });
+      }
+    }).catch((err:any) => {
+      this.load = false;
+    })
+  }
   //订单操作成功刷新页面
   handleSuccess(){
     this.page.pageNo = 1;

src/views/oms/B2COrder/components/orderTable.vue

@@ -20,10 +20,10 @@
       </template>
     </vxe-column>
     <vxe-column field="rawSourceId" title="线上订单号" width="140"> </vxe-column>
-    <vxe-column field="isSubmitted" title="提交状态" width="100">
+    <vxe-column field="isSubmitted" title="审核状态" width="100">
       <template #default="{ row }">
-        <el-tag v-if="row.isSubmitted == 1" size="small">已提交</el-tag>
-        <el-tag v-else type="warning" size="small"> 未提交 </el-tag>
+        <el-tag v-if="row.isSubmitted == 1" size="small">已审核</el-tag>
+        <el-tag v-else type="warning" size="small"> 未审核 </el-tag>
       </template>
     </vxe-column>
     <vxe-column field="product" title="商品" width="140">
@@ -129,7 +129,7 @@
         <!-- <el-button type="text" size="mini" v-if="showMerge(row)" @click="mergeHandle(row)">合并</el-button>
         <el-button type="text" size="mini" v-if="showSplit(row)" @click="splitHandle(row)">拆分</el-button> -->
         <!-- <el-button type="text" size="mini" v-if="showSend(row)" @click="sendGoods(row)">发货</el-button> -->
-        <el-button type="text" size="mini" v-if="row.status == 'Delivering'  || row.status == 'Sent'" @click="sendGoodsDetail(row)">发货明细</el-button>
+        <el-button type="text" size="mini" v-if="(row.status == 'Delivering'  || row.status == 'Sent') && row.isSubmitted == 1" @click="sendGoodsDetail(row)">发货明细</el-button>
       </template>
     </vxe-column>
   </vxe-table>

src/views/oms/B2COrder/components/orderTool.vue

@@ -11,9 +11,9 @@
     <!-- <el-button type="text" @click="handle('addOrder')">新增订单</el-button> -->
     <div class="split"></div>
     <el-dropdown split-button type="text" @click="handle('smt')" @command="handleCommand">
-        提交
+        审核
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item command="reSmt">反提交</el-dropdown-item>
+        <el-dropdown-item command="reSmt">反审核</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
     <!-- <el-button type="text">设快递</el-button>

src/views/oms/B2COrder/index.vue

@@ -31,7 +31,7 @@
               </div>
             </template>
           </order-checkbox>
-          <order-radio title="提交状态" keyName="isSubmitted" ref="searchComsubmitStatus" :options="submitOption" noLimit @radioChange="onChangeSmt" />
+          <order-radio title="审核状态" keyName="isSubmitted" ref="searchComsubmitStatus" :options="submitOption" noLimit @radioChange="onChangeSmt" />
           <order-radio title="买家留言" keyName="buyerMessageFilter" ref="searchCom05" :options="buyerMessageOptions" noLimit @radioChange="onChange($event,'buyerMessageFilter')">
             <template v-slot:buyerMessage>
               <el-input style="width: 140px;" v-model="value.buyerMessageContent" size="mini" placeholder="留言内容"></el-input>
@@ -398,10 +398,10 @@ export default class Order extends Vue {
 
   //审批状态
   submitOption:Array<any>=[{
-    label:'未提交',
+    label:'未审核',
     value:0
   },{
-    label:'已提交',
+    label:'已审核',
     value:1
   }]
 
@@ -470,6 +470,29 @@ export default class Order extends Vue {
     this.getList();
     this.getProvince();
     this.getQuestionList();
+    this.getQuesttion();
+  }
+  //获取订单异常并提示
+  getQuesttion(){
+    let params:any={};
+    params.pageNo = 1;
+    params.pageSize = 200;
+    let data={
+      statusList: [ "Question"],
+      businessType: "B2B"
+    }
+    this.load = true;
+    query(params,data).then((res:any) => {
+      if(res.data.total > 0){
+        this.$notify.error({
+          title: '提示',
+          message: '有'+res.data.total+'条订单出现异常，请及时查看！',
+          position: 'bottom-right'
+        });
+      }
+    }).catch((err:any) => {
+      this.load = false;
+    })
   }
   //上传excel
   importOrder(){
@@ -771,7 +794,7 @@ export default class Order extends Vue {
     }
     if(msg){
       this.$message({
-        message:'订单“'+msg + '”未提交，不能生成采购单！'
+        message:'订单“'+msg + '”未审核，不能生成采购单！'
       })
       return
     }
@@ -872,13 +895,13 @@ export default class Order extends Vue {
     }
     if(smtMst){
       this.$message({
-        message:'订单“'+smtMst + '”已提交，不能重复操作！'
+        message:'订单“'+smtMst + '”已审核，不能重复操作！'
       })
       return
     }
     if(msg){
       this.$message({
-        message:'订单“'+msg + '”未付款，不能提交！'
+        message:'订单“'+msg + '”未付款，不能审核！'
       })
       return
     }
@@ -888,7 +911,7 @@ export default class Order extends Vue {
     }).then((res:any) => {
       this.load = false;
         (this as any).$message({
-          message: res.msg?res.msg:'订单提交成功！',
+          message: res.msg?res.msg:'订单审核成功！',
           type: 'success'
         });
       this.getList();
@@ -914,7 +937,7 @@ export default class Order extends Vue {
     }
     if(smtMst){
       this.$message({
-        message:'订单“'+smtMst + '”未提交，不能进行此操作！'
+        message:'订单“'+smtMst + '”未审核，不能进行此操作！'
       })
       return
     }
@@ -924,7 +947,7 @@ export default class Order extends Vue {
     }).then((res:any) => {
       this.load = false;
         (this as any).$message({
-          message: res.msg?res.msg:'订单取消提交成功！',
+          message: res.msg?res.msg:'订单取消审核成功！',
           type: 'success'
         });
       this.getList();