From 7eeeadfd5a4c13923db680b99a4a23339a214da4 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 十二月 2023 17:28:52 +0800
Subject: [PATCH] modified: src/page/index/logo.vue modified: src/views/equipment/equipment/index.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/manufacturingorder/index.vue modified: src/views/quality/Packaging_ledger/index.vue
---
src/views/plan/customerorder/sample-customerorder-form.vue | 72 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 737f3ca..8a89e4c 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" clearable 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>
@@ -135,6 +135,19 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="璁㈠崟澶囨敞" prop="comment">
+ <el-input
+ v-model="dataForm.comment"
+ style="width: 100%"
+ type="textarea"
+ :rows="1"
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
</div>
@@ -143,15 +156,16 @@
</el-divider>
<div>
<avue-crud ref="crud"
+ show-hide="false"
:option="option"
:data="tableData">
<template slot="partNo" slot-scope="scope">
- <el-input v-model="scope.row.partNo" placeholder="" readonly>
+ <el-input v-model="scope.row.partNo" placeholder="鏌ヨ闆朵欢鍙�" readonly>
<el-button slot="append" icon="el-icon-search" @click="openPartDialog(scope.row.$index)"></el-button>
</el-input>
</template>
<template slot="otcUnit" slot-scope="scope">
- <el-select v-model="scope.row.otcUnit" placeholder="" style="width: 100%">
+ <el-select v-model="scope.row.otcUnit" placeholder="璇烽�夋嫨鍗曚綅" style="width: 100%">
<el-option
v-for="item in units"
:key="item.value"
@@ -392,13 +406,33 @@
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 { tableOption } from '@/const/crud/customerOrder/customerOrderForm'
export default {
components: {
PartDialog
+ },
+ watch:{
+ visible(newVal){
+ if(!newVal){
+ this.tableData = [{
+ "$cellEdit": true,
+ "$index": 0,
+ "partNo": "",
+ "customerPartSpec": "",
+ "manufactureAttr": "",
+ "productName": "",
+ "productType": "",
+ "otcUnit": "",
+ "buyQtyDue": "",
+ "shippingAddress": "",
+ "remark": "",
+ "isTrusted": true
+ }]
+ }
+ }
},
data() {
return {
@@ -441,6 +475,7 @@
returnStatus: null,
salesMan: null,
salerWorkCode: null,
+ comment: null
},
dataRule: {},
units: [],
@@ -454,8 +489,11 @@
},
methods: {
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)=>{
@@ -479,9 +517,24 @@
this.dataForm.isCp = null
this.dataForm.customerNo = null
this.dataForm.returnStatus = null
- this.dataForm.placeOrderDate = null
- this.dataForm.factoryPlaceOrderDate = 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": "",
+ "customerPartSpec": "",
+ "manufactureAttr": "",
+ "productName": "",
+ "productType": "",
+ "otcUnit": "",
+ "buyQtyDue": "",
+ "shippingAddress": "",
+ "remark": "",
+ "isTrusted": true
+ }]
},
// 琛ㄥ崟鎻愪氦
dataFormSubmit() {
@@ -492,6 +545,7 @@
addObj(this.dataForm)
.then((data) => {
this.$message.success('娣诲姞鎴愬姛')
+ this.initDataForm();
this.visible = false
this.buttonDisable = false
this.$emit('refreshDataList', 1)
--
Gitblit v1.9.3