From 748d1c51fd519d77a711ff21be002fce69aca380 Mon Sep 17 00:00:00 2001
From: tt <1301725380@qq.com>
Date: Tue, 22 Oct 2024 10:44:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=90=88=E5=90=8C&=E5=95=86=E5=93=81?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
admin/src/api/admin.js | 15 ++
admin/src/views/proManagement/contract.vue | 216 +++++++++++++++++++--
admin/src/views/proManagement/index.vue | 11 +-
admin/vue.config.js | 2 +-
4 files changed, 224 insertions(+), 20 deletions(-)
diff --git a/admin/src/api/admin.js b/admin/src/api/admin.js
index a47a3365..c8b7d469 100644
--- a/admin/src/api/admin.js
+++ b/admin/src/api/admin.js
@@ -53,3 +53,18 @@ export function getContractListsApi() {
method: "get",
});
}
+// 保存合同信息
+export function postSubmitContractApi(data) {
+ return request({
+ url: `/admin/setting/savecontractsetting`,
+ method: "post",
+ data,
+ });
+}
+// 下载合同信息
+export function postDownloadContractApi() {
+ return request({
+ url: `/admin/setting/getContractSetting`,
+ method: "get",
+ });
+}
diff --git a/admin/src/views/proManagement/contract.vue b/admin/src/views/proManagement/contract.vue
index b41fd66a..858cd169 100644
--- a/admin/src/views/proManagement/contract.vue
+++ b/admin/src/views/proManagement/contract.vue
@@ -2,33 +2,90 @@
-
境内合同
-
- 文件:{{ contractObj.domestic }}
-
-
下载境内合同境内合同:
+
+ 上传境内合同
+
+
+ 下载境内合同
+
-
境外合同
-
- 文件:{{ contractObj.abroad }}
-
-
下载境外合同境外合同:
+
+ 上传境外合同
+
+
+ 下载境外合同
+
+
+
+
+
+ 点击上传
+
+
+
+
+ 取消
+ 确定
+
+
diff --git a/admin/src/views/proManagement/index.vue b/admin/src/views/proManagement/index.vue
index b9b79d4f..3f978c43 100644
--- a/admin/src/views/proManagement/index.vue
+++ b/admin/src/views/proManagement/index.vue
@@ -94,7 +94,7 @@
width="60"
prop="night"
>
-
-
+ -->
@@ -364,9 +364,10 @@ export default {
handleWordSuccess(res, file, fileList, index) {
console.log(res, file, fileList, "成功了");
if (res) {
- this.formData.trip_info = fileList
- .map((item) => item.url || item.response.url)
- .join(",");
+ // this.formData.trip_info = fileList
+ // .map((item) => item.url || item.response.url)
+ // .join(",");
+ this.formData.trip_info = `${window.location.protocol}//${window.location.host}${res.data}`;
this.fieldFileList = [
{
name: file.name,
diff --git a/admin/vue.config.js b/admin/vue.config.js
index 143fb6f1..6548c67c 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -40,7 +40,7 @@ module.exports = {
"/dev-api": {
// 接口地址 以 api开头的都走下面的配置
// target: 'https://www.szjinao.cn', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
- target: 'http://192.168.0.100:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
+ target: "http://hex.jipinq.cn", // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
ws: true, // 是否支持 websocket 请求 支持
changeOrigin: true, // 是否启用跨域
pathRewrite: {