From 3d8bdfa2a0ec48a9cc7a2f581e94ef08861401d7 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 13 九月 2023 11:52:54 +0800
Subject: [PATCH] 销售订单bug修复

---
 src/components/view/sale.vue |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index 6549080..56b9c32 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -132,9 +132,8 @@
 			<span>鐘舵�侊細</span>
 			<el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
 				<el-option label="鍏ㄩ儴" :value="null"></el-option>
-				<el-option label="閫氳繃" :value="0"></el-option>
-				<el-option label="涓嶉�氳繃" :value="1"></el-option>
-				<el-option label="鏈鏍�" :value="2"></el-option>
+				<el-option label="閫氳繃" :value="1"></el-option>
+				<el-option label="涓嶉�氳繃" :value="0"></el-option>
 			</el-select>
 			<span>浜よ揣鏃ユ湡锛�</span>
 			<el-date-picker v-model="search.delTime" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 30px;"
@@ -174,7 +173,8 @@
 						<span class="table_do" @click="changeShowDetail(scope.row)">&nbsp;鏌ョ湅璇︽儏&nbsp;</span>
 						<span class="table_do" v-if="scope.row.type==null" @click="saleCheck(scope)">&nbsp;瀹℃牳&nbsp;</span>
 						<span class="table_do" v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-						<span class="table_do" @click="openUpDia(scope.row.id)">&nbsp;缂栬緫&nbsp;</span>
+						<span class="table_do" v-if="scope.row.type==null" @click="openUpDia(scope.row.id)">&nbsp;缂栬緫&nbsp;</span>
+						<span class="table_do" v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
 						<span class="table_do" @click="delSale(scope.$index)">&nbsp;鍒犻櫎&nbsp;</span>
 					</template>
 				</el-table-column>
@@ -364,7 +364,7 @@
 							<el-table-column prop="number" label="鏁伴噺">
 								<template slot-scope="scope">
 									<el-input v-model.number="scope.row.number" size="small"
-										@change="scope.row.number = isNaN(scope.row.number)?0:scope.row.number" clearable
+										 @change="(val)=>scope.row.number = isNaN(val)?null:val" clearable
 										placeholder="璇疯緭鍏�"></el-input>
 								</template>
 							</el-table-column>
@@ -430,7 +430,10 @@
 		},
 		methods: {
 			handleSelectionChange(val) {
-				this.selects = val.id;
+				this.selects = []
+				val.forEach(a=>{
+					this.selects.push(a.id)
+				})
 			},
 			handleSizeChange(val) {
 				this.pageSize = val
@@ -565,7 +568,6 @@
 				})
 			},
 			upSale() {
-				console.log(this.addData);
 				for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
 					if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
 						this.addData.saleMaterialList.splice(b, 1)
@@ -581,7 +583,8 @@
 					}
 				}
 				for (var a in this.addData) {
-					if ((this.addData[a] == null || this.addData[a] == '') && a != 'type') {
+					console.log(a);
+					if ((this.addData[a] == null || this.addData[a] == '') && a!='checkname' && a!='checkTime' && a != 'type') {
 						if (a == 'saleMaterialList') {
 							this.$message.error('浜у搧淇℃伅涓嶈兘涓虹┖')
 						} else {
@@ -613,6 +616,10 @@
 			},
 			delSales(){
 				console.log(this.selects);
+				if(this.selects.length==0) {
+					this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹垹闄�')
+					return
+				}
 				this.axios.post(this.$api.url.delAllSale,{
 					ids: this.selects
 				}, {

--
Gitblit v1.9.3