From 8c7e2d98a4545968fce177f2dac00d94d4dea213 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 08 十二月 2023 13:55:30 +0800
Subject: [PATCH] 	modified:   src/const/crud/customerOrder/customerOrderForm.js 	modified:   src/views/plan/customerorder/sample-customerorder-form.vue

---
 src/views/plan/customerorder/sample-customerorder-form.vue |   55 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 9c069b0..e4dca9d 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -68,8 +68,8 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="涓氬姟鍛�" prop="salesMan">
-              <el-select @change="selsctionSales" v-model="salesSelectData" style="width:100%">
-                <el-option v-for="(item,index) in staffOptions" :key="index" :value="item" :label="item.staffName"/>
+              <el-select @change="selsctionSales" clearable filterable v-model="salesSelectData" style="width:100%">
+                <el-option v-for="(item,index) in staffOptions" :key="index" :value="item.staffNo+','+item.staffName" :label="item.staffName"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -489,8 +489,11 @@
   },
   methods: {
     selsctionSales(data){
-        this.dataForm.salesMan =  data.staffName
-        this.dataForm.salerWorkCode = data.staffNo
+      if(data){
+        let arr = data.split(",")
+        this.dataForm.salesMan =  arr[1]
+        this.dataForm.salerWorkCode = arr[0]
+      }
     },
     getStaffOptions(){
       chooseStaff().then((response)=>{
@@ -535,23 +538,39 @@
     },
     // 琛ㄥ崟鎻愪氦
     dataFormSubmit() {
-      this.buttonDisable = true
-      this.$refs.dataForm.validate((valid) => {
-        this.dataForm.customerOrderVOList = this.tableData
+      const _than = this
+      let isError = false
+      _than.buttonDisable = true
+      _than.tableData.forEach(ele=>{
+        if(ele.buyQtyDue==null || ele.buyQtyDue=='' || ele.buyQtyDue==undefined){
+          _than.$message.error("闆朵欢鏁伴噺涓嶈兘涓虹┖!")
+          isError = true
+        }else{
+          var reg = /^\d+$/
+          if(!reg.test(ele.buyQtyDue)){
+            _than.$message.error("闆朵欢鏁伴噺绫诲瀷蹇呴』鏄暟瀛�!")
+            isError = true
+          }
+        }
+      })
+      if(isError){
+        _than.buttonDisable = false
+        return
+      }
+      _than.$refs.dataForm.validate((valid) => {
         if (valid) {
-          addObj(this.dataForm)
-            .then((data) => {
-              this.$message.success('娣诲姞鎴愬姛')
-              this.initDataForm();
-              this.visible = false
-              this.buttonDisable = false
-              this.$emit('refreshDataList', 1)
-            })
-            .catch((error) => {
-              this.buttonDisable = false
+          _than.dataForm.customerOrderVOList = _than.tableData
+          addObj(_than.dataForm).then((data) => {
+              _than.$message.success('娣诲姞鎴愬姛')
+              _than.initDataForm();
+              _than.visible = false
+              _than.buttonDisable = false
+              _than.$emit('refreshDataList', 1)
+            }).catch((error) => {
+              _than.buttonDisable = false
             })
         } else {
-          this.buttonDisable = false
+          _than.buttonDisable = false
         }
       })
     },

--
Gitblit v1.9.3