From 66d5eb69cbbf11dab9bdb4a1d6c7d2d8b8eeb874 Mon Sep 17 00:00:00 2001
From: wangxy <xinyao.wang@le-it.com.cn>
Date: Fri, 26 Nov 2021 15:39:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=8E=BB=E6=8E=89=E5=B1=9E=E6=80=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardProperties/addOrEdit.vue             | 16 +++++++++++-----
 .../factoryModel/standardProperties/index.vue    |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/factoryModel/standardProperties/addOrEdit.vue b/src/views/factoryModel/standardProperties/addOrEdit.vue
index 2c5fa19..5586e47 100644
--- a/src/views/factoryModel/standardProperties/addOrEdit.vue
+++ b/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: {
diff --git a/src/views/factoryModel/standardProperties/index.vue b/src/views/factoryModel/standardProperties/index.vue
index 44aefc7..36b2a86 100644
--- a/src/views/factoryModel/standardProperties/index.vue
+++ b/src/views/factoryModel/standardProperties/index.vue
@@ -143,7 +143,7 @@ export default {
     },
     // 重置按钮操作
     resetQuery() {
-      this.queryParams.uomId = undefined;
+      this.queryParams.AttrCode = undefined;
       this.handleQuery();
     },
     // 删除按钮操作

From ef90cd8782ae53e98b460152ee9b53a72fc61174 Mon Sep 17 00:00:00 2001
From: wangxy <xinyao.wang@le-it.com.cn>
Date: Fri, 26 Nov 2021 16:39:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BC=98=E5=8C=96=E3=80=81=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=AE=A1=E7=90=86=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/import.png                | Bin 0 -> 1347 bytes
 src/components/queryComponent/index.vue  |  26 ++++++-
 src/components/queryComponent/upload.vue |  86 +++++++++++++++++++++++
 src/server/api.js                        |   7 ++
 4 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/img/import.png
 create mode 100644 src/components/queryComponent/upload.vue

diff --git a/src/assets/img/import.png b/src/assets/img/import.png
new file mode 100644
index 0000000000000000000000000000000000000000..7765fe8cea9e874f24d20352cbfc662ca3c858bd
GIT binary patch
literal 1347
zcmV-J1-$x+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR917@z|H1ONa40RR917ytkO0OB=utpET7tw}^dR7ee-Rb6WwRTzHG?99&Y
zCi{`i$0jlDMTi@!t+ZAlDXmCB&=M3yLy8JkQ4oKCf{5USH(q;FD@wglgJ2abrhY*&
zO$D_H_M%M_OB2aQ*KD$zot>SJb9~R4nYD^(f&;tnd(OP)d7ksU=j<}<;1NQw$4@5u
znZf$f>B2~@Qr`F33zdg=uoU`sMNfUu(*5$8gKu^B4nAnvOTBQ}g2tU=+pUY<-<IIH
zkBei;RQmNAX7AP*SV|u_UvcIh8-LL*M*!PJwpGE{NBKi>J^58@r^q_K4XxgFV`XJw
z<nxy{e~Z>I#zd5F75|gq_<JpduHOA;_4MiimpiD}EgaMb@l2tmiBr4$-G#z&_fT_U
zi==6hY-H(+&enB<vv>W0H_dEiKZ}{*E(a4D_T;Cb=W8L1K)f$EEW{dZ;`X~}60Cj_
zpG*~x4s{8E-ckcrl7V|3c+5jbERWss5=0}CNgEdx+#GK$+&t3}v8tErRn7*U{<9hp
zHwogMtwYS5K&cM!#1JxO9yL_p@&*h>9d-n`77z%~4)TDOI=sXv2c*+MEKne^Q#3Iw
zs}+H?XYFg96f*p=X~Icp$m%(G+=Js=&=`l`AOa!^o&Z+U&Z!}-2PuY(lFMk%4FSPH
zQv{>$XWL$FXV7Wx_nHZ<HHI`vw7n`~F`bASm|DvrAJ@PIhbHP6&NTfZOtO=9AftS^
zQ&CZVDS~V+)AxPm0OHvU3Oz;K*+L*NVCpHvTmx>-#ZQ}gxNZZfMgqsEAKY#z)e=OS
zBc%tC#$J?#1gD-{ocZ?CO-$?e!RXP^Z4RPj-+)1<NY`}4brXq%i;R`RQF{(|Idyoo
z&=LjyuP<trv|Tp3+2lQ&Rq*vGOuIhpVih^#4#Z<g=rIF!qmI5=3u9f2NEKzL;~}C{
z8a4QzB-XDczjDg>P!YU+qP4SHw$Qy=gS~tKm#Yob`b$L60=I0#oVPJtUqIWvDZ)z<
zQfLZc3+hSWe3;X<5W-d^HuH9~AKo!eAACT2R`Ew-nkzzq1d-_51ugSNAd{L5`UF5S
zmw<ndg*OY>Gr07nds2^^qQmIW!HfYq*AFRXz#|}+a*BeY9P9mbtII^yfZ(@)QqEu#
znVh4O#Vva8z^5M79bDAQ6-<jddnA^79?aZFMWiMK5W=Edsv`gi<gbDgfC7?=!#b{N
z<h)!fYs>H|oJ48o^{b0GcX)%prnOy%rgcyOsR$PfDrO<LQrIL5ED69YstI-_YnWeF
z9kMq>W2NWOdHw8U`^C|bifwexCJ@^dC?;jnUqQE6sufaoMC?mTLYtIYvc_Liy$Q}#
za37YJ__fg!<GwyIvr@Z0Z(PgtE$n6Sm2is^P;NEcvh-Ju30&DgQTQ8_%l<?sLZ;Er
z1%tK8=On8-rsWNB)vuNIYUVO6l)!;v<#D7^`YnNZjUYo%Mt4HV4#vT65?wORVb`Jl
zm=wWE89(}!^(TNUN|lgys86KYkzxWY6~lXQ%ba{4Jai8{ADR)Hl&4P-eDh24^!-Kq
zl}uqZO|}T(T6BK`&}iAtqkvWQ%14geGXea(^JV|H@-G2!i6A)MzgqwR002ovPDHLk
FV1nS5VtfDq

literal 0
HcmV?d00001

diff --git a/src/components/queryComponent/index.vue b/src/components/queryComponent/index.vue
index ada3d03..fc39f2a 100644
--- a/src/components/queryComponent/index.vue
+++ b/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>
diff --git a/src/components/queryComponent/upload.vue b/src/components/queryComponent/upload.vue
new file mode 100644
index 0000000..134257b
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/server/api.js b/src/server/api.js
index 4a15394..cfbb013 100644
--- a/src/server/api.js
+++ b/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,