From c35ccb51c02c8852e345b831ef5d2dd96c2cf500 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 30 八月 2023 16:39:33 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM
---
src/views/supplierManage/supplier/AddSupplier.vue | 120 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 21 deletions(-)
diff --git a/src/views/supplierManage/supplier/AddSupplier.vue b/src/views/supplierManage/supplier/AddSupplier.vue
index c313db1..4e35814 100644
--- a/src/views/supplierManage/supplier/AddSupplier.vue
+++ b/src/views/supplierManage/supplier/AddSupplier.vue
@@ -14,7 +14,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="150px"
size="mini"
>
<!-- 淇℃伅 -->
@@ -43,8 +43,8 @@
size="mini"
>
<el-option
- v-for="item in supplierTypeOptions"
- :key="item.id"
+ v-for="(item, index) in supplierTypeOptions"
+ :key="index"
:label="item.name"
:value="item.name"
>
@@ -63,7 +63,12 @@
class="common-select-sel"
size="mini"
>
- <el-option v-for="item in industryOptions" :key="item.id" :label="item.name" :value="item.name">
+ <el-option
+ v-for="(item, index) in industryOptions"
+ :key="index"
+ :label="item.name"
+ :value="item.name"
+ >
</el-option>
</el-select>
<div class="common-select-btn" @click="setIndustry"><i class="el-icon-setting"></i></div>
@@ -86,15 +91,20 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞礋璐ｄ汉" prop="responsiblePersonId">
+ <el-form-item label="閿�鍞礋璐ｄ汉" prop="responsiblePersonName">
<!-- <el-input v-model="editConfig.infomation.responsiblePersonId"></el-input> -->
<el-select
- v-model="editConfig.infomation.responsiblePersonId"
+ v-model="editConfig.infomation.responsiblePersonName"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 63%"
>
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
+ <el-option
+ v-for="item in memberOptions"
+ :key="item.id"
+ :label="item.username"
+ :value="item.userName"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -150,7 +160,7 @@
<span style="margin-left: 5px">鍚堝悓闄勪欢</span>
</div>
</template>
- <div class="annex-view">
+ <div v-if="file_id === 0" class="annex-view">
<div @click="addAnnexClick">
<el-upload
class="upload-demo"
@@ -168,13 +178,15 @@
</el-upload>
</div>
</div>
- <div v-if="file_name && file_name.length > 0" class="file-content">
+ <!-- v-if="file_name && file_name.length > 0" -->
+ <div v-else class="file-content">
<div>{{ file_name }}</div>
<div>
- <el-button type="text">棰勮</el-button>
- <el-button type="text">涓嬭浇</el-button>
- <el-button type="text">鍒犻櫎</el-button>
+ <el-button type="text" @click="previewClick" style="margin-left: 10px">棰勮</el-button>
+ <el-button type="text" @click="downloadClick">涓嬭浇</el-button>
+ <el-button type="text" @click="delContractClick">鍒犻櫎</el-button>
</div>
+ <div ref="file"></div>
</div>
</el-form-item>
</el-col>
@@ -193,9 +205,20 @@
</template>
<script>
-import { createSupplier, createContract, updateSupplier } from "@/api/supplierManage/supplier"
+import {
+ createSupplier,
+ createContract,
+ updateSupplier,
+ getIndustryList,
+ getSupplierTypeList,
+ deleteContract
+ // previewContract
+} from "@/api/supplierManage/supplier"
import EditDropdownDialog from "@/views/other/commonDialog/EditDropdownDialog"
-import { getSupplierTypeList } from "@/api/supplierManage/supplier"
+import { getMemberListFromGrpc } from "@/api/common/other"
+import download from "downloadjs"
+// import { renderAsync } from "docx-preview"
+// import axios from "axios"
export default {
name: "AddSupplierDialog",
props: {
@@ -214,11 +237,11 @@
computed: {},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "60%",
editConfig: this.addCommonConfig,
rules: {
name: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- responsiblePersonId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ responsiblePersonName: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
phone: [
{ required: false, message: "", trigger: "blur" },
{ len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: "blur" },
@@ -246,23 +269,47 @@
infomation: {}
},
fileList: [],
- file_name: "",
- file_id: this.addCommonConfig.infomation.fileId
+ file_name: this.addCommonConfig.infomation.file_name,
+ file_id: this.addCommonConfig.infomation.fileId,
+ previewUrl: "",
+ loading: false
}
},
created() {
this.getSupplierTypeList()
+ this.getIndustryList()
+ this.getMemberList()
+ if (this.editConfig.title === "淇敼") {
+ // this.previewContract()
+ }
},
methods: {
+ // 閿�鍞礋璐ｄ汉
+ async getMemberList() {
+ await getMemberListFromGrpc({
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ console.log(res)
+ this.memberOptions = res.data.data.list
+ })
+ },
// 渚涘簲鍟嗙被鍨�
async getSupplierTypeList() {
await getSupplierTypeList({
page: 1,
pageSize: 100
}).then((res) => {
- console.log("dsss")
- console.log(res.data)
this.supplierTypeOptions = res.data.data.list
+ })
+ },
+ // 鎵�灞炶涓�
+ async getIndustryList() {
+ await getIndustryList({
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ this.industryOptions = res.data.data.list
})
},
handleClose() {
@@ -317,7 +364,7 @@
name: data.name || "",
number: data.number || "",
phone: data.phone || "",
- responsiblePersonId: data.responsiblePersonId || 0,
+ responsiblePersonName: data.responsiblePersonName || "",
status: data.status || 0,
supplierType: data.supplierType || "",
url: data.url || ""
@@ -369,6 +416,37 @@
handleExceed(files, fileList) {
console.log(fileList)
this.$message.warning(`褰撳墠闄愬埗閫夋嫨 1 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠禶)
+ },
+ // 涓嬭浇鍚堝悓
+ downloadClick() {
+ let url = "/api/con/downloadContract?id=" + this.file_id
+ download(url, "", "")
+ },
+ // 鍒犻櫎鍚堝悓
+ delContractClick() {
+ deleteContract({
+ id: this.file_id
+ }).then((res) => {
+ console.log(res)
+ this.$message.success(res.msg)
+ this.file_id = 0
+ })
+ },
+ // 棰勮鍚堝悓
+ async previewClick() {
+ this.previewUrl = "/api/con/previewContract?id=" + this.file_id
+ if (this.file_name.includes("pdf")) {
+ window.open(this.previewUrl, "_blank")
+ } else {
+ let routeUrl = this.$router.resolve({
+ path: "/PreviewFile",
+ query: {
+ //瑕佷紶鐨勫弬鏁�
+ previewUrl: this.previewUrl
+ }
+ })
+ window.open(routeUrl.href, "_blank")
+ }
}
}
}
--
Gitblit v1.8.0