oms订单优化

src/views/audit/synchronous/components/synchronousOrderModal.vue

@@ -86,6 +86,8 @@
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import { pullItem } from '@/api/maindataMaterialRelevancy'
+import { query } from '@/api/shop'
+
 @Component
 export default class SynchronousOrderModal extends Vue {
   load = false;
@@ -93,10 +95,12 @@ export default class SynchronousOrderModal extends Vue {
   type=1;
   shopName = '';
   shopId:any = null;
-  shopOptions=[{
-    label:'犇云聚水潭店铺',
-    value:2
-  }]
+  shopOptions:Array<any>=[
+    // {
+    // label:'犇云聚水潭店铺',
+    // value:2
+    // }
+  ]
   skus=''; //skus
   styles=''; //款式编码
   dateType:any=null;
@@ -216,6 +220,29 @@ export default class SynchronousOrderModal extends Vue {
     this.time = null;
     this.styles = '';
   }
+  getShopList() {
+    this.shopOptions = []
+    this.load = true
+    query({
+      pageNo: 1,
+      pageSize: 50
+    }).then((res:any) => {
+      this.load = false
+      if (res.data && res.data.records) {
+        for(const item of res.data.records) {
+          this.shopOptions.push({
+            label: item.shopName,
+            value: item.shopId
+          })
+        }
+      }
+    }).catch(()=>{
+      this.load = false
+    })
+  }
+  created() {
+    this.getShopList()
+  }
 }
 </script>
 

src/views/login.vue

@@ -84,8 +84,8 @@ export default {
       }],
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         // tenantId:'',
         code: "",

src/views/oms/order/components/addOrder.vue

@@ -6,12 +6,12 @@
     </template>
     <template #default>
       <div class="order-step" v-if="orderValue.id">
-        <el-steps :active="stepActive" align-center finish-status="success" v-if="stepCon.indexOf(orderValue.status) >= 0" size="mini">
+        <el-steps :active="stepActive" align-center finish-status="success" v-if="topStep.indexOf(orderValue.status) >= 0" size="mini">
           <el-step title="1.待付款"></el-step>
           <el-step title="2.已付款待审核"></el-step>
-          <el-step title="3.已客审待财审"></el-step>
-          <el-step title="4.等供销商|外仓发货"></el-step>
-          <el-step title="5.已发货"></el-step>
+          <!-- <el-step title="3.已客审待财审"></el-step>
+          <el-step title="4.等供销商|外仓发货"></el-step> -->
+          <el-step title="3.发货中"></el-step>
         </el-steps>
         <div class="other" v-if="stepTypeName(orderValue.status)">{{ stepTypeName(orderValue.status) }}</div>
       </div>
@@ -198,6 +198,7 @@ export default class AddOrder extends Vue {
   orderValue:any={}; //新增订单值
   radioPay=1;
   stepActive:number=0;
+  topStep=['WaitPay','WaitConfirm','Delivering']
   stepCon=['WaitPay','WaitConfirm','WaitFConfirm','WaitOuterSent','Sent','Delivering']
   activeNames:Array<any> =['1','2','3','4','5','save'];
   sourceFrom:any={
@@ -1531,6 +1532,8 @@ export default class AddOrder extends Vue {
         this.$emit('handleSuccess');
       }).catch((err:any) => {
         this.load = false;
+      }).catch(()=>{
+        this.load = false
       })
     }).catch((err:any) => {})
   }

src/views/oms/order/components/cancelOrderModel.vue

