调整

src/components/SalesHeader/SalesHeader.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="sales">
-    <el-form :rules="rules" label-position="left" :disabled="screenForm.disabled" label-width="120px" :model="screenForm" size="mini">
+    <el-form ref="form" :rules="rules" label-position="left" :disabled="screenForm.disabled" label-width="120px" :model="screenForm" size="mini">
       <el-row :gutter="20">
         <el-col :xs="24" :ms="6" :lg="6">
           <el-form-item label="销售订单号" prop="id">
@@ -72,7 +72,7 @@
               <el-option v-for="item in cityList" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="区" prop="area" label-width="50px">
+          <el-form-item label="区" prop="areaId" label-width="50px">
             <el-select v-model="screenForm.areaId" placeholder="请选择区" @change="changeArea" style="width: 100%">
               <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
@@ -112,6 +112,10 @@ export default {
         area: '',
         province: '',
         street: '',
+        cityId: '',
+        areaId: '',
+        provinceId: '',
+        streetId: '',
         customerNumber: '',
         customerName: '',
         pickTime: '',
@@ -122,20 +126,42 @@ export default {
         notes: ''
       },
       rules: {
-        name: [
+        id: [
           { required: true, message: '请输入销售订单号', trigger: 'blur' },
-          { required: true, message: '请输入商家编号', trigger: 'blur' },
-          { required: true, message: '请输入商家名称', trigger: 'blur' },
-          { required: true, message: '请输入配送日期', trigger: 'blur' },
-          { required: true, message: '请输入发货仓库编号', trigger: 'blur' },
-          { required: true, message: '请输入发货仓库名称', trigger: 'blur' },
-          { required: true, message: '请输入用户名称', trigger: 'blur' },
-          { required: true, message: '请输入用户电话', trigger: 'blur' },
-          { required: true, message: '请输入商家编号', trigger: 'blur' },
-          { required: true, message: '请输入送货地址', trigger: 'blur' },
-          { required: true, message: '请输入备注', trigger: 'blur' }
 
-        ]
+        ],
+        cityId: [{
+          required: true, message: '请输入市', trigger: 'blur'
+        }],
+        areaId: [{
+          required: true, message: '请输入区', trigger: 'blur'
+        }],
+        provinceId: [{
+          required: true, message: '请输入省', trigger: 'blur'
+        }],
+        streetId: [{
+          required: true, message: '请输入街道', trigger: 'blur'
+        }],
+        customerNumber: [          { required: true, message: '请输入商家编号', trigger: 'blur' },
+        ],
+        customerName: [{
+          required: true, message: '请输入商家名称', trigger: 'blur'
+        }],
+        pickTime: [{
+          required: true, message: '请输入配送日期', trigger: 'blur'
+        }],
+        stockType: [{
+          required: true, message: '请输入发货仓库名称', trigger: 'blur'
+        }],
+        userName: [{
+          required: true, message: '请输入用户名称', trigger: 'blur'
+        }],
+        phone: [{
+          required: true, message: '请输入用户电话', trigger: 'blur'
+        }],
+        receAddress: [{
+          required: true, message: '请输入送货地址', trigger: 'blur'
+        }]
       },
       provinceList: [],
       cityList: [],

src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -197,6 +197,7 @@ export default {
       })
     },
     handelSubmit(type, status = 1) {
+
       if (!this.dataList.length) {
         this.$errorMsg('请添加产品')
         return
@@ -217,26 +218,33 @@ export default {
         orders: this.dataList,
         status: status
       }
-      if (type == 1) {
-        params.id = ''
-        addFrontOrder(params).then(res => {
-          this.$successMsg('新增成功')
-          this.dis = false
-          // this.$parent.pageType = 0
-          this.salesId = res.data
-          this.$forceUpdate()
-        })
+      this.$refs.header.$refs.form.validate((valid) => {
+        if (valid) {
+          if (type == 1) {
+            params.id = ''
+            addFrontOrder(params).then(res => {
+              this.$successMsg('新增成功')
+              this.dis = false
+              // this.$parent.pageType = 0
+              this.salesId = res.data
+              this.$forceUpdate()
+            })
 
-      } else {
-        updateFrontOrder(params).then(res => {
-          this.$successMsg('编辑成功')
-          this.$parent.pageType = 0
-          this.$forceUpdate()
-        })
+          } else {
+            updateFrontOrder(params).then(res => {
+              this.$successMsg('编辑成功')
+              this.$parent.pageType = 0
+              this.$forceUpdate()
+            })
 
-      }
+          }
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
     },
-    onReset(){
+    onReset() {
       Object.assign(this.$data, this.$options.data())
       Object.assign(this.$refs.header.$data, this.$refs.header.$options.data())