From 0bcdf6c342896d59cbc189adc48c669b8c6cf2df Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 06 Feb 2024 14:34:33 +0800
Subject: [PATCH] 更新
---
subPackage/workbench/views/labelReportDetail.vue | 5 +
subPackage/workbench/views/cscj.vue | 104 +++++++++++++++++++---------------
common/setting.js | 4
http/api.js | 22 ++++---
4 files changed, 76 insertions(+), 59 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index 1fe3904..c64e154 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,8 +10,8 @@
version: '2.0.0',
// 开发环境接口Url
// devUrl: 'http://z4042833u6.wicp.vip',
- // devUrl: 'http://192.168.2.109:9528',
- devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ devUrl: 'http://192.168.2.109:9528',
+ // devUrl: 'https://srgdjczzxtpt.com:2080/api',
// devUrl: 'https://kt39592615.goho.co',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl: "http://192.168.0.101:9528/",
diff --git a/http/api.js b/http/api.js
index 906b413..819d59c 100644
--- a/http/api.js
+++ b/http/api.js
@@ -26,6 +26,8 @@
}
if (accessToken) {
config.header['Blade-Auth'] = 'bearer ' + accessToken;
+ config.header['roleName'] = uni.getStorageSync("activeRole").roleAlias || "";
+ config.header['communityCode'] = uni.getStorageSync("siteInfo").id || ""
}
if (config.params.tenantId) {
config.header['Tenant-Id'] = config.params.tenantId;
@@ -73,7 +75,7 @@
// })
http.interceptors.response.use((response) => {
-
+
// 若有数据返回则通过
if (response.data.access_token || response.data.key) {
return response.data
@@ -87,8 +89,8 @@
});
return Promise.reject(response);
}
- }else {
- if(response.data.error_code !== 200){
+ } else {
+ if (response.data.error_code !== 200) {
uni.showToast({
title: response.data.msg,
icon: 'none'
@@ -121,15 +123,15 @@
const currentPage = pages[pages.length - 1]
uni.setStorageSync("responIndex", 0)
uni.clearStorageSync()
- // uni.redirectTo({
- // url: `/pages/login/login-account?redirect=/${currentPage.route}`
- // })
-
-
+ // uni.redirectTo({
+ // url: `/pages/login/login-account?redirect=/${currentPage.route}`
+ // })
+
+
uni.showModal({
title: "提示",
content: "请登录",
- showCancel: false,
+ // showCancel: false,
success: res => {
if (res.confirm) {
uni.redirectTo({
@@ -140,7 +142,7 @@
}
}
})
- }else {
+ } else {
uni.showToast({
title: '系统繁忙,请稍后再试',
icon: 'none'
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index 871df8a..dab58dc 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -867,55 +867,65 @@
//表单提交
submit() {
- const that = this
- this.$refs.form.validate().then(valid => {
- if (valid) {
- if (this.form?.images?.length > 0) {
- let urls = []
- this.form.images.forEach(e => {
- urls.push(e.name)
- })
- this.form.imageUrls = urls.join(",")
+ if (!this.form.placeName) {
+ this.$showTips("请输入场所名称")
+ return
+ }
+
+ if (!this.form.label) {
+ this.$showTips("请选择标签")
+ return
+ }
+
+
+ // this.$refs.form.validate().then(valid => {
+ // if (valid) {
+ if (this.form?.images?.length > 0) {
+ let urls = []
+ this.form.images.forEach(e => {
+ urls.push(e.name)
+ })
+ this.form.imageUrls = urls.join(",")
+ }
+
+ this.form.roleName = uni.getStorageSync("activeRole").roleName;
+ if (this.form.isNine == 2 && this.form.nineType) {
+ this.form.nineType = "";
+ }
+ if (this.form.isFront == 2 && this.form.frontType) {
+ this.form.frontType = "";
+ }
+
+ if (this.form.isNine == 1 && !this.form.nineType) {
+ this.$showTips("请选择九小场所类型")
+ return
+ }
+
+ if (this.form.isFront == 1 && !this.form.frontType) {
+ this.$showTips("请选择阵地类型")
+ return
+ }
+
+
+
+ delete this.form.images;
+
+ add(this.form).then(res => {
+ uni.showToast({
+ icon: 'success',
+ title: '提交成功',
+ success() {
+ setTimeout(() => {
+ uni.$emit("refresh")
+ uni.navigateBack()
+ // that.$u.func.globalNavigator(
+ // "/pages/home/index", "switchTab")
+ }, 300)
}
-
- this.form.roleName = uni.getStorageSync("activeRole").roleName;
- if (this.form.isNine == 2 && this.form.nineType) {
- this.form.nineType = "";
- }
- if (this.form.isFront == 2 && this.form.frontType) {
- this.form.frontType = "";
- }
-
- if (this.form.isNine == 1 && !this.form.nineType) {
- this.$showTips("请选择九小场所类型")
- return
- }
-
- if (this.form.isFront == 1 && !this.form.frontType) {
- this.$showTips("请选择阵地类型")
- return
- }
-
-
-
- delete this.form.images;
-
- add(this.form).then(res => {
- uni.showToast({
- icon: 'success',
- title: '提交成功',
- success() {
- setTimeout(() => {
- uni.$emit("refresh")
- uni.navigateBack()
- // that.$u.func.globalNavigator(
- // "/pages/home/index", "switchTab")
- }, 300)
- }
- })
- })
- }
+ })
})
+ // }
+ // })
},
async buildColumn() {
diff --git a/subPackage/workbench/views/labelReportDetail.vue b/subPackage/workbench/views/labelReportDetail.vue
index 7a9ede3..0c80af2 100644
--- a/subPackage/workbench/views/labelReportDetail.vue
+++ b/subPackage/workbench/views/labelReportDetail.vue
@@ -116,6 +116,11 @@
label: '交易过程',
name: 'transactionProcess',
value: '未完善'
+ },
+ {
+ label: '时间',
+ name: 'createTime',
+ value: '未完善'
}
],
form: {
--
Gitblit v1.9.3