From e4191521af8e8d5299c540d823ea4a71fb9dbcda Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 19 九月 2023 12:56:59 +0800
Subject: [PATCH] modified: src/components/view/raw-ins.vue modified: src/components/view/rawUnqualified/raw.vue modified: src/components/view/sale.vue modified: src/components/view/standard.vue modified: src/components/view/unqualifiedManagement.vue
---
src/components/view/sale.vue | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index 56b9c32..697f19f 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -124,19 +124,20 @@
</div>
<div class="choose">
<span>璁㈠崟缂栧彿锛�</span>
- <el-input v-model="search.code" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 30px;"
+ <el-input v-model="search.code" size="small" placeholder="璇疯緭鍏�" style="width: 13vw;margin-right: 5px;"
clearable></el-input>
<span>浜у搧鍚嶇О锛�</span>
- <el-input v-model="search.name" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 30px;"
+ <el-input v-model="search.name" size="small" placeholder="璇疯緭鍏�" style="width: 13vw;margin-right: 5px;"
clearable></el-input>
<span>鐘舵�侊細</span>
- <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 13vw;margin-right: 5px;">
<el-option label="鍏ㄩ儴" :value="null"></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;"
+ <el-date-picker v-model="search.delTime" size="small" placeholder="璇疯緭鍏�" style="width: 13vw;margin-right: 5px;"
clearable value-format="yyyy-MM-dd"></el-date-picker>
<el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
<el-button size="mini" type="primary" style="background: #004EA2;" @click="selectRawInspectsList()">
@@ -165,7 +166,7 @@
<template slot-scope="scope">
<span style="color: #34BD66;" v-if="scope.row.type==1">閫氳繃</span>
<span style="color: #E84738;" v-else-if="scope.row.type==0">涓嶉�氳繃</span>
- <span v-else></span>
+ <span v-else>鏈鏍�</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="220">
@@ -282,7 +283,8 @@
</el-dialog>
</div>
<div class="select-model">
- <el-dialog :title="`閿�鍞�${upDia==true?'淇敼':'鏂板'}`" :visible.sync="addDia" width="850px">
+ <el-dialog :title="`閿�鍞�${upDia==true?'淇敼':'鏂板'}`" :visible.sync="addDia" width="850px"
+ @close="closeDialog">
<div class="body">
<div class="head">鍩烘湰淇℃伅</div>
<div class="content">
@@ -333,7 +335,7 @@
<el-col :span="3" :offset="2">浜よ揣鏃ユ湡</el-col>
<el-col :span="8">
<el-date-picker v-model="addData.delTime" size="small" placeholder="璇疯緭鍏ヤ氦璐ф棩鏈�" clearable
- value-format="yyyy-MM-dd"></el-date-picker>
+ value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-row>
</div>
@@ -402,7 +404,7 @@
delTime: null
},
tableData: [],
- selects: [],
+ selects: '',
currentPage: 1,
countSize: 0,
pageSize: 10,
@@ -429,10 +431,27 @@
this.selectRawInspectsList()
},
methods: {
+ closeDialog(){
+ this.addData = {
+ orderNumber: null,
+ code: null,
+ name: null,
+ proname: null,
+ adress: null,
+ username: null,
+ delTime: null,
+ orderName: null,
+ phone: null,
+ saleMaterialList: []
+ }
+ },
handleSelectionChange(val) {
- this.selects = []
- val.forEach(a=>{
- this.selects.push(a.id)
+ this.selects = ''
+ val.forEach((a, ai)=>{
+ this.selects += a.id
+ if(ai!=val.length-1){
+ this.selects += ','
+ }
})
},
handleSizeChange(val) {
@@ -459,7 +478,7 @@
})
},
clean() {
- this.selects = []
+ this.selects = ''
this.currentPage = 1
this.countSize = 0
this.pageSize = 10
@@ -467,7 +486,8 @@
formTime: null,
createTime: null,
insState: 2,
- judgeState: 2
+ judgeState: 2,
+ type: null
}
this.selectRawInspectsList()
},
@@ -543,6 +563,7 @@
type: 1
}).then(res => {
this.selectRawInspectsList()
+ this.$parent.removeAllTab()
})
}).catch(e => {
if (e == 'cancel') {
@@ -615,17 +636,12 @@
})
},
delSales(){
- console.log(this.selects);
- if(this.selects.length==0) {
+ 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