Merge pull request '标准属性定义优化、客户需求管理工作台新增批量导入' (#27) from wangxy into develop

Reviewed-on: #27
Reviewed-by: Liwei <wei.li@le-it.com.cn>

src/components/queryComponent/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div v-if="isShowComponent" class="handle-right-fixed clearfix">
+    <img v-if="isShowAddButton" @click="handleUpload" src="../../assets/img/import.png" alt="" title="批量导入">
 		<el-dropdown v-if="isDropdown" trigger="click" @visible-change="handleCommand">
 			<span class="el-dropdown-link">
-				<img :src="notalReadyPic" alt="">
+				<img :src="notalReadyPic" alt="" title="检索条件">
 			</span>
 			<template #dropdown>
 				<div class="predict-search-container">
@@ -17,14 +18,24 @@
 				</div>
 			</template>
 		</el-dropdown>
-		<img v-if="isShowAddButton" @click="handleNew" src="../../assets/img/add.png" alt="">
-		<img v-if="isDownload" @click="download" src="../../assets/img/download.png" alt="">
+		<img v-if="isShowAddButton" @click="handleNew" src="../../assets/img/add.png" alt="" title="新增">
+		<img v-if="isDownload" @click="download" src="../../assets/img/download.png" alt="" title="下载">
+		<!-- 上传 -->
+			<uploadTemplate
+				v-if="isShowDialog === 'upload'"
+				:item="item"
+				v-model:isShowDialog="isShowDialog"
+				@editCallBack="completeCallBack" />
 	</div>
 </template>
 
 <script>
+import uploadTemplate from "./upload.vue";
 export default {
   name: "QueryComponent",
+	components: {
+		uploadTemplate
+	},
 	props: ["isShowComponent", "isShowAddButton","customerId","CreateModel", 'isDownload', 'isDropdown'],
 	data() {
 		return {
@@ -32,9 +43,17 @@ export default {
 			notalReadyPic: require('../../assets/img/notalready.png'),
 			// 查询条件
 			SearchId: undefined,
+			isShowDialog: '',
 		}
 	},
   methods: {
+		// 上传
+		handleUpload() {
+			this.isShowDialog = 'upload'
+		},
+		completeCallBack() {
+			this.isShowDialog = ''
+		},
     // 下拉框出现/隐藏时触发的事件
 		handleCommand(bool) {
 			if (bool) {
@@ -82,6 +101,7 @@ export default {
 		width: 24px;
 		height: 24px;
 		cursor: pointer;
+		margin-left: 10px;
 	}
 }
 </style>

src/components/queryComponent/upload.vue

@@ -0,0 +1,86 @@
+<template>
+	<el-dialog :title="title" model-value width="50%" :close-on-click-modal="false" :before-close="cancel">
+		<input
+			type="file"
+			accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, xls, xlsx"
+			@change="previewUpload"
+		>
+		<el-button
+			type="primary"
+			:loading="uploadLoading"
+			icon="el-icon-upload"
+			size="mini"
+			@click="uploadEvent"
+		>上传</el-button>
+	</el-dialog>
+</template>
+<script>
+import { bulkimportfile } from "@/server/api.js";
+export default {
+	name: 'editField',
+	props: {
+		item: {
+			default: null,
+		}
+	},
+	data() {
+		return {
+			title: '导入', // 弹框标题
+			uploadLoading: false,
+      excel: '',
+		}
+	},
+	methods: {
+		cancel() { // 取消按钮
+			this.$emit('update:isShowDialog','')
+		},
+		// 上传文件预览
+    previewUpload(file) {
+      this.excle = file.target.files[0]
+    },
+    // 上传文件
+    uploadEvent() {
+      this.uploadLoading = true
+      if (this.excle === null || this.excle === '' || this.excle === undefined) {
+        this.$message({
+          showClose: true,
+          duration: 2000,
+          message: '请选择文件',
+          type: 'error'
+        })
+        this.uploadLoading = false
+      } else {
+        const uploadData = new FormData()
+        uploadData.append('upload', this.excle)
+        bulkimportfile(uploadData).then(res => {
+          this.uploadLoading = false
+          if (res.code === 200) {
+            this.$message({
+              showClose: true,
+              duration: 2000,
+              message: '导入成功',
+              type: 'success'
+            })
+						this.$emit('editCallBack', true)
+          } else {
+            this.$message({
+              showClose: true,
+              duration: 2000,
+              message: res.msg,
+              type: 'error'
+            })
+          }
+        }).catch((res) => {
+					this.uploadLoading = false
+					this.$message({
+              showClose: true,
+              duration: 2000,
+              message: res.msg,
+              type: 'error'
+            })
+				})
+      }
+    },
+	}
+}
+</script>

src/server/api.js

@@ -62,6 +62,13 @@ export const uploadExcel = (param, customerId, versionId) =>
     headers: { "Content-Type": "multipart/form-data" },
     data: param,
   });
+export const bulkimportfile = (data) =>
+	service.request({
+		url: "/admin/ap/custdemandverhead/bulkimportfile",
+		method: "post",
+		headers: { "Content-Type": "multipart/form-data" },
+		data,
+	});
 export default {
   get,
   post,

src/views/factoryModel/standardProperties/addOrEdit.vue

@@ -83,7 +83,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <!-- <el-col :span="24">
           <el-table
             :data="formData.Valst"
             style="width: 100%; margin-bottom: 10px"
@@ -112,7 +112,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
@@ -131,7 +131,7 @@
   </el-dialog>
 </template>
 <script>
-import { add, edit } from "@/server/factoryModel/standardProperties";
+import { getDetails, add, edit } from "@/server/factoryModel/standardProperties";
 export default {
   name: "editField",
   props: {
@@ -147,7 +147,7 @@ export default {
       loading: false,
       // 表单参数
       formData: {
-        Valst:[],
+        // Valst:[],
       },
       // 表单校验
       rules: {
@@ -180,7 +180,13 @@ export default {
   },
   mounted() {
     if (this.isAddOrEdit == "edit") {
-      this.formData = this.item;
+			getDetails(this.item['Attribute-AttrCode']).then(({code, data}) => {
+				if (code === 200) {
+					if (!data.Valst) 
+						data.Valst = []
+					this.formData = data
+				}
+			})
     }
   },
   methods: {

src/views/factoryModel/standardProperties/index.vue

@@ -143,7 +143,7 @@ export default {
     },
     // 重置按钮操作
     resetQuery() {
-      this.queryParams.uomId = undefined;
+      this.queryParams.AttrCode = undefined;
       this.handleQuery();
     },
     // 删除按钮操作