From 58c4b6003ad6f9a96d53c944bedc09f6ec3f0910 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期日, 24 九月 2023 18:35:56 +0800
Subject: [PATCH] modified: src/assets/api/controller.js modified: src/components/view/sale.vue modified: src/components/view/standard.vue modified: src/main.js modified: src/view/index.vue
---
src/components/view/standard.vue | 2
src/main.js | 5
src/view/index.vue | 428 ++++++++++++++++++++++++++++-------------------------
src/assets/api/controller.js | 1
src/components/view/sale.vue | 28 +++
5 files changed, 257 insertions(+), 207 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index f6adcf8..7f270a8 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -185,6 +185,7 @@
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
addSale: "sale/addSale", //鏂板閿�鍞崟
saleCheck: "sale/check", //瀹℃牳閿�鍞崟
+ exportSale: "sale/exportSale",//瀵煎嚭閿�鍞鍗�
synchronization: "sale/synchronization", //鍚屾
updateSaleById: "sale/updateSaleById", //鏍规嵁閿�鍞崟id淇敼璇︽儏淇℃伅
delSale: "sale/delSale", //鏍规嵁閿�鍞崟id鍒犻櫎
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index e4c28ad..ddcaea1 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -119,7 +119,7 @@
: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-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>
@@ -160,7 +160,7 @@
<el-tag effect="dark" size="mini" style="font-size: 8px;">{{scope.row.order_type}}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="code" label="鍚堝悓缂栧彿" width="220">
+ <el-table-column prop="code" label="鍚堝悓缂栧彿" >
</el-table-column>
<el-table-column prop="name" label="宸ョ▼鍚嶇О" width="120">
</el-table-column>
@@ -174,7 +174,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>{{null}}</span>
+ <span style="color: #ff9900;" v-else>鏈鏍�</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="220">
@@ -450,6 +450,28 @@
this.selectRawInspectsList()
},
methods: {
+ //閿�鍞鍗曞鍑�
+ 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,
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 3cbdff9..cab6949 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -48,7 +48,7 @@
<el-option :value="0" label="宸ヨ壓璺嚎"></el-option>
<el-option :value="1" label="鎶�鏈寚鏍�"></el-option>
<el-option :value="2" label="鐗╂枡娓呭崟"></el-option>
- <!-- <el-option :value="3" label="鐢熶骇宸ヨ壓"></el-option> -->
+ <el-option :value="3" label="鐢熶骇宸ヨ壓"></el-option>
</el-select>
<span>鐗堟湰锛�</span>
<el-select v-model="versionVal" @change="verevent" size="small" style="width: 13vw;margin-right: 15px;" placeholder="璇烽�夋嫨">
diff --git a/src/main.js b/src/main.js
index 7fc1e88..9a81a52 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
Vue.use(qs);
Vue.use(api);
-const javaApi = 'http://192.168.14.249:8001'
+const javaApi = 'http://localhost:8001'
// const javaApi = 'http://127.0.0.1:8001/'
@@ -67,6 +67,9 @@
})
axios.interceptors.response.use(res => {
+ if(res.config.responseType === 'blob'){
+ return res;
+ }
return res.data
}, async function(err) {
if (JSON.stringify(err).indexOf('timeout of') > -1) {
diff --git a/src/view/index.vue b/src/view/index.vue
index 0c7c5f5..b259012 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -284,208 +284,232 @@
userName: "value",
leftOpen: true,
menu: [{
- k: 0,
- v: "棣栭〉",
- i: "font icon-shouye",
- c: [{
- k: 0,
- v: "棣栭〉",
- i: "font icon-shouye",
- u: "index-index"
- }]
- },
- {
- k: 3,
- v: "閿�鍞鐞�",
- i: "font icon-jine",
- c: [{
- k: 11,
- v: "閿�鍞鐞�",
- i: "font icon-jine",
- u: "sale"
- }]
- },
- {
- k: 1,
- v: "鎶�鏈鐞�",
- i: "font icon-ic_form_set24px",
- c: [{
- k: 1,
- v: "鏍囧噯BOM",
- i: "font icon-shouye",
- u: "standard"
- },
- {
- k: 2,
- v: "璁㈠崟BOM",
- i: "font icon-shouye",
- u: "technical"
- }
- ]
- },
- {
- k: 4,
- v: "鐢熶骇绠＄悊",
- i: "font icon-shengchanguanli",
- c: [{
- k: 12,
- v: "鐢熶骇璁㈠崟",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 13,
- v: "鐢熶骇璁″垝",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 14,
- v: "鐢熶骇鎶ュ伐",
- i: "font icon-shouye",
- u: ""
- }
- ]
- },
- {
- k: 5,
- v: "WMS绠＄悊",
- i: "font icon-a-Inventorydumprequest",
- c: [{
- k: 17,
- v: "鍗婃垚鍝佸簱瀛�",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 18,
- v: "鎴愬搧搴撳瓨",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 19,
- v: "鎴愬搧鍙戣揣",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 20,
- v: "鎴愬搧鍏ュ簱",
- i: "font icon-shouye",
- u: ""
- }
- ]
- },
- {
- k: 2,
- v: "QMS绠＄悊",
- i: "font icon-xunhuan",
- c: [{
- k: 3,
- v: "鍘熸潗鏂欐楠�",
- i: "font icon-shouye",
- u: "rawInsBox"
- },
- {
- k: 4,
- v: "鍘熸潗鏂欎笉鍚堟牸鍝�",
- i: "font icon-shouye",
- u: "rawUnqualifiedBox"
- },
- {
- k: 5,
- v: "杩囩▼妫�楠�",
- i: "font icon-shouye",
- u: "processInspection"
- },
- {
- k: 6,
- v: "浜у搧妫�楠�",
- i: "font icon-shouye",
- u: "finishedProductInspection"
- },
- {
- k: 7,
- v: "涓嶅悎鏍煎搧绠＄悊",
- i: "font icon-shouye",
- u: "unqualifiedManagement"
- },
- {
- k: 9,
- v: "璐ㄩ噺缁熻",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 10,
- v: "璁￠噺绠＄悊",
- i: "font icon-shouye",
- u: "measurementManagement"
- },
- {
- k: 10.1,
- v: "涓嶅悎鏍煎搧澶勭疆",
- i: "font icon-shouye",
- u: "Processingproducts"
- }
- ]
- },
- {
- k: 6,
- v: "鏍哥畻绠＄悊",
- i: "font icon-caiwuhesuanxitong",
- c: [{
- k: 21,
- v: "浜ч噺宸ヨ祫",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 22,
- v: "鍛樺伐鍑哄嫟",
- i: "font icon-shouye",
- u: ""
- }
- ]
- },
- {
- k: 7,
- v: "鍩虹鏁版嵁",
- i: "font icon-a-ziyuan20",
- c: [{
- k: 23,
- v: "鐢熶骇璁板綍缁存姢",
- i: "font icon-shouye",
- u: "record-content"
- },
- {
- k: 25,
- v: "鎶�鏈寚鏍囩淮鎶�",
- i: "font icon-shouye",
- u: "Technicalindex"
- },
- {
- k: 26,
- v: "宸ヨ壓璺嚎缁存姢",
- i: "font icon-shouye",
- u: "technology"
- },
- {
- k: 27,
- v: "璁惧缁存姢",
- i: "font icon-shouye",
- u: "laboratoryManagement"
- },
- {
- k: 28,
- v: "鐗╂枡娓呭崟缁存姢",
- i: "font icon-shouye",
- u: "mbom"
- }
- ]
- }
- ],
+ k: 0,
+ v: "棣栭〉",
+ i: "font icon-shouye",
+ c: [{
+ k: 0,
+ v: "棣栭〉",
+ i: "font icon-shouye",
+ u: "index-index"
+ }]
+ },
+ {
+ k: 3,
+ v: "閿�鍞鐞�",
+ i: "font icon-jine",
+ c: [{
+ k: 11,
+ v: "閿�鍞鐞�",
+ i: "font icon-jine",
+ u: "sale"
+ }]
+ },
+ {
+ k: 1,
+ v: "鎶�鏈鐞�",
+ i: "font icon-ic_form_set24px",
+ c: [{
+ k: 1,
+ v: "鏍囧噯BOM",
+ i: "font icon-shouye",
+ u: "standard"
+ },
+ {
+ k: 2,
+ v: "璁㈠崟BOM",
+ i: "font icon-shouye",
+ u: "technical"
+ }
+ ]
+ },
+ {
+ k: 4,
+ v: "鐢熶骇绠＄悊",
+ i: "font icon-shengchanguanli",
+ c: [{
+ k: 12,
+ v: "鐢熶骇璁㈠崟",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 13,
+ v: "鐢熶骇璁″垝",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 14,
+ v: "鐢熶骇鎶ュ伐",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ },
+ {
+ k: 5,
+ v: "WMS绠＄悊",
+ i: "font icon-a-Inventorydumprequest",
+ c: [{
+ k: 15,
+ v: "鍘熸潗鏂欏簱瀛�",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 16,
+ v: "鍥炲崟绠＄悊",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 17,
+ v: "鍗婃垚鍝佸簱瀛�",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 18,
+ v: "鎴愬搧搴撳瓨",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 19,
+ v: "鎴愬搧鍙戣揣",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 20,
+ v: "鎴愬搧鍏ュ簱",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ },
+ {
+ k: 2,
+ v: "QMS绠＄悊",
+ i: "font icon-xunhuan",
+ c: [{
+ k: 3,
+ v: "鍘熸潗鏂欐楠�",
+ i: "font icon-shouye",
+ u: "rawInsBox"
+ },
+ {
+ k: 4,
+ v: "鍘熸潗鏂欎笉鍚堟牸鍝�",
+ i: "font icon-shouye",
+ u: "rawUnqualifiedBox"
+ },
+ {
+ k: 5,
+ v: "杩囩▼妫�楠�",
+ i: "font icon-shouye",
+ u: "processInspection"
+ },
+ {
+ k: 6,
+ v: "鎴愬搧妫�楠�",
+ i: "font icon-shouye",
+ u: "finishedProductInspection"
+ },
+ {
+ k: 7,
+ v: "涓嶅悎鏍煎搧绠＄悊",
+ i: "font icon-shouye",
+ u: "unqualifiedManagement"
+ },
+ {
+ k: 9,
+ v: "璐ㄩ噺缁熻",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 10,
+ v: "璁￠噺绠＄悊",
+ i: "font icon-shouye",
+ u: "measurementManagement"
+ },
+ {
+ k: 10.1,
+ v: "涓嶅悎鏍煎搧澶勭疆",
+ i: "font icon-shouye",
+ u: "Processingproducts"
+ }
+ ]
+ },
+ {
+ k: 6,
+ v: "鏍哥畻绠＄悊",
+ i: "font icon-caiwuhesuanxitong",
+ c: [{
+ k: 21,
+ v: "浜ч噺宸ヨ祫",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 22,
+ v: "鍛樺伐鍑哄嫟",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ },
+ {
+ k: 7,
+ v: "鍩虹鏁版嵁",
+ i: "font icon-a-ziyuan20",
+ c: [{
+ k: 23,
+ v: "鐢熶骇璁板綍缁存姢",
+ i: "font icon-shouye",
+ u: "record-content"
+ },
+ {
+ k: 24,
+ v: "鑷椤圭洰缁存姢",
+ i: "font icon-shouye",
+ u: "self-inspection"
+ },
+ {
+ k: 25,
+ v: "鎶�鏈寚鏍囩淮鎶�",
+ i: "font icon-shouye",
+ u: "Technicalindex"
+ },
+ {
+ k: 26,
+ v: "宸ヨ壓璺嚎缁存姢",
+ i: "font icon-shouye",
+ u: "technology"
+ },
+ {
+ k: 27,
+ v: "璁惧缁存姢",
+ i: "font icon-shouye",
+ u: "laboratoryManagement"
+ },
+ {
+ k: 28,
+ v: "鐗╂枡娓呭崟缁存姢",
+ i: "font icon-shouye",
+ u: "mbom"
+ },
+ {
+ k: 30,
+ v: "鐢熶骇宸ヨ壓缁存姢",
+ i: "font icon-shouye",
+ u: "equipmentmaintain"
+ }
+ ]
+ }
+ ],
activeBox: 0,
activeP: 0,
tabActive: 0,
--
Gitblit v1.9.3