From afeff6d0531995b45da033404eb4b6369e69715e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Thu, 12 Dec 2024 17:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               | 16 +++++-----
 src/components/scImport/index.vue             | 32 +++++++++++--------
 src/views/cost/feeRecords/index.vue           |  2 +-
 src/views/order/inventoryList/index.vue       |  2 +-
 src/views/order/orderList/index.vue           |  2 +-
 src/views/setting/advanced/setup/material.vue |  2 +-
 src/views/setting/bom/index.vue               |  2 +-
 src/views/setting/company/index.vue           |  2 +-
 .../setting/partsMag/components/info.vue      |  2 +-
 .../setting/partsMag/components/library.vue   |  2 +-
 src/views/setting/user/index.vue              |  2 +-
 11 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/.env.production b/.env.production
index 6f8ae33..3198248 100644
--- a/.env.production
+++ b/.env.production
@@ -5,15 +5,15 @@ NODE_ENV = production
 VUE_APP_TITLE = 象纬云科
 
 # 测试环境
- VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1
- VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1
- VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss
- VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss
+# VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1
+# VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1
+# VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss
+# VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss
 
 # 线上环境
 # 接口地址 # WS地址
-# VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1
-# VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1
-# VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss
-# VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss
+ VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1
+ VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1
+ VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss
+ VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss
 
diff --git a/src/components/scImport/index.vue b/src/components/scImport/index.vue
index de6331e..1f76ae5 100644
--- a/src/components/scImport/index.vue
+++ b/src/components/scImport/index.vue
@@ -58,7 +58,7 @@
 		</div>
 		<template #footer>
 			<el-button @click="visible=false">取 消</el-button>
-			<el-button type="primary" @click="save">确定导入</el-button>
+			<el-button type="primary" :disabled="!importTrue || progressShow" @click="save">确定导入</el-button>
 		</template>
 	</el-dialog>
 </template>
