From 94c2c08f2c2c0eca2c6b27dd85d6f1ddc2a719c9 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 08 一月 2024 16:59:05 +0800
Subject: [PATCH] 提示语修改 要晚于
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 76 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index a6efeb0..e4e0366 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -107,7 +107,7 @@
:disabled="isNameChanceEdit || isView"
></el-autocomplete>
<div
- v-if="!isNameChanceEdit && !isView"
+ v-if="!isNameChanceEdit && !isView&&editConfig.infomation.client_name"
class="common-select-btn"
@click="selClientClick('chance')"
>
@@ -178,7 +178,7 @@
:disabled="isAddQuatation || isView"
></el-autocomplete>
<div
- v-if="!isAddQuatation && !isView"
+ v-if="!isAddQuatation && !isView&&editConfig.infomation.sale_chance_name"
class="common-select-btn"
@click="selClientClick('quotation')"
>
@@ -208,6 +208,7 @@
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
:disabled="isView"
+ :picker-options="pickerOptionsBefore"
>
</el-date-picker>
</el-form-item>
@@ -235,6 +236,7 @@
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
:disabled="isView"
+ :picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
@@ -299,7 +301,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鐗╂祦鍏徃" prop="logisticCompany">
<el-input v-model="editConfig.infomation.logisticCompany" :disabled="isView"></el-input>
</el-form-item>
@@ -308,7 +310,7 @@
<el-form-item label="鐗╂祦鍗曞彿" prop="logisticNumber">
<el-input v-model="editConfig.infomation.logisticNumber" :disabled="isView"></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
<el-input-number
@@ -407,6 +409,7 @@
ref="commonFormTableView"
:detail-enter="isView?true:false"
:selectBox="false"
+ :addTypeIdMultiple="true"
:show-summary="showSummary"
pageName="quotation"
:isOperate="((autoCodeHeadersObj.Bjd=='yes'&&editConfig.infomation.quotation_number)||autoCodeHeadersObj.Bjd!='yes')?true:false"
@@ -414,6 +417,7 @@
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
+ @getSelectArray="getSelectArray"
@emptyProductClick="emptyProductClick"
@clearupProduct="clearupProduct"
></CommonFormTableView>
@@ -599,7 +603,17 @@
quotationId: this.editCommonConfig.infomation.quotationId,
tableData: [],
isView: this.editCommonConfig.title === "鏌ョ湅",
- thatMember: {}
+ thatMember: {},
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7;
+ },
+ },
+ pickerOptionsBefore:{
+ disabledDate(time) {
+ return time.getTime() > Date.now();
+ },
+ }
}
},
created() {
@@ -773,6 +787,7 @@
if (res.code == 200) {
console.log(res)
this.quotationList = res.data.list
+ this.count=res.data.count;
if (value === "鍏ㄩ儴浜у搧") {
// this.quotationList.map((item) => {
// if (item.id === this.editConfig.infomation.quotationId) {
@@ -800,11 +815,15 @@
restaurants = this.clientList
console.log(restaurants, "瀹㈡埛鍗�")
} else if (value === "chance") {
- restaurants = this.saleChancelist
+ if(this.editConfig.infomation.client_name){
+ restaurants = this.saleChancelist
+ }
} else if (value === "subbill") {
restaurants = this.subOrderList
} else if (value === "quotation") {
- restaurants = this.quotationList
+ if(this.editConfig.infomation.sale_chance_name){
+ restaurants = this.quotationList
+ }
}
var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
@@ -882,6 +901,8 @@
this.editSelCommonConfig.title = "鎶ヤ环鍗�"
this.editSelCommonConfig.editVisible = true
this.editSelCommonConfig.clientId = this.clientId
+ this.editSelCommonConfig.isRequest = false
+ this.editSelCommonConfig.count=this.count
this.editSelCommonConfig.tableInfomation = [...this.quotationList]
}
},
@@ -995,21 +1016,32 @@
},
// 浜у搧鏂板
addProductClick() {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- cost:'',
- profit:'',
- margin:'',
- total: 0,
- unit: ""
- })
+ // this.productId++
+ // this.tableData.push({
+ // productId: this.productId,
+ // id: 0,
+ // amount: 0,
+ // desc: "",
+ // name: "",
+ // number: "",
+ // price: 0,
+ // cost:'',
+ // profit:'',
+ // margin:'',
+ // total: 0,
+ // unit: ""
+ // })
+ // this.showSummary.show = true
+ },
+ // 鏂板鏂瑰紡淇敼
+ getSelectArray(val){
+ if(val.length>0){
+ val.map((item, index) => {
+ item.productId = this.tableData.length + index+1
+ })
+ }
+ this.tableData=this.tableData.concat(val);
+ this.productTableList.tableData=this.tableData
this.showSummary.show = true
},
// 浜у搧娓呯┖
--
Gitblit v1.8.0