From 4d051089b33582019716598e7d700f20cdca16d2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 12 十月 2023 11:13:55 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue
---
src/views/plan/customerorder/sample-customerorder-form.vue | 144 +++++++++++++++++++++++++++++++++--------------
1 files changed, 100 insertions(+), 44 deletions(-)
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 46fd83d..53415cf 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -51,30 +51,40 @@
<el-input v-model="dataForm.entityName" placeholder=""></el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="浜嬩笟閮�" prop="salesDepartment">
<el-input
v-model="dataForm.salesDepartment"
placeholder=""
></el-input>
</el-form-item>
- </el-col>
- </el-row>
- <el-row>
+ </el-col> -->
<el-col :span="6">
<el-form-item label="鐪佷唤" prop="province">
<el-input v-model="dataForm.province" placeholder=""></el-input>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<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">
<el-form-item label="姝ｆ湰鐘舵��" prop="originalContractStatus">
<el-input
v-model="dataForm.originalContractStatus"
+ placeholder=""
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍚堝悓姝ｆ湰鐘舵��" prop="returnStatus">
+ <el-input
+ v-model="dataForm.returnStatus"
placeholder=""
></el-input>
</el-form-item>
@@ -89,14 +99,6 @@
<el-col :span="6">
<el-form-item label="瀹㈡埛缂栫爜" prop="customerNo">
<el-input v-model="dataForm.customerNo" placeholder=""></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍚堝悓姝ｆ湰鐘舵��" prop="returnStatus">
- <el-input
- v-model="dataForm.returnStatus"
- placeholder=""
- ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -121,6 +123,17 @@
</el-date-picker>
</el-form-item>
</el-col>
+ <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"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</div>
@@ -128,7 +141,48 @@
<el-divider
><span style="font-weight:bold;font-size:16px;">璁㈠崟琛�</span></el-divider
>
- <div class="l-mes normal-form">
+ <el-table
+ :data="tableData"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="date"
+ label="闆朵欢鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="闆朵欢瑙勬牸">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="浜у搧鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="浜у搧绫诲瀷">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍒堕�犲睘鎬�">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鏀惰揣鍦板潃">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鏁伴噺">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍗曚綅">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="澶囨敞">
+ </el-table-column>
+ </el-table>
+ <!-- <div class="l-mes normal-form">
<el-row :gutter="20">
<el-col :span="2">
<span>闆朵欢鍙�</span>
@@ -231,26 +285,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 +293,8 @@
placeholder=""
></el-input>
</el-col>
+ </el-row>
+ <el-row :gutter="20">
<el-col :span="2">
<span>璐ㄩ噺瑕佹眰</span>
</el-col>
@@ -268,8 +304,6 @@
placeholder=""
></el-input>
</el-col>
- </el-row>
- <el-row :gutter="20">
<el-col :span="2">
<span>鐢熶骇闇�姹傝鏄�</span>
</el-col>
@@ -288,6 +322,8 @@
placeholder=""
></el-input>
</el-col>
+ </el-row>
+ <el-row :gutter="20">
<el-col :span="2">
<span>鏀惰揣鍦板潃</span>
</el-col>
@@ -297,16 +333,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,6 +350,8 @@
placeholder=""
></el-input>
</el-col>
+ </el-row>
+ <el-row :gutter="20">
<el-col :span="2">
<span>澶囨敞</span>
</el-col>
@@ -326,8 +361,17 @@
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>
</el-row>
- </div>
+ </div> -->
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
@@ -370,6 +414,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 +422,8 @@
},
data() {
return {
+ tableData: [],
+ staffOptions: [],
title: '',
isFullScreen: false,
visible: false,
@@ -396,6 +443,7 @@
returnStatus: null,
placeOrderDate: null,
factoryPlaceOrderDate: null,
+ deliveryDate: null,
customerOrder: {
partNo: null,
unit: null,
@@ -414,7 +462,8 @@
shippingAddress: null,
salesmanName: null,
lengthRequirement: null,
- remark: null
+ remark: null,
+ productType: null
}
},
dataRule: {},
@@ -425,8 +474,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 +503,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