From ede9169afeeb21ff2d8113f02b6f2492ce83ae57 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 11 十月 2023 15:57:20 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue
---
src/views/plan/customerorder/sample-customerorder-form.vue | 76 +++++++-----
src/views/plan/customerorder/customerorder-form.vue | 228 +++++++------------------------------
2 files changed, 89 insertions(+), 215 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index b56d973..e33a374 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -48,24 +48,6 @@
></el-input>
</el-form-item>
</el-col>
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="OTC琛屽彿" prop="otcLineNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.otcLineNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="GSM琛屽彿" prop="coLineNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.coLineNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
<el-col :span="6">
<el-form-item label="瀹㈡埛缂栧彿" prop="customerNo">
<el-input
@@ -88,24 +70,6 @@
</el-col>
</el-row>
<el-row>
- <!-- <el-col :span="6">
- <el-form-item label="瀹㈡埛鐨勯浂浠跺彿" prop="customerPartNo">
- <el-input
- v-model="dataForm.customerPartNo"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="IFS琛屽彿" prop="ifsLineNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.ifsLineNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
<el-col :span="6">
<el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="coState">
<el-select
@@ -125,37 +89,39 @@
</el-select>
</el-form-item>
</el-col>
- <!-- <el-col :span="6">
- <el-form-item label="琛屽彿" prop="coLineNo">
- <el-input
- v-model="dataForm.coLineNo"
- placeholder=""
+ <el-col :span="6">
+ <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="wantedDeliveryDate">
+ <el-date-picker
+ v-model="dataForm.wantedDeliveryDate"
+ style="width: 100%"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
:disabled="!ediSource"
- ></el-input>
+ >
+ </el-date-picker>
</el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">
- <el-form-item label="瀹㈡埛鐨勯浂浠惰鏍�" prop="customerPartName">
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
+ <el-date-picker
+ v-model="dataForm.plannedDeliveryDate"
+ style="width: 100%"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍖呰瑕佹眰" prop="packageRequire">
<el-input
- v-model="dataForm.customerPartName"
+ v-model="dataForm.packageRequire"
placeholder=""
disabled
></el-input>
</el-form-item>
- </el-col> -->
+ </el-col>
</el-row>
- <!-- <el-row>-->
-
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="IFS浜よ揣鍙�" prop="ifsDeliveryNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.ifsDeliveryNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- </el-row>-->
<el-row>
<el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="partNo">
@@ -187,15 +153,6 @@
</el-input>
</el-form-item>
</el-col>
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="IFS琛岄」鍙�" prop="ifsLineItemNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.ifsLineItemNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
<el-col :span="6">
<el-form-item label="閿�鍞欢鍙�" prop="salesPartNo">
<el-input
@@ -257,87 +214,17 @@
></el-input>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="涓氬姟鍛�" prop="salesmanName">
+ <el-input
+ v-model="dataForm.salesmanName"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
- <el-col :span="6">
- <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="wantedDeliveryDate">
- <el-date-picker
- v-model="dataForm.wantedDeliveryDate"
- style="width: 100%"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- :disabled="!ediSource"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
- <el-date-picker
- v-model="dataForm.plannedDeliveryDate"
- style="width: 100%"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="6">
- <el-form-item label="瀹㈡埛闆朵欢瑙勬牸" prop="customerPartSpec">
- <el-input
- v-model="dataForm.customerPartSpec"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="浜嬩笟閮�" prop="division">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.division"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- </el-row>
- <el-row>
- <!-- <el-col :span="6">
- <el-form-item label="鍗板瓧鏂瑰紡" prop="printType">
- <el-input
- v-model="dataForm.printType"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍗板瓧瑕佹眰" prop="printingRequirements">
- <el-input
- v-model="dataForm.printingRequirements"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍗板瓧鍐呭" prop="printContent">
- <el-input
- v-model="dataForm.printContent"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <el-col :span="6">
- <el-form-item label="鍖呰瑕佹眰" prop="packageRequire">
- <el-input
- v-model="dataForm.packageRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
</el-row>
<el-row>
<el-col :span="6">
@@ -379,44 +266,6 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="salesmanName">
- <el-input
- v-model="dataForm.salesmanName"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鐩橀暱瑕佹眰" prop="lengthRequirement">
- <el-input
- v-model="dataForm.lengthRequirement"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="6">
- <el-form-item label="鏈�缁堝鎴�" prop="remark">
- <el-input
- v-model="dataForm.finalCustomerName"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">
- <el-form-item label="浜у搧鍒嗙粍" prop="remark">
- <el-input
- v-model="dataForm.productGroup"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- </el-row>
- <el-row>
- <el-col :span="6">
<el-form-item label="浜у搧绫诲瀷" prop="remark">
<el-input
v-model="dataForm.productType"
@@ -455,6 +304,15 @@
</el-row>
<el-row>
<el-col :span="6">
+ <el-form-item label="鐩橀暱瑕佹眰" prop="lengthRequirement">
+ <el-input
+ v-model="dataForm.lengthRequirement"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="OTC鎺ㄩ�佺姸鎬�" prop="remark">
<span>{{
dataForm.otcPartSync != null
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 46fd83d..8f4892b 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -68,7 +68,9 @@
</el-col>
<el-col :span="6">
<el-form-item label="涓氬姟鍛�" prop="salesMan">
- <el-input v-model="dataForm.salesMan" placeholder=""></el-input>
+ <el-select v-model="dataForm.salesMan" style="width:100%">
+ <el-option v-for="(item,index) in staffOptions" :key="index" :value="item.staff_no" :label="item.staffName"/>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -114,6 +116,19 @@
<el-form-item label="宸ュ巶涓嬪崟鏃ユ湡" prop="factoryPlaceOrderDate">
<el-date-picker
v-model="dataForm.factoryPlaceOrderDate"
+ style="width: 100%"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浜よ揣鏃ユ湡" prop="deliveryDate">
+ <el-date-picker
+ v-model="dataForm.deliveryDate"
style="width: 100%"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -231,26 +246,6 @@
></el-input>
</el-col>
<el-col :span="2">
- <span>鍗板瓧绫诲瀷</span>
- </el-col>
- <el-col :span="6">
- <el-input
- v-model="dataForm.customerOrder.printType"
- placeholder=""
- ></el-input>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="2">
- <span>鍗板瓧瑕佹眰</span>
- </el-col>
- <el-col :span="6">
- <el-input
- v-model="dataForm.customerOrder.printingRequirements"
- placeholder=""
- ></el-input>
- </el-col>
- <el-col :span="2">
<span>鍖呰瑕佹眰</span>
</el-col>
<el-col :span="6">
@@ -259,6 +254,8 @@
placeholder=""
></el-input>
</el-col>
+ </el-row>
+ <el-row :gutter="20">
<el-col :span="2">
<span>璐ㄩ噺瑕佹眰</span>
</el-col>
@@ -268,8 +265,6 @@
placeholder=""
></el-input>
</el-col>
- </el-row>
- <el-row :gutter="20">
<el-col :span="2">
<span>鐢熶骇闇�姹傝鏄�</span>
</el-col>
@@ -288,6 +283,8 @@
placeholder=""
></el-input>
</el-col>
+ </el-row>
+ <el-row :gutter="20">
<el-col :span="2">
<span>鏀惰揣鍦板潃</span>
</el-col>
@@ -297,16 +294,13 @@
placeholder=""
></el-input>
</el-col>
- </el-row>
- <el-row :gutter="20">
<el-col :span="2">
<span>涓氬姟鍛�</span>
</el-col>
<el-col :span="6">
- <el-input
- v-model="dataForm.customerOrder.salesmanName"
- placeholder=""
- ></el-input>
+ <el-select v-model="dataForm.customerOrder.salesmanName" style="width:100%">
+ <el-option v-for="(item,index) in staffOptions" :key="index" :value="item.staff_no" :label="item.staffName"/>
+ </el-select>
</el-col>
<el-col :span="2">
<span>鐩橀暱瑕佹眰</span>
@@ -317,12 +311,23 @@
placeholder=""
></el-input>
</el-col>
+ </el-row>
+ <el-row :gutter="20">
<el-col :span="2">
<span>澶囨敞</span>
</el-col>
<el-col :span="6">
<el-input
v-model="dataForm.customerOrder.remark"
+ placeholder=""
+ ></el-input>
+ </el-col>
+ <el-col :span="2">
+ <span>浜у搧绫诲瀷</span>
+ </el-col>
+ <el-col :span="6">
+ <el-input
+ v-model="dataForm.customerOrder.productType"
placeholder=""
></el-input>
</el-col>
@@ -370,6 +375,7 @@
import { remote } from '@/api/admin/dict'
import PartDialog from '@/views/common/part.vue'
import { validateSixDecimal } from '@/util/validate'
+import { chooseStaff } from '@/api/admin/productType'
export default {
components: {
@@ -377,6 +383,7 @@
},
data() {
return {
+ staffOptions: [],
title: '',
isFullScreen: false,
visible: false,
@@ -396,6 +403,7 @@
returnStatus: null,
placeOrderDate: null,
factoryPlaceOrderDate: null,
+ deliveryDate: null,
customerOrder: {
partNo: null,
unit: null,
@@ -414,7 +422,8 @@
shippingAddress: null,
salesmanName: null,
lengthRequirement: null,
- remark: null
+ remark: null,
+ productType: null
}
},
dataRule: {},
@@ -425,8 +434,14 @@
mounted: function() {
this.getDicUnit('unit') // 鑾峰彇鍗曚綅
this.getManufactureAttrs('manufacture_attr_type')
+ this.getStaffOptions();
},
methods: {
+ getStaffOptions(){
+ chooseStaff().then((response)=>{
+ this.staffOptions = response.data.data
+ })
+ },
init(id) {
this.initDataForm()
this.visible = true
@@ -448,6 +463,7 @@
this.dataForm.returnStatus = null
this.dataForm.placeOrderDate = null
this.dataForm.factoryPlaceOrderDate = null
+ this.dataForm.deliveryDate = null
this.dataForm.customerOrder.partNo = null
this.dataForm.customerOrder.unit = null
this.dataForm.customerOrder.buyQtyDue = null
--
Gitblit v1.9.3