From c552dfd69248938b68e349a047a599063402044c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 19:06:06 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
---
src/views/plan/customerorder/sample-customerorder-form.vue | 98 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 32 deletions(-)
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 6c11ee7..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>
@@ -154,7 +154,7 @@
<el-divider>
<span style="font-weight:bold;font-size:16px;">璁㈠崟琛�</span>
</el-divider>
- <div>
+ <div class="l-mes normal-form">
<avue-crud ref="crud"
show-hide="false"
:option="option"
@@ -172,6 +172,9 @@
:label="item.label"
:value="item.value" />
</el-select>
+ </template>
+ <template slot="menu" slot-scope="scope">
+ <el-button type="text" icon="el-icon-circle-close" :disabled="tableData.length<2" @click="delRow(scope.row,scope.index)">鍙栨秷</el-button>
</template>
</avue-crud>
</div>
@@ -382,38 +385,39 @@
/>
</el-dialog>
</template>
-<style>
-.normal-form .el-input-group__append,
-.normal-form .el-input-group__prepend {
- padding: 0;
- border-top: none;
- border-right: none;
- border-left: none;
- border-radius: 0;
- background-color: transparent;
-}
-.normal-form .el-input-group__append .el-button,
-.normal-form .el-input-group__prepend .el-button {
- padding: 0;
- width: 25px;
- border: none !important;
- line-height: 28px;
- color: #c0c4cc;
- margin: -1px 0;
-}
-</style>
<script>
import { addObj } from '@/api/plan/customer'
import { remote } from '@/api/admin/dict'
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 {
components: {
PartDialog
+ },
+ watch:{
+ visible(newVal){
+ if(!newVal){
+
+ this.tableData = [{
+ "$cellEdit": true,
+ "$index": 0,
+ "partNo": "",
+ "specs": "",
+ "manufactureAttr": "",
+ "productName": "",
+ "productType": "",
+ "otcUnit": "",
+ "buyQtyDue": "",
+ "shippingAddress": "",
+ "remark": "",
+ "isTrusted": true
+ }]
+ }
+ }
},
data() {
return {
@@ -424,7 +428,7 @@
"$cellEdit": true,
"$index": 0,
"partNo": "",
- "customerPartSpec": "",
+ "specs": "",
"manufactureAttr": "",
"productName": "",
"productType": "",
@@ -469,14 +473,20 @@
this.getStaffOptions();
},
methods: {
+ delRow(row,index){
+ 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()
@@ -503,7 +513,7 @@
"$cellEdit": true,
"$index": 0,
"partNo": "",
- "customerPartSpec": "",
+ "specs": "",
"manufactureAttr": "",
"productName": "",
"productType": "",
@@ -548,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
+
}
},
// 鍏ㄥ睆
@@ -575,4 +589,24 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
+<style>
+.normal-form .el-input-group__append,
+.normal-form .el-input-group__prepend {
+ padding: 0;
+ border-top: none;
+ border-right: none;
+ border-left: none;
+ border-radius: 0;
+ background-color: transparent;
+}
+.normal-form .el-input-group__append .el-button,
+.normal-form .el-input-group__prepend .el-button {
+ padding: 0;
+ width: 25px;
+ border: none !important;
+ line-height: 28px;
+ color: #c0c4cc;
+ margin: -1px 0;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3