From 82839cb137b5e651dec50bbb955f97c57d545554 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 17:15:26 +0800
Subject: [PATCH] 	modified:   src/api/plan/customerorder.js 	modified:   src/const/crud/customerOrder/customerOrderForm.js 	modified:   src/views/plan/customerorder/sample-customerorder-form.vue

---
 src/const/crud/customerOrder/customerOrderForm.js          |    7 -------
 src/api/plan/customerorder.js                              |    7 +++++++
 src/views/plan/customerorder/sample-customerorder-form.vue |   23 +++++++++++++++--------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/api/plan/customerorder.js b/src/api/plan/customerorder.js
index f54ebd9..97b45a2 100644
--- a/src/api/plan/customerorder.js
+++ b/src/api/plan/customerorder.js
@@ -388,3 +388,10 @@
     params: contractNo
   })
 }
+
+export function chooseStaff() {
+  return request({
+    url: '/mes/plan/customerOrder/chooseStaff',
+    method: 'get',
+  })
+}
diff --git a/src/const/crud/customerOrder/customerOrderForm.js b/src/const/crud/customerOrder/customerOrderForm.js
index 8f0e9b8..05e9d01 100644
--- a/src/const/crud/customerOrder/customerOrderForm.js
+++ b/src/const/crud/customerOrder/customerOrderForm.js
@@ -69,13 +69,6 @@
     minWidth: 200,
     span: 24
   }, {
-    label: '闅跺睘鍝佺墝',
-    prop: 'productType',
-    cell: true,
-    type: 'input',
-    minWidth: 200,
-    span: 24
-  }, {
     label: '鍗曚綅',
     prop: 'otcUnit',
     slot: true,
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 04fded5..f409eae 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 {
@@ -477,13 +477,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()
@@ -555,6 +558,10 @@
         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
+
       }
     },
     // 鍏ㄥ睆

--
Gitblit v1.9.3