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

src/benyun/components/selectTree/selectTree.vue

@@ -3,6 +3,7 @@
     :placement="attrs.placement?attrs.placement:'bottom-start'"
     :width="attrs.width?attrs.width:'300'"
     trigger="click"
+    v-model="show"
     >
     <el-tree :data="data" :props="defaultProps" :default-expand-all="attrs.defaultExpandAll" :expand-on-click-node="false" @node-click="handleNodeClick" highlight-current node-key="id"></el-tree>
     <el-input :value="titleName" slot="reference" :placeholder="attrs.placeholder?attrs.placeholder:'请选择'" :clearable="attrs.clearable" @clear="clear" suffix-icon="el-icon-arrow-down"></el-input>
@@ -35,6 +36,7 @@ import VueViews from '@/benyun/compVue/VueViews'
 export default class SelectTree extends VueViews {
   data:Array<any>=[]
   titleName='';
+  show=false;
   @Watch('propValue')
   propValueChange(v:any){
     this.setValue(v);
@@ -138,6 +140,7 @@ export default class SelectTree extends VueViews {
     }
     this.$emit('onChange',obj);
     this.$emit('handleNodeClick',data);
+    this.show = false;
   }
 
    //请求url

src/components/skuModal/productModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <vxe-modal v-model="value" id="productDialogModal" :width="width?width+'px':'80%'" @show="show" :height="height?height+'px':'80%'" min-width="500" min-height="400" 
+  <vxe-modal v-model="value" id="productDialogModal" v-loading="load" :width="width?width+'px':'80%'" @show="show" :height="height?height+'px':'80%'" min-width="500" min-height="400" 
   show-zoom resize transfer show-footer>
     <template #title>
       <span>选择商品</span>
@@ -24,6 +24,7 @@ export default class ProductModal extends Vue {
   time:any;
   timeNum = 0;
   data:Array<any>=[]
+  load = false;
 
   @Prop()
   width?:number
@@ -174,11 +175,13 @@ export default class ProductModal extends Vue {
     clearInterval(this.time)
     let query:any = (this.$refs.view as any).getQuery();
     query.isLikeSearch = '1';
+    this.load = true;
     (this as any).$request({
       url: '/maindata/maindataMaterialSku/page',
       method: 'get',
       params:query
     }).then((res:any) => {
+      this.load = false;
       if(res.data.records){
         (this.$refs.view as any).setTableValue(res.data.records);
         this.data = res.data.records;
@@ -189,6 +192,8 @@ export default class ProductModal extends Vue {
         };
         (this.$refs.view as any).setPage(page)
       }
+    }).catch(()=>{
+      this.load = false;
     })
   }
 } 

src/components/supplierModal/supplierModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <vxe-modal v-model="value" id="supplierModal" :width="width?width+'px':'60%'" @show="show" :height="height?height+'px':'80%'" min-width="500" min-height="400" 
+  <vxe-modal v-model="value" id="supplierModal" v-loading="load" :width="width?width+'px':'60%'" @show="show" :height="height?height+'px':'80%'" min-width="500" min-height="400" 
   show-zoom resize transfer show-footer  :zIndex="zIndex">
     <template #title>
       <span>{{title?title:'选择供应商'}}</span>
@@ -24,6 +24,7 @@ export default class SupplierModal extends Vue {
   data:Array<any>=[]
   time:any;
   timeNum = 0;
+  load=false;
 
   @Prop()
   title?:string
@@ -157,11 +158,13 @@ export default class SupplierModal extends Vue {
     let query:any = (this.$refs.view as any).getQuery();
     query.isLikeSearch = '1';
     this.$emit('supplierRequestAfter',query);
+    this.load = true;
     (this as any).$request({
       url: '/maindata/maindataMaterialSupplier/page',
       method: 'get',
       params:query
     }).then((res:any) => {
+      this.load = false;
       if(res.data.records){
         (this.$refs.view as any).setTableValue(res.data.records);
         this.data = res.data.records;
@@ -172,6 +175,8 @@ export default class SupplierModal extends Vue {
         };
         (this.$refs.view as any).setPage(page)
       }
+    }).catch(()=>{
+      this.load = false;
     })
   }
 }

src/views/oms/order/index.vue

@@ -633,10 +633,10 @@ export default class Order extends Vue {
       return
     }
     this.load = true
-    resetQuestion({idList:billData}).then(()=>{
+    resetQuestion({idList:billData}).then((res:any)=>{
       this.load = false;
       (this.$message({
-        message:'操作成功！',
+        message:res.msg?res.msg:'操作成功！',
         type:'success'
       }));
       this.getList();
@@ -792,7 +792,7 @@ export default class Order extends Vue {
     }).then((res:any) => {
       this.load = false;
         (this as any).$message({
-          message: res.msg,
+          message: res.msg?res.msg:'订单提交成功！',
           type: 'success'
         });
       this.getList();
@@ -828,7 +828,7 @@ export default class Order extends Vue {
     }).then((res:any) => {
       this.load = false;
         (this as any).$message({
-          message: '订单反提交成功！',
+          message: res.msg?res.msg:'订单取消提交成功！',
           type: 'success'
         });
       this.getList();
@@ -1022,7 +1022,7 @@ export default class Order extends Vue {
     unCancel({idList:ids}).then((res:any)=>{
       this.load = false;
       this.$message({
-        message:'反取消订单操作成功！',
+        message:res.msg?res.msg:'订单反取消成功！',
         type:'success'
       })
       this.handleSuccess();