From f19edc96af3261347f48cb8f66f1f5b2feb6071e Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 17 十一月 2023 16:43:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/customerorder/sample-customerorder-form.vue | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 04fded5..151083b 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" 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>
@@ -391,7 +391,7 @@
import PartDialog from '@/views/common/part.vue'
import { validateSixDecimal } from '@/util/validate'
import {dateFormat} from '@/util/date'
-// import { chooseStaff } from '@/api/admin/productType'
+import { chooseStaff } from '@/api/plan/customerorder'
import { tableOption } from '@/const/crud/customerOrder/customerOrderForm'
export default {
@@ -401,7 +401,6 @@
watch:{
visible(newVal){
if(!newVal){
-
this.tableData = [{
"$cellEdit": true,
"$index": 0,
@@ -477,13 +476,16 @@
this.tableData.splice(index,1)
},
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)=>{
- // this.staffOptions = response.data.data
- // })
+ chooseStaff().then((response)=>{
+ this.staffOptions = response.data.data
+ })
},
init(id) {
this.initDataForm()
@@ -549,12 +551,16 @@
this.showPart = true
},
selectPart(part) {
- console.log(part);
const index = this.currentSelectRow
if (part) {
+ this.tableData[index].partId=part.id
this.tableData[index].partNo = part.partNo
this.tableData[index].customerPartSpec = part.specs
this.tableData[index].productName = part.partName
+ this.tableData[index].otcUnit = part.unit
+ this.tableData[index].buyQtyDue = part.numCount
+ this.tableData[index].manufactureAttr = part.materialAttribute
+
}
},
// 鍏ㄥ睆
@@ -602,4 +608,9 @@
color: #c0c4cc;
margin: -1px 0;
}
+.avue-crud .avue-crud__left .el-button{
+ margin-right: 8px;
+ margin-bottom: 8px;
+ border-radius: 0px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3