From c0bc2331e9abb2ae003c8dc0ab4524d6101493a1 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 25 九月 2023 09:12:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/sale.vue | 97 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 79 insertions(+), 18 deletions(-)
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index 2e10f82..60bd99f 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -118,9 +118,8 @@
<el-button type="success" @click="syncOrder"
:icon="isSync ? 'el-icon-loading' : 'el-icon-refresh'">鍚屾</el-button>
<el-button type="primary" icon="el-icon-plus" @click="openAddDia">鏂板</el-button>
- <!-- <el-button icon="el-icon-edit-outline">淇敼</el-button> -->
<el-button icon="el-icon-delete" @click="delSales">鍒犻櫎</el-button>
- <el-button icon="el-icon-download">瀵煎嚭</el-button>
+ <el-button icon="el-icon-download" @click="exportSale">瀵煎嚭</el-button>
</el-col>
</el-row>
</div>
@@ -156,29 +155,35 @@
</el-table-column>
<el-table-column prop="order_number" label="璁㈠崟缂栧彿" width="150">
</el-table-column>
- <el-table-column prop="code" label="鍚堝悓缂栧彿" width="220">
+ <el-table-column label="璁㈠崟绫诲瀷" width="100">
+ <template slot-scope="scope">
+ <el-tag effect="dark" size="mini" style="font-size: 8px;">{{ scope.row.order_type }}</el-tag>
+ </template>
</el-table-column>
- <el-table-column prop="name" label="宸ョ▼鍚嶇О">
+ <el-table-column prop="code" label="鍚堝悓缂栧彿" >
</el-table-column>
- <el-table-column prop="proname" label="瀹㈡埛鍚嶇О">
+ <el-table-column prop="name" label="宸ョ▼鍚嶇О" width="120">
+ </el-table-column>
+ <el-table-column prop="proname" label="瀹㈡埛鍚嶇О" width="120">
</el-table-column>
<el-table-column prop="浜よ揣鏃ユ湡" label="浜よ揣鏃ユ湡" width="150">
</el-table-column>
- <el-table-column prop="note" label="澶囨敞" width="150">
+ <el-table-column prop="note" label="澶囨敞" width="150" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="type" label="鐘舵��" width="100">
<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 style="color: #ff9900;" v-else>鏈鏍�</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="220">
<template slot-scope="scope">
<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" @click="downloadFile(scope.row)"> 涓嬭浇闄勪欢 </span>
+ <span class="table_do" v-if="scope.row.type == 2" @click="saleCheck(scope)"> 瀹℃牳 </span>
<span class="table_do" v-else> </span>
- <span class="table_do" v-if="scope.row.type == null"
+ <span class="table_do" v-if="scope.row.type == 2"
@click="openUpDia(scope.row.id)"> 缂栬緫 </span>
<span class="table_do" v-else> </span>
<span class="table_do" @click="delSale(scope.$index)"> 鍒犻櫎 </span>
@@ -284,7 +289,7 @@
</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="900px"
@close="closeDialog">
<div class="body">
<div class="head">鍩烘湰淇℃伅</div>
@@ -304,6 +309,10 @@
<el-col :span="3">宸ョ▼鍚嶇О</el-col>
<el-col :span="8">
<el-input v-model="addData.name" size="small" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" clearable></el-input>
+ </el-col>
+ <el-col :span="3" :offset="2">澶囨敞</el-col>
+ <el-col :span="8">
+ <el-input v-model="addData.note" size="small" placeholder="璇疯緭鍏ュ娉�" clearable></el-input>
</el-col>
</el-row>
</div>
@@ -349,35 +358,35 @@
placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅">
+ <el-table-column prop="unit" label="鍗曚綅" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.unit" size="small" clearable placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="number" label="鏁伴噺">
+ <el-table-column prop="number" label="鏁伴噺" width="100">
<template slot-scope="scope">
<el-input v-model.number="scope.row.number" size="small"
@change="(val) => scope.row.number = isNaN(val) ? null : val" clearable
placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="price" label="鍗曚环">
+ <el-table-column prop="price" label="鍗曚环" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.price" size="small" clearable placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="username" label="鑱旂郴浜�">
+ <el-table-column prop="username" label="鑱旂郴浜�" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.username" size="small" clearable
placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="phone" label="鐢佃瘽">
+ <el-table-column prop="phone" label="鐢佃瘽" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.phone" size="small" clearable placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="address" label="鍦板潃">
+ <el-table-column prop="address" label="鍦板潃" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.address" size="small" clearable
placeholder="璇疯緭鍏�"></el-input>
@@ -424,6 +433,7 @@
orderNumber: null,
code: null,
name: null,
+ note: null,
proname: null,
adress: null,
username: null,
@@ -441,11 +451,62 @@
this.selectRawInspectsList()
},
methods: {
+ downloadFile(row) {
+ let baseIp = "http://192.168.18.16:9999"
+ this.axios.post(this.$api.url.saleDownload, {
+ id: row.id
+ }).then(res => {
+ const fileUrls = []; // 鏂囦欢鐨剈rls
+ res.data.forEach(item=>{
+ let url=baseIp+item
+ fileUrls.push(url)
+ })
+ const downloadFile = (url, fileName) => {
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = fileName;
+ // link.style.display = 'none';
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ };
+
+ console.log(fileUrls);
+ fileUrls.forEach((url, index) => {
+ let s=url.split(".")
+ const fileName = row.name+`闄勪欢(${index + 1}).`+s[s.length-1];
+ downloadFile(url, fileName);
+ });
+ })
+ },
+ //閿�鍞鍗曞鍑�
+ exportSale(){
+ this.$axios.post(this.$api.url.exportSale,{
+ delTime: this.search.delTime,
+ name: this.search.name,
+ type: this.search.type,
+ orderNumber: this.search.code
+ },{responseType:'blob',headers:{"Content-Type":"application/json"}}).then((res)=>{
+ const result = res;
+ var nameList = result.headers['content-disposition'];
+ nameList = decodeURI(nameList);
+ var fileName = nameList.split('=')[1];
+ const blob = new Blob([result.data,{type: 'application/vnd.ms-excel'}]);
+ const link = document.createElement('a');
+ link.download = fileName;
+ const URL = window.URL || window.webkitURL;
+ link.href= URL.createObjectURL(blob);
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ }).catch()
+ },
closeDialog() {
this.addData = {
orderNumber: null,
code: null,
name: null,
+ note: null,
proname: null,
adress: null,
username: null,
@@ -475,7 +536,7 @@
message: '鍚屾鍋囨垚鍔�(鈼曖礂鈼�)锛�',
type: 'success'
});
- this.isSync=false
+ this.isSync = false
}, 2000);
return
//璋冪敤鍚屾鎺ュ彛
@@ -627,7 +688,7 @@
} else {
for (var c in this.addData.saleMaterialList[b]) {
if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
- .keys(this.addData.saleMaterialList[b]).length != 6) {
+ .keys(this.addData.saleMaterialList[b]).length != 9) {
this.$message.error('浜у搧淇℃伅鏈夊繀濉」鏈～鍐�')
return
}
--
Gitblit v1.9.3