@@ -42,6 +42,9 @@ export default class CancelOrderModel extends Vue {
   },{
     value: '重复订单',
     label: '重复订单'
+  },{
+    value: '其他',
+    label: '其他'
   }];
   type= ''
   setShow(v:boolean){

src/views/oms/order/components/deliveryGoodsInfo.vue

@@ -284,6 +284,7 @@ export default class DeliveryGoodsInfo extends Vue {
           attr:{
             placeholder:'请选择仓库',
             clearable:true,
+            defaultIndex:0,
             retConfig:{
               tmsShipmentProvince: 'province',
               tmsShipmentProvinceNo:'provinceCode',

src/views/oms/order/components/loadOrderModal.vue

@@ -33,19 +33,7 @@
         </div>
       </template>
       <template v-if="type == 2">
-        <div class="cont">
-          <div class="title"><span>* </span>订单状态：</div>
-          <div class="right-cont">
-            <el-select v-model="status" size="mini" style="width:100%" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in statusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
+        
         <div class="cont">
           <div class="title"><span>* </span>时间类型：</div>
           <div class="right-cont">
@@ -76,6 +64,19 @@
             </el-date-picker>
           </div>
         </div>
+        <div class="cont">
+          <div class="title">订单状态：</div>
+          <div class="right-cont">
+            <el-select v-model="status" size="mini" style="width:100%" placeholder="请选择" clearable>
+              <el-option
+                v-for="item in statusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
       </template>
       <!-- <template v-if="type == 3">
         <div class="cont">
@@ -106,17 +107,20 @@
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import { pullOrder } from '@/api/omsOrder'
+import { query } from '@/api/shop'
 @Component
 export default class LoadOrderModal extends Vue {
   load = false;
   value = false;
   type=1;
-  shopName = '犇云聚水潭店铺';
-  shopId:any = 2;
-  shopOptions=[{
-    label:'犇云聚水潭店铺',
-    value:2
-  }]
+  shopName = '';
+  shopId:any = null;
+  shopOptions:Array<any>=[
+    // {
+    // label:'犇云聚水潭店铺',
+    // value:2
+    // }
+  ]
   sourceIds=''; //线上订单号
   dateType:any='';
   dateTypeOptions=[{
@@ -214,15 +218,14 @@ export default class LoadOrderModal extends Vue {
           break
         }
       }
-      if(!this.status){
-        if(msg){
-          msg = msg + '，订单状态'
-        }else{
-          msg = '订单状态'
-        }
-      }
+      // if(!this.status){
+      //   if(msg){
+      //     msg = msg + '，订单状态'
+      //   }else{
+      //     msg = '订单状态'
+      //   }
+      // }
       value.status = this.status;
-      // if(Number(this.dateType) > 5 || Number(this.dateType) < 1){
       if(!isS){
         if(msg){
           msg = msg + '，时间类型'
@@ -241,16 +244,6 @@ export default class LoadOrderModal extends Vue {
       value.beginDate = this.beginDate;
       value.endDate = this.endDate;
     }
-    // else if(this.type == 3){
-    //   if(!this.status){
-    //     if(msg){
-    //       msg = msg + '，订单状态'
-    //     }else{
-    //       msg = '订单状态'
-    //     }
-    //   }
-    //   value.status = this.status;
-    // }
     if(msg){
       this.$message({
         message:msg + '不能为空！',
@@ -292,6 +285,29 @@ export default class LoadOrderModal extends Vue {
     this.time = null;
     this.status = '';
   }
+  getShopList() {
+    this.shopOptions = []
+    this.load = true
+    query({
+      pageNo: 1,
+      pageSize: 50
+    }).then((res:any) => {
+      this.load = false
+      if (res.data && res.data.records) {
+        for(const item of res.data.records) {
+          this.shopOptions.push({
+            label: item.shopName,
+            value: item.shopId
+          })
+        }
+      }
+    }).catch(()=>{
+      this.load = false
+    })
+  }
+  created() {
+    this.getShopList()
+  }
 }
 </script>
 

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

@@ -65,6 +65,11 @@
         {{ getFromText(row.sourceFrom) }}
       </template>
     </vxe-column>
+    <vxe-column field="orderDate" title="订单日期" width="140">
+      <!-- <template #default="{ row }">
+        {{ formatDate(row.orderDate) }}
+      </template> -->
+    </vxe-column>
     <!-- <vxe-column field="shipment" title="跨境买家指定物流" width="120"></vxe-column> -->
     <vxe-column field="chosenChannel" title="实发快递渠道" width="120"></vxe-column>
     <vxe-column field="logisticsId" title="快递单号" width="120"></vxe-column>
@@ -113,11 +118,6 @@
     <!-- <vxe-column field="buyerTaxNo" title="发票税号" width="120"></vxe-column> -->
     <!-- <vxe-column field="drpCoIdFrom" title="分销商编号" width="120"></vxe-column>
     <vxe-column field="drpCoIdTo" title="供销商编号" width="120"></vxe-column> -->
-    <vxe-column field="orderDate" title="订单日期" width="120">
-      <template #default="{ row }">
-        {{ formatDate(row.orderDate) }}
-      </template>
-    </vxe-column>
     <vxe-column field="remark" title="订单备注" width="120"></vxe-column>
     <vxe-column field="note" title="线下备注" width="120"></vxe-column>
     <vxe-column field="labels" title="标签" width="120"></vxe-column>

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

@@ -24,13 +24,14 @@
     <div class="split"></div>
     <el-button type="text" @click="handle('changeQues')">转异常</el-button>
     <el-button type="text" @click="handle('changeNormal')">转正常</el-button>
-    <el-dropdown split-button type="text" class="dropdown" @click="handle('cancelOrder')" @command="handleCommand">
+    <el-button type="text" @click="handle('cancelOrder')">取消订单<i class="el-icon-info" title="只有[待付款,发货中,异常,已付款待审核,等供销商|外仓发货,已客审待财审]才可以取消订单"></i></el-button>
+    <!-- <el-dropdown split-button type="text" class="dropdown" @click="handle('cancelOrder')" @command="handleCommand">
       取消订单
       <i class="el-icon-info" title="只有[待付款,发货中,异常,已付款待审核,等供销商|外仓发货,已客审待财审]才可以取消订单"></i>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="reCancelOrder">反取消订单</el-dropdown-item>
       </el-dropdown-menu>
-    </el-dropdown>
+    </el-dropdown> -->
     <div class="split"></div>
     <el-dropdown split-button type="text" class="dropdown" @click="handle('addGift')" @command="handleCommand">
       添加赠品

src/views/oms/order/components/sendModeModal.vue

@@ -17,7 +17,7 @@
           <span>推荐</span>
         </div>
         <div class="msg">处理后形成多张物流单<br />优惠多多</div>
-        <div class="moda-title">拼车/整车发货</div>
+        <div class="moda-title">整车发货</div>
       </div>
       <div class="moda-item" :class="{'onModal': mode==='2'}" @click="modeHandle('2')">
         <div class="check">

src/views/oms/order/index.vue

@@ -140,7 +140,7 @@
       <send-mode-modal ref="sendModeModal" @modeChange="modeChange" />
       <!-- 批量逐一发货 -->
       <batchbyOneModal ref="batchbyOneModal" @handleSuccess="handleSuccess" />
-      <!-- 整车/拼单发货 -->
+      <!-- 整车发货 -->
       <carpoolModal ref="carpoolModal" @handleSuccess="handleSuccess" />
       <!-- 发货单详情 -->
       <deliveryDetail ref="deliveryDetail" @handleSuccess="handleSuccess" @showLogistics="showLogistics" />
@@ -597,7 +597,7 @@ export default class Order extends Vue {
       ids = ids ? ids + ',' + item.id : item.id;
       idsArr.push(item.id)
     }
-    this.$confirm('您确定将订单“'+ ids +'”归档?', '提示', {
+    this.$confirm('归档后数据无法恢复，您确定将订单“'+ ids +'”归档?', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning'