From d49f39681a68fd819ac687d67b6352ba386d0d13 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 12:12:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/plan/customerorder/sample-customerorder-form.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index b7ab36f..765dc1a 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -34,7 +34,7 @@
<el-input
v-model="dataForm.contractNo"
placeholder=""
-
+
></el-input>
</el-form-item>
</el-col>
@@ -60,9 +60,11 @@
<el-row>
<el-col :span="6">
<el-form-item label="涓氬姟鍛�" prop="salesMan">
- <el-select @change="selsctionSales" clearable filterable v-model="salesSelectData" style="width:100%">
+ <!-- salesMan -->
+ <el-input v-model="dataForm.salesMan" placeholder=""></el-input>
+ <!-- <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-select> -->
</el-form-item>
</el-col>
<el-col :span="6">
@@ -407,6 +409,10 @@
let isError = false
_than.buttonDisable = true
_than.tableData.forEach(ele=>{
+ if(ele.productType==null || ele.productType=='' || ele.productType==undefined){
+ _than.$message.error("浜у搧鐨勯毝灞炲搧鐗屼笉鑳戒负绌�!")
+ isError = true
+ }
if(ele.buyQtyDue==null || ele.buyQtyDue=='' || ele.buyQtyDue==undefined){
_than.$message.error("闆朵欢鏁伴噺涓嶈兘涓虹┖!")
isError = true
@@ -454,8 +460,8 @@
const index = this.currentSelectRow
if (part) {
this.tableData[index].partNo = part.partNo
- this.tableData[index].customerPartSpec = part.specs
- this.tableData[index].productName = part.partName
+ // this.tableData[index].customerPartSpec = part.specs
+ // this.tableData[index].productName = part.partName
}
},
// 鍏ㄥ睆
--
Gitblit v1.9.3