From 4c5c20a7c03539104df74072b1b8a81b51c19ab8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 九月 2023 10:42:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/sale.vue |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index 6549080..b106e8f 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>
@@ -402,7 +402,7 @@
 					delTime: null
 				},
 				tableData: [],
-				selects: [],
+				selects: '',
 				currentPage: 1,
 				countSize: 0,
 				pageSize: 10,
@@ -430,7 +430,13 @@
 		},
 		methods: {
 			handleSelectionChange(val) {
-				this.selects = val.id;
+				this.selects = ''
+				val.forEach((a, ai)=>{
+					this.selects += a.id
+					if(ai!=val.length-1){
+						this.selects += ','
+					}
+				})
 			},
 			handleSizeChange(val) {
 				this.pageSize = val
@@ -456,7 +462,7 @@
 				})
 			},
 			clean() {
-				this.selects = []
+				this.selects = ''
 				this.currentPage = 1
 				this.countSize = 0
 				this.pageSize = 10
@@ -464,7 +470,8 @@
 					formTime: null,
 					createTime: null,
 					insState: 2,
-					judgeState: 2
+					judgeState: 2,
+					type: null
 				}
 				this.selectRawInspectsList()
 			},
@@ -565,7 +572,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 +587,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 {
@@ -612,13 +619,12 @@
 				})
 			},
 			delSales(){
-				console.log(this.selects);
+				if(this.selects=='') {
+					this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹垹闄�')
+					return
+				}
 				this.axios.post(this.$api.url.delAllSale,{
 					ids: this.selects
-				}, {
-					headers: {
-						'Content-Type': 'application/json'
-					}
 				}).then(res=>{
 					this.$message.success('鍒犻櫎鎴愬姛')
 					this.selectRawInspectsList()

--
Gitblit v1.9.3