生成采购单

src/benyun/components/byInput/byInput.vue

@@ -28,7 +28,14 @@ export default class ByInput extends VueViews {
 
   @Watch('propValue')
   propValueChange(v:any){
-    this.value = (this as any).$lodash.cloneDeep(v);
+    if(v){
+      this.value = (this as any).$lodash.cloneDeep(v);
+      if(this.attrs.type == 'number'){
+        this.value = Number(v);
+      }
+    }else{
+      this.value = null;
+    }
   }
 
   created(){
@@ -59,7 +66,7 @@ export default class ByInput extends VueViews {
     if(data){
       this.value = (this as any).$lodash.cloneDeep(data);
       if(this.attrs.type == 'number'){
-        this.value = Number(this.value);
+        this.value = Number(data);
       }
     }else{
       this.value = null;

src/views/audit/productManagement/components/importProduct.vue

@@ -42,6 +42,9 @@ export default class ImportProduct extends Vue {
     },{
       title:'商品名称',
       field:'goodsName'
+    },{
+      title:'关联的oms商品',
+      field:'materialField'
     },{
       title:'操作',
       action:true,

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

@@ -12,7 +12,7 @@
         </el-radio-group>
       </div>
       <div class="cont">
-        <div class="title">店铺名称：</div>
+        <div class="t-title">店铺名称：</div>
         <div class="right-cont">
           <el-select v-model="shopId" size="mini" style="width:100%" placeholder="请选择" clearable>
             <el-option
@@ -26,7 +26,7 @@
       </div>
       <template v-if="type == 1">
         <div class="cont">
-          <div class="title">sku：</div>
+          <div class="t-title">sku：</div>
           <div class="right-cont">
             <el-input v-model="skus" type="textarea" rows="4" size="mini" placeholder="每行一个单号,换行输入"></el-input>
           </div>
@@ -34,7 +34,7 @@
       </template>
       <template v-if="type == 2">
         <div class="cont">
-          <div class="title">款式编码：</div>
+          <div class="t-title">款式编码：</div>
           <div class="right-cont">
             <el-input v-model="styles" type="textarea" rows="4" size="mini" placeholder="每行一个编码,换行输入"></el-input>
           </div>
@@ -42,7 +42,7 @@
       </template>
       <template v-if="type == 3">
         <div class="cont">
-          <div class="title">时间类型：</div>
+          <div class="t-title">时间类型：</div>
           <div class="right-cont">
             <el-select v-model="dateType" size="mini" style="width:100%" placeholder="请选择" clearable>
               <el-option
@@ -55,7 +55,7 @@
           </div>
         </div>
         <div class="cont">
-          <div class="title">时间：</div>
+          <div class="t-title">时间：</div>
           <div class="right-cont">
             <el-date-picker
               v-model="time"
@@ -215,7 +215,7 @@ export default class SynchronousOrderModal extends Vue {
   display: flex;
   align-items: center;
   padding: 8px 0;
-  .title{
+  .t-title{
     width: 100px;
     text-align: right;
   }

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

@@ -792,13 +792,14 @@ export default class AddOrder extends Vue {
       
       for(let col of this.baseConfig.columns){
         for(let item of col){
-          if(item.prop != 'freight'){
+          let fieldArr = ['freight','buyerMessage','remark']
+          if(fieldArr.indexOf(item.prop) == -1){
             if(!item.compConfig.attr) item.compConfig.attr = {};
             item.compConfig.attr.disabled = true;
           }
         }
       }
-      if(this.orderValue.isPay != 0){
+      if(this.orderValue.isSubmitted == 1){
         for(let col of this.buyerInfoConfig.columns){
           for(let item of col){
             if(!item.compConfig.attr) item.compConfig.attr = {};
@@ -1141,6 +1142,8 @@ export default class AddOrder extends Vue {
   saveBase(){
     this.getOrderValue('base').then(()=>{
       this.load = true;
+      this.orderValue.receiverCountryCode = '86';
+      this.orderValue.receiverCountry="中华人民共和国";
       saveBaseOrder(this.orderValue).then(() => {
         this.load = false;
         (this as any).$message({

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

@@ -80,6 +80,7 @@ export default class PurchaseModel extends Vue {
           attr:{
             placeholder:'交货时间',
             type:'datetime',
+            defaultNow:true,
             clearable:true
           }
         }

src/views/oms/order/index.vue

@@ -528,24 +528,51 @@ export default class Order extends Vue {
       this.$message('请选择订单!');
     }
     let ids:Array<any>=[];
+    let msg = '';
+    let smtMst='';
     for(const item of data){
+      if(item.isSubmitted == 1){
+        if(smtMst){
+          smtMst = msg + ',' + item.sourceId
+        }else{
+          smtMst = item.sourceId
+        }
+      }
+      if(item.status != 'WaitConfirm'){
+        if(msg){
+          msg = msg + ',' + item.sourceId
+        }else{
+          msg = item.sourceId
+        }
+      }
       ids.push(item.id)
     }
+    if(smtMst){
+      this.$message({
+        message:'单号“'+smtMst + '”已提交，不能重复操作！'
+      })
+      return
+    }
+    if(msg){
+      this.$message({
+        message:'单号“'+msg + '”不是“已付款待审核”状态，不能提交！'
+      })
+      return
+    }
     smt({
       ids:ids
     }).then((res:any) => {
       if(res.data == data.length){
         (this as any).$message({
-          message: '订单审批成功！',
+          message: '订单提交成功！',
           type: 'success'
         });
       }else{
         (this as any).$message({
-          message: (data.length - res.data)+'条订单审批失败！',
+          message: (data.length - res.data)+'条订单提交失败！',
           type: 'warning'
         });
       }
-      
       this.getList();
     })
   }
@@ -555,20 +582,23 @@ export default class Order extends Vue {
       this.$message('请选择订单!');
     }
     let ids:Array<any>=[];
+    
     for(const item of data){
+      
       ids.push(item.id)
     }
+    
     unSmt({
       ids:ids
     }).then((res:any) => {
       if(res.data == data.length){
         (this as any).$message({
-          message: '订单反审批成功！',
+          message: '订单反提交成功！',
           type: 'success'
         });
       }else{
         (this as any).$message({
-          message: (data.length - res.data)+'条订单反审批失败！',
+          message: (data.length - res.data)+'条订单反提交失败！',
           type: 'warning'
         });
       }
@@ -664,7 +694,7 @@ export default class Order extends Vue {
     this.load = true;
     query(params,data).then((res:any) => {
       this.data = res.data.records;
-      this.page.pageNo = res.data.pages;
+      this.page.pageNo = res.data.current;
       // this.page.pageSize = res.data.size;
       this.page.total = res.data.total;
       this.load = false;
@@ -681,8 +711,9 @@ export default class Order extends Vue {
   }
   //订单详情
   detail(row:any){
+    let data = (this as any).$lodash.cloneDeep(row);
     (this.$refs.addOrder as any).setShow(true);
-    (this.$refs.addOrder as any).setDetail(row); 
+    (this.$refs.addOrder as any).setDetail(data); 
   }
 
   handleSizeChange(v:number){