Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/api/omsOrder.ts

@@ -224,4 +224,12 @@ export const updateStatus:any = (data:any) => {
 		method:'POST',
 		params:data
 	})
+}  
+//归档
+export const archive:any = (data:any) => {
+	return request({
+		url:'/omsOrder/omsOrder/archive',
+		method:'POST',
+		params:data
+	})
 }  

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

@@ -44,6 +44,7 @@
       </el-dropdown-menu>
     </el-dropdown>
     <el-button type="text" @click="handle('producePurchase')" title="选取已提交数据">生成采购单</el-button>
+    <el-button type="text" @click="handle('orderFile')">订单归档</el-button>
   </div>
 </template>
 

src/views/oms/order/index.vue

@@ -155,7 +155,7 @@
       <div class="tool">
         <order-tool @addOrder="addOrder" @smt="smtOrder" @reSmt="reSmt" @loadOrder="loadOrder" @producePurchase="producePurchase" @cancelOrder="cancelOrder" 
         @reCancelOrder="reCancelOrder" @updateRmk="updateRmk" @changeQues="changeQues" @changeNormal="changeNormal" @updateSalesman="updateSalesman" 
-        @updateTag="updateTag" @addGift="addGift" @addProduct="addProduct" @updateFreight="updateFreight" />
+        @updateTag="updateTag" @addGift="addGift" @addProduct="addProduct" @updateFreight="updateFreight" @orderFile="orderFile" />
       </div>
       <div class="table">
         <order-table :data="data" ref="orderTable" class="order-table" @detail="detail" @mergeHandle="mergeHandle" @splitHandle="splitHandle" />
@@ -221,7 +221,7 @@ import TabModal from "./components/tabModal.vue";
 import AddProductModal from "./components/addProductModal.vue";
 import FreightModal from "./components/freightModal.vue";
 import LabelsModal from "./components/labelsModal.vue";
-import { query,getProvince,smt,unSmt,purchaseQty,unCancel,resetQuestion } from '@/api/omsOrder'
+import { query,getProvince,smt,unSmt,purchaseQty,unCancel,resetQuestion,archive } from '@/api/omsOrder'
 import { queryAll } from '@/api/question'
 @Component({components:{filterInput,OrderCheckbox,OrderRadio,filterDate,OrderTool,OrderTable,AddOrder,InputSelect,OrderProduct,
   filterMinMax,loadOrderModal,PurchaseModel,MergeModel,SplitModel,CancelOrderModel,QuestModel,SetQuesModal,UpdateRmkModal,UpdateSalerModal,
@@ -539,6 +539,37 @@ export default class Order extends Vue {
     }
     this.$forceUpdate()
   }
+  //归档
+  orderFile(){
+    let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
+    if(data.length == 0){
+      this.$message('请选择订单！');
+      return
+    }
+    let ids='';
+    let idsArr:Array<any>=[];
+    for(const item of data){
+      ids = ids ? ids + ',' + item.id : item.id;
+      idsArr.push(item.id)
+    }
+    this.$confirm('您确定将订单“'+ ids +'”归档?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      this.load = true;
+      archive({idList:idsArr}).then((res:any) => {
+        this.$message({
+          message:res.msg ? res.msg : '归档成功！',
+          type:'success'
+        });
+        this.load = false;
+        this.getList();
+      }).catch(() => {
+        this.load = false;
+      })
+    }).catch(() => {  });
+  }
   //改运费
   updateFreight(){
     this.updateHandleModal('freightModal');
@@ -1044,7 +1075,7 @@ export default class Order extends Vue {
   width: 100%;
   height: 100%;
   display: flex;
-  overflow: hidden;
+  overflow-y: hidden;
   .order-left{
     width: 260px;
     height: 100%;

src/views/oms/orderHistory/components/detailOrder.vue

@@ -51,7 +51,7 @@
           <div class="addProductTool">
             <div></div>
             <div class="preferential">
-              <span>{{ freeAmount }}</span>
+              <span>抵扣金额：{{ freeAmount }}</span>
             </div>
           </div>
           <by-table :propConfig="tableConfig" ref="table">
@@ -199,6 +199,7 @@ export default class DetailOrder extends Vue {
   }
   config2:any={
     attr:{
+      showType:'desc',
       size:'small',
       itemCount:4
     },
@@ -303,25 +304,25 @@ export default class DetailOrder extends Vue {
       title:'名称',
       field:'name',
       slot:true,
-      width:300
+      // width:300
     },{
       title:'数量',
       field:'qty',
-      width:100,
+      width:150,
       slot:true
     },{
       title:'单价',
       field:'price',
-      width:100,
+      width:120,
       slot:true
     },{
       title:'原价',
       field:'basePrice',
-      width:100
+      width:120
     },{
       title:'成交金额',
       field:'amount',
-      width:100
+      width:120
     }]
   }
   invoicesConfig:any={

src/views/oms/orderHistory/index.vue

@@ -23,7 +23,7 @@
             </template>
           </order-radio>
           <order-radio title="订单来源" keyName="sourceFrom" ref="searchCom11" :options="sourceFromOptions" noLimit @radioChange="onChange($event,'sourceFrom')" />
-          <order-checkbox title="订单类型" keyName="type" ref="searchCom12" :options="typeOption" noLimit @checkboxChange="onChange($event,'type')" />
+          <!-- <order-checkbox title="订单类型" keyName="type" ref="searchCom12" :options="typeOption" noLimit @checkboxChange="onChange($event,'type')" /> -->
           <order-checkbox title="省份" ref="searchCom14" keyName="receiverProvinceCode" :options="provinceOptions" @checkboxChange="onChange($event,'receiverProvinceCodeList')" />
         </el-collapse>
       </el-scrollbar>
@@ -56,7 +56,7 @@ import { query } from '@/api/omsOrderHistory'
 @Component({components:{filterInput,OrderCheckbox,OrderRadio,orderTable,DetailOrder,InputSelect}})
 export default class OrderHistory extends Vue {
   value:any={}
-  activeNames:Array<any>=['1','buyerMessageFilter','remarkFilter','noteFilter']
+  activeNames:Array<any>=['1','buyerMessageFilter','remarkFilter','noteFilter','sourceFrom','receiverProvinceCode']
   page:any={
     pageNo: 1, //当前页
     pageSize: 20, //每页条数

src/views/oms/shop/index.vue

@@ -0,0 +1,9 @@
+<template>
+  <div></div>
+</template>
+
+<script lang="ts">
+export default {
+  
+}
+</script>