From f9971e230a549754cc985db1e625336f5fd38ff2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 19 九月 2023 11:22:46 +0800
Subject: [PATCH] modified: src/components/view/Processingproducts.vue modified: src/components/view/equipmentmaintain.vue modified: src/components/view/sale.vue modified: src/components/view/standard.vue modified: src/components/view/technology.vue
---
src/components/view/sale.vue | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index 0df137d..508fe7a 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -50,7 +50,7 @@
.select-model .body {
padding: 0 20px;
color: #333;
- max-height: 70vh;
+ max-height: 72vh;
overflow-y: auto;
}
@@ -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)"> 鏌ョ湅璇︽儏 </span>
<span class="table_do" v-if="scope.row.type==null" @click="saleCheck(scope)"> 瀹℃牳 </span>
<span class="table_do" v-else> </span>
- <span class="table_do" @click="openUpDia(scope.row.id)"> 缂栬緫 </span>
+ <span class="table_do" v-if="scope.row.type==null" @click="openUpDia(scope.row.id)"> 缂栬緫 </span>
+ <span class="table_do" v-else> </span>
<span class="table_do" @click="delSale(scope.$index)"> 鍒犻櫎 </span>
</template>
</el-table-column>
@@ -282,7 +282,8 @@
</el-dialog>
</div>
<div class="select-model">
- <el-dialog :title="`閿�鍞�${upDia==true?'淇敼':'鏂板'}`" :visible.sync="addDia" width="800px">
+ <el-dialog :title="`閿�鍞�${upDia==true?'淇敼':'鏂板'}`" :visible.sync="addDia" width="850px"
+ @close="closeDialog">
<div class="body">
<div class="head">鍩烘湰淇℃伅</div>
<div class="content">
@@ -333,7 +334,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>
@@ -351,7 +352,7 @@
</el-input>
</template>
</el-table-column>
- <el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" width="200">
+ <el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" width="180">
<template slot-scope="scope">
<el-input v-model="scope.row.specifications" size="small" clearable placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"></el-input>
</template>
@@ -364,7 +365,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 +403,7 @@
delTime: null
},
tableData: [],
- selects: [],
+ selects: '',
currentPage: 1,
countSize: 0,
pageSize: 10,
@@ -429,8 +430,28 @@
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.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 +477,7 @@
})
},
clean() {
- this.selects = []
+ this.selects = ''
this.currentPage = 1
this.countSize = 0
this.pageSize = 10
@@ -464,7 +485,8 @@
formTime: null,
createTime: null,
insState: 2,
- judgeState: 2
+ judgeState: 2,
+ type: null
}
this.selectRawInspectsList()
},
@@ -540,6 +562,7 @@
type: 1
}).then(res => {
this.selectRawInspectsList()
+ this.$parent.removeAllTab()
})
}).catch(e => {
if (e == 'cancel') {
@@ -565,7 +588,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 +603,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 +635,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