Browse Source

修改发货信息

ymy 1 year ago
parent
commit
2958b4d019
2 changed files with 79 additions and 60 deletions
  1. 59 59
      src/router/index.ts
  2. 20 1
      src/views/oms/order/components/deliveryGoodsInfo.vue

+ 59 - 59
src/router/index.ts

@@ -61,65 +61,65 @@ export const constantRoutes: Array<any> = [
     name:'Order',
     component:() => import('@/views/demo/order/order.vue')
   },
-  {
-    path:'/demo',
-    name:'Demo',
-    hidden: true,
-    component:() => import('@/views/demo/index.vue'),
-    // redirect: 'form',
-    children:[
-      {
-        path:'form',
-        component:()=> import('@/views/demo/form.vue'),
-        name:'Form',
-        meta: {
-          title: '表单',
-          activeMenu: '/system/user'
-        }
-      },
-      {
-        path:'table',
-        component:()=> import('@/views/demo/table.vue'),
-        name:'Table',
-        meta: {
-          title: '表格',
-          activeMenu: '/system/user'
-        }
-      },
-      {
-        path:'moduleView',
-        component:()=> import('@/views/demo/moduleView.vue'),
-        name:'ModuleView',
-        meta: {
-          title: 'view封装'
-        }
-      },
-      {
-        path:'bill',
-        component:()=> import('@/views/demo/bill.vue'),
-        name:'Bill',
-        meta: {
-          title: '单据'
-        }
-      },
-      {
-        path:'dialog',
-        component:()=> import('@/views/demo/dialogDemo.vue'),
-        name:'Dialog',
-        meta: {
-          title: '弹窗'
-        }
-      },
-			{
-			  path:'tab',
-			  component:()=> import('@/views/demo/tab.vue'),
-			  name:'Tab',
-			  meta: {
-			    title: '标签'
-			  }
-			}
-    ]
-  }
+  // {
+  //   path:'/demo',
+  //   name:'Demo',
+  //   hidden: true,
+  //   component:() => import('@/views/demo/index.vue'),
+  //   // redirect: 'form',
+  //   children:[
+  //     {
+  //       path:'form',
+  //       component:()=> import('@/views/demo/form.vue'),
+  //       name:'Form',
+  //       meta: {
+  //         title: '表单',
+  //         activeMenu: '/system/user'
+  //       }
+  //     },
+  //     {
+  //       path:'table',
+  //       component:()=> import('@/views/demo/table.vue'),
+  //       name:'Table',
+  //       meta: {
+  //         title: '表格',
+  //         activeMenu: '/system/user'
+  //       }
+  //     },
+  //     {
+  //       path:'moduleView',
+  //       component:()=> import('@/views/demo/moduleView.vue'),
+  //       name:'ModuleView',
+  //       meta: {
+  //         title: 'view封装'
+  //       }
+  //     },
+  //     {
+  //       path:'bill',
+  //       component:()=> import('@/views/demo/bill.vue'),
+  //       name:'Bill',
+  //       meta: {
+  //         title: '单据'
+  //       }
+  //     },
+  //     {
+  //       path:'dialog',
+  //       component:()=> import('@/views/demo/dialogDemo.vue'),
+  //       name:'Dialog',
+  //       meta: {
+  //         title: '弹窗'
+  //       }
+  //     },
+	// 		{
+	// 		  path:'tab',
+	// 		  component:()=> import('@/views/demo/tab.vue'),
+	// 		  name:'Tab',
+	// 		  meta: {
+	// 		    title: '标签'
+	// 		  }
+	// 		}
+  //   ]
+  // }
 ]
 
 // 动态路由,基于用户权限动态去加载

+ 20 - 1
src/views/oms/order/components/deliveryGoodsInfo.vue

@@ -153,7 +153,7 @@
       </div>
     </div>
     <vxe-modal v-model="showModal" id="deliverInfoEdit" width="900" height="80%" @show="show" @hide="hide" title="编辑" resize show-zoom transfer show-footer>
-      <by-form :propConfig="config" ref="form" />
+      <by-form :propConfig="config" ref="form" @formChange="formChange" />
       <template #footer>
         <div class="btn">
           <el-button plain size="small" @click="showModal = false">取消</el-button>
@@ -515,6 +515,25 @@ export default class DeliveryGoodsInfo extends Vue {
     this.showModal = true;
     this.$emit('editState',false)
   }
+  formChange(parames:any){
+    let data = (this.$refs.form as any).getValue();
+    if(data['tmsArrivalDate'] && data['tmsDeliveryDate']){
+      if(data['tmsArrivalDate'] > data['tmsDeliveryDate']){
+        this.$message({
+          message:'期望送达时间不能大于期望提货时间',
+          type:'warning'
+        })
+        if(parames.code == 'tmsArrivalDate'){
+          data['tmsArrivalDate'] = ''
+        }
+        if(parames.code == 'tmsDeliveryDate'){
+          data['tmsDeliveryDate'] = ''
+        }
+        // (this.$refs.form as any).clearValue();
+        (this.$refs.form as any).setValue(data);
+      }
+    }
+  }
   btn() {
     if(this.$refs.form){
       (this.$refs.form as any).validate().then(()=>{