@@ -72,6 +72,7 @@ export default {
 	props:{
 		size:{type:String, default:'small'},
 		title:{type:String, default: ""},
+		type:{type:[String, Number], default: ""}
 	},
 	data(){
 		return{
@@ -90,7 +91,9 @@ export default {
 			progressShow:false,
 			errorShow:false,
 			importInfo:{},
-			errorList:[]
+			errorList:[],
+
+			// 按数组的形式展示
 		}
 	},
 	setup(){
@@ -108,16 +111,18 @@ export default {
 	methods:{
 		getWsResult(res){
 			if(res.data && (res.data.type == 4 || res.data.type == 5 || res.data.type == 10 || res.data.type == 17 || res.data.type == 18 || res.data.type == 27 || res.data.type == 28 || res.data.type == 31 || res.data.type == 42)){
-				this.importInfo = res.data;
-				this.progressShow = true;
-				if(res.data.status == 0){
-					this.errorShow = true;
-					let text = res.data;
-					this.errorList.push(text);
-				}
-				if(res.data.rate == 100){
-					this.progressShow = false;
-					this.$emit('importSuccess');
+				if(this.type == res.data.type){
+					this.importInfo = res.data;
+					this.progressShow = true;
+					if(res.data.status == 0){
+						this.errorShow = true;
+						let text = res.data;
+						this.errorList.push(text);
+					}
+					if(res.data.rate == 100){
+						this.progressShow = false;
+						this.$emit('importSuccess');
+					}
 				}
 			}
 		},
@@ -163,12 +168,11 @@ export default {
 		},
 		save(){
 			this.errorClick();
-
 			this.$emit('parentParams',this.params);
 		},
 		// 上传成功
 		handleSuccess(){
-			// this.$message.success('上传成功，马上开始导入数据');
+
 		},
 		// 上传失败
 		handleError(){
diff --git a/src/views/cost/feeRecords/index.vue b/src/views/cost/feeRecords/index.vue
index a929aec..a569217 100644
--- a/src/views/cost/feeRecords/index.vue
+++ b/src/views/cost/feeRecords/index.vue
@@ -4,7 +4,7 @@
 			<div class="left-panel">
 				<el-button type="primary" v-auth="'addCost'" :size="size" icon="el-icon-plus" @click="add">新增</el-button>
 				<el-button type="danger" plain v-auth="'deleteCost'" :disabled="selection.length>0?false:true" :size="size" icon="el-icon-delete" @click="all_del"></el-button>
-				<scImport ref="scImport" :size="size" title="批量导入费用流水" @parentParams="importUpload" @importSuccess="importSuccess">
+				<scImport ref="scImport" :size="size" type="18" title="批量导入费用流水" @parentParams="importUpload" @importSuccess="importSuccess">
 					<template #header>
 						<el-button v-auth="'costFlowImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
 					</template>
diff --git a/src/views/order/inventoryList/index.vue b/src/views/order/inventoryList/index.vue
index 9911b2e..4dfc2db 100644
--- a/src/views/order/inventoryList/index.vue
+++ b/src/views/order/inventoryList/index.vue
@@ -2,7 +2,7 @@
 	<el-container class="mainBox mainBoxHeaderNoBorder">
 		<el-header>
 			<div class="left-panel">
-				<scImport ref="scImport" :size="size" title="批量导入库存" @parentParams="importUpload" @importSuccess="importSuccess">
+				<scImport ref="scImport" :size="size" type="27" title="批量导入库存" @parentParams="importUpload" @importSuccess="importSuccess">
 					<template #header>
 						<el-button v-auth="'importInventory'" type="primary" :size="size" plain @click="importFile" style="margin-right: 12px;">批量导入</el-button>
 					</template>
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index c5828ee..2091805 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -3,7 +3,7 @@
 		<el-header class="header">
 			<div class="left-panel">
 				<el-button type="primary" v-auth="'maintenanceOrderAdd'" :size="size" icon="el-icon-plus" @click="add">新增工单</el-button>
-				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
+				<scImport ref="scImport" :size="size" type="10" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
 					<template #header>
 						<el-button v-auth="'maintenanceOrderImport'" type="primary" :size="size" plain @click="importFile" style="margin-right: 12px;">批量导入</el-button>
 					</template>
diff --git a/src/views/setting/advanced/setup/material.vue b/src/views/setting/advanced/setup/material.vue
index 513a0e5..33de69d 100644
--- a/src/views/setting/advanced/setup/material.vue
+++ b/src/views/setting/advanced/setup/material.vue
@@ -5,7 +5,7 @@
 				<div class="left-panel">
 					<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增</el-button>
 					<el-button plain type="danger" :disabled="selection.length>0?false:true" :size="size" icon="el-icon-Delete" @click="all_delete"></el-button>
-					<scImport ref="scImport" :size="size" title="批量导入物料成本" @parentParams="importUpload" @importSuccess="importSuccess">
+					<scImport ref="scImport" :size="size" type="17" title="批量导入物料成本" @parentParams="importUpload" @importSuccess="importSuccess">
 						<template #header>
 							<el-button type="primary" :size="size" plain @click="importFile">批量导入</el-button>
 						</template>
diff --git a/src/views/setting/bom/index.vue b/src/views/setting/bom/index.vue
index 336d7d3..9b1f37a 100644
--- a/src/views/setting/bom/index.vue
+++ b/src/views/setting/bom/index.vue
@@ -3,7 +3,7 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button type="primary" v-auth="'addBom'" :size="size" icon="el-icon-plus" @click="add">新增BOM</el-button>
-				<scImport ref="scImport" :size="size" title="批量导入BOM" @parentParams="importUpload" @importSuccess="importSuccess">
+				<scImport ref="scImport" :size="size" type="42" title="批量导入BOM" @parentParams="importUpload" @importSuccess="importSuccess">
 					<template #header>
 						<el-button v-auth="'bomImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
 					</template>
diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue
index f65fb2b..d7c797b 100644
--- a/src/views/setting/company/index.vue
+++ b/src/views/setting/company/index.vue
@@ -3,7 +3,7 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button type="primary" v-auth="'organizationAdd'" :size="size" icon="el-icon-plus" @click="add">新增公司</el-button>
-				<scImport ref="scImport" :size="size" title="批量导入公司组织" @parentParams="importUpload" @importSuccess="importSuccess">
+				<scImport ref="scImport" :size="size" type="5" title="批量导入公司组织" @parentParams="importUpload" @importSuccess="importSuccess">
 					<template #header>
 						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
 					</template>
diff --git a/src/views/setting/partsMag/components/info.vue b/src/views/setting/partsMag/components/info.vue
index 01e963d..5732fa3 100644
--- a/src/views/setting/partsMag/components/info.vue
+++ b/src/views/setting/partsMag/components/info.vue
@@ -4,7 +4,7 @@
 			<div class="left-panel">
 				<el-button type="primary" v-auth="'sparePartsInfoAdd'" :size="size" icon="el-icon-plus" @click="add">新增备件信息</el-button>
 				<el-button type="danger" v-auth="'sparePartsInfoDelete'" :size="size" plain @click="batch_del" :disabled="selection.length==0?true:false">删除</el-button>
-				<scImport ref="scImport" :size="size" title="批量导入" @parentParams="importUpload" @importSuccess="importSuccess">
+				<scImport ref="scImport" :size="size" type="31" title="批量导入备件信息" @parentParams="importUpload" @importSuccess="importSuccess">
 					<template #header>
 						<el-button v-auth="'sparePartsInfoImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
 					</template>
diff --git a/src/views/setting/partsMag/components/library.vue b/src/views/setting/partsMag/components/library.vue
index d67bd98..50690cc 100644
--- a/src/views/setting/partsMag/components/library.vue
+++ b/src/views/setting/partsMag/components/library.vue
@@ -4,7 +4,7 @@
 			<div class="left-panel">
 				<el-button type="primary" v-auth="'sparePartsAdd'" :size="size" icon="el-icon-plus" @click="add">新增备件</el-button>
 				<el-button type="danger" v-auth="'sparePartsDelete'" :size="size" plain @click="batch_del" :disabled="selection.length==0?true:false">删除</el-button>
-				<scImport ref="scImport" :size="size" title="批量导入" @parentParams="importUpload" @importSuccess="importSuccess">
+				<scImport ref="scImport" :size="size" type="28" title="批量导入备件" @parentParams="importUpload" @importSuccess="importSuccess">
 					<template #header>
 						<el-button v-auth="'sparePartsImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
 					</template>
diff --git a/src/views/setting/user/index.vue b/src/views/setting/user/index.vue
index 0772c90..20db862 100644
--- a/src/views/setting/user/index.vue
+++ b/src/views/setting/user/index.vue
@@ -28,7 +28,7 @@
 					<el-button type="danger" v-auth="'delUser'" plain :size="size" icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
 					<el-button type="primary" v-auth="'addUserRoles'" plain :size="size" :disabled="selection.length==0" @click="role">分配角色</el-button>
 					<el-button type="primary" plain :size="size" :disabled="selection.length==0" @click="rePwd">密码重置</el-button>
-					<scImport ref="scImport" :size="size" title="批量导入用户" @parentParams="importUpload" @importSuccess="importSuccess">
+					<scImport ref="scImport" :size="size" type="4" title="批量导入用户" @parentParams="importUpload" @importSuccess="importSuccess">
 						<template #header>
 							<el-button v-auth="'userImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
 						</template>