From 2518e47a3ac999978fbf14612c967c3bbf421d25 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 十一月 2023 13:31:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/customerorder/sample-customerorder-form.vue | 428 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 333 insertions(+), 95 deletions(-)
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 85f9d64..f409eae 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -1,7 +1,7 @@
<template>
<el-dialog
width="75%"
- top="10vh"
+ top="5vh"
:fullscreen="isFullScreen"
:close-on-click-modal="false"
:visible.sync="visible"
@@ -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 @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>
<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">
@@ -119,6 +121,30 @@
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="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-row>
+ <el-col :span="24">
+ <el-form-item label="璁㈠崟澶囨敞" prop="comment">
+ <el-input
+ v-model="dataForm.comment"
+ style="width: 100%"
+ type="textarea"
+ :rows="2"
+ >
+ </el-input>
</el-form-item>
</el-col>
</el-row>
@@ -148,11 +174,200 @@
</el-select>
</template>
<template slot="menu" slot-scope="scope">
- <el-button :disabled="tableData.length<2" @click="delRow(scope.row,scope.$index)"
- icon="el-icon-circle-close" type="text" size="small">鍙栨秷</el-button>
+ <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>
+ <!-- <div class="l-mes normal-form">
+ <el-row :gutter="20">
+ <el-col :span="2">
+ <span>闆朵欢鍙�</span>
+ </el-col>
+ <el-col :span="6">
+ <el-input
+ v-model="dataForm.customerOrder.partNo"
+ placeholder=""
+ readonly
+ >
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="openPartDialog()"
+ ></el-button>
+ </el-input>
+ </el-col>
+ <el-col :span="2">
+ <span>鍗曚綅</span>
+ </el-col>
+ <el-col :span="6">
+ <el-select
+ v-model="dataForm.customerOrder.unit"
+ placeholder=""
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in units"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-col>
+ <el-col :span="2">
+ <span>鏁伴噺</span>
+ </el-col>
+ <el-col :span="6">
+ <el-input
+ v-model="dataForm.customerOrder.buyQtyDue"
+ 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.voltAgeClass"
+ placeholder=""
+ ></el-input>
+ </el-col>
+ <el-col :span="2">
+ <span>浜у搧鍚嶇О</span>
+ </el-col>
+ <el-col :span="6">
+ <el-input
+ v-model="dataForm.customerOrder.productName"
+ placeholder=""
+ ></el-input>
+ </el-col>
+ <el-col :span="2">
+ <span>鍒堕�犲睘鎬�</span>
+ </el-col>
+ <el-col :span="6">
+ <el-select
+ v-model="dataForm.customerOrder.manufactureAttr"
+ placeholder=""
+ style="width: 100%"
+ disabled
+ >
+ <el-option
+ v-for="item in manufactureAttrs"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </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.outerColor"
+ placeholder=""
+ ></el-input>
+ </el-col>
+ <el-col :span="2">
+ <span>闆朵欢瑙勬牸</span>
+ </el-col>
+ <el-col :span="6">
+ <el-input
+ v-model="dataForm.customerOrder.customerPartSpec"
+ placeholder=""
+ ></el-input>
+ </el-col>
+ <el-col :span="2">
+ <span>鍖呰瑕佹眰</span>
+ </el-col>
+ <el-col :span="6">
+ <el-input
+ v-model="dataForm.customerOrder.packageRequire"
+ 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.qualityRequire"
+ placeholder=""
+ ></el-input>
+ </el-col>
+ <el-col :span="2">
+ <span>鐢熶骇闇�姹傝鏄�</span>
+ </el-col>
+ <el-col :span="6">
+ <el-input
+ v-model="dataForm.customerOrder.otherProductRequire"
+ placeholder=""
+ ></el-input>
+ </el-col>
+ <el-col :span="2">
+ <span>绯荤粺</span>
+ </el-col>
+ <el-col :span="6">
+ <el-input
+ v-model="dataForm.customerOrder.divisionSystem"
+ 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.shippingAddress"
+ placeholder=""
+ ></el-input>
+ </el-col>
+ <el-col :span="2">
+ <span>涓氬姟鍛�</span>
+ </el-col>
+ <el-col :span="6">
+ <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>
+ </el-col>
+ <el-col :span="6">
+ <el-input
+ v-model="dataForm.customerOrder.lengthRequirement"
+ 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>
+ </el-row>
+ </div> -->
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
@@ -170,46 +385,50 @@
/>
</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/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 {
- currentSelectRow: null,
+ salesSelectData: null,
+ currentSelectRow: 0,
option: tableOption,
tableData: [{
"$cellEdit": true,
"$index": 0,
"partNo": "",
- "customerPartSpec": "",
+ "specs": "",
"manufactureAttr": "",
"productName": "",
"productType": "",
@@ -219,45 +438,29 @@
"remark": "",
"isTrusted": true
}],
+ staffOptions: [],
title: '',
isFullScreen: false,
visible: false,
buttonDisable: false,
showPart: false,
dataForm: {
- id: 0,
contractNo: null,
customerName: null,
- entityName: null,
- salesDepartment: null,
- province: null,
- salesMan: null,
- originalContractStatus: null,
- isCp: null,
customerNo: null,
- returnStatus: null,
- placeOrderDate: null,
+ customerOrderVOList: [],
+ deliveryDate: null,
+ entityName: null,
factoryPlaceOrderDate: null,
- customerOrder: {
- partNo: null,
- unit: null,
- buyQtyDue: null,
- voltAgeClass: null,
- productName: null,
- manufactureAttr: 'S',
- outerColor: null,
- customerPartSpec: null,
- printType: null,
- printingRequirements: null,
- packageRequire: null,
- qualityRequire: null,
- otherProductRequire: null,
- divisionSystem: null,
- shippingAddress: null,
- salesmanName: null,
- lengthRequirement: null,
- remark: null
- }
+ salesDepartment: null,
+ isCp: null,
+ originalContractStatus: null,
+ placeOrderDate: null,
+ province: null,
+ returnStatus: null,
+ salesMan: null,
+ salerWorkCode: null,
+ comment: null
},
dataRule: {},
units: [],
@@ -267,10 +470,23 @@
mounted: function() {
this.getDicUnit('unit') // 鑾峰彇鍗曚綅
this.getManufactureAttrs('manufacture_attr_type')
+ this.getStaffOptions();
},
methods: {
- delRow(row,index) {
+ delRow(row,index){
this.tableData.splice(index,1)
+ },
+ selsctionSales(data){
+ 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
+ })
},
init(id) {
this.initDataForm()
@@ -280,46 +496,44 @@
})
},
initDataForm() {
- this.dataForm.id = 0
this.dataForm.contractNo = null
this.dataForm.customerName = null
this.dataForm.entityName = null
- this.dataForm.salesDepartment = null
this.dataForm.province = null
this.dataForm.salesMan = null
this.dataForm.originalContractStatus = null
this.dataForm.isCp = null
this.dataForm.customerNo = null
this.dataForm.returnStatus = null
- this.dataForm.placeOrderDate = null
- this.dataForm.factoryPlaceOrderDate = null
- this.dataForm.customerOrder.partNo = null
- this.dataForm.customerOrder.unit = null
- this.dataForm.customerOrder.buyQtyDue = null
- this.dataForm.customerOrder.voltAgeClass = null
- this.dataForm.customerOrder.productName = null
- this.dataForm.customerOrder.manufactureAttr = 'S'
- this.dataForm.customerOrder.outerColor = null
- this.dataForm.customerOrder.customerPartSpec = null
- this.dataForm.customerOrder.printType = null
- this.dataForm.customerOrder.printingRequirements = null
- this.dataForm.customerOrder.packageRequire = null
- this.dataForm.customerOrder.qualityRequire = null
- this.dataForm.customerOrder.otherProductRequire = null
- this.dataForm.customerOrder.divisionSystem = null
- this.dataForm.customerOrder.shippingAddress = null
- this.dataForm.customerOrder.salesmanName = null
- this.dataForm.customerOrder.lengthRequirement = null
- this.dataForm.customerOrder.remark = null
+ this.dataForm.placeOrderDate = dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss')
+ this.dataForm.factoryPlaceOrderDate = dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss')
+ this.dataForm.deliveryDate = null
+ this.dataForm.comment = null
+ this.dataForm.customerOrderVOList = [{
+ "$cellEdit": true,
+ "$index": 0,
+ "partNo": "",
+ "specs": "",
+ "manufactureAttr": "",
+ "productName": "",
+ "productType": "",
+ "otcUnit": "",
+ "buyQtyDue": "",
+ "shippingAddress": "",
+ "remark": "",
+ "isTrusted": true
+ }]
},
// 琛ㄥ崟鎻愪氦
dataFormSubmit() {
this.buttonDisable = true
this.$refs.dataForm.validate((valid) => {
+ this.dataForm.customerOrderVOList = this.tableData
if (valid) {
addObj(this.dataForm)
.then((data) => {
this.$message.success('娣诲姞鎴愬姛')
+ this.initDataForm();
this.visible = false
this.buttonDisable = false
this.$emit('refreshDataList', 1)
@@ -338,12 +552,16 @@
this.showPart = true
},
selectPart(part) {
+ console.log(part);
+ const index = this.currentSelectRow
if (part) {
- this.dataForm.customerOrder.partNo = part.partNo
- const index = this.currentSelectRow
- this.tableData[index].partNo = part.partNo
- this.tableData[index].customerPartSpec = part.specs
- this.tableData[index].productName = part.partName
+ 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
+
}
},
// 鍏ㄥ睆
@@ -372,3 +590,23 @@
}
}
</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