From 4033993c2be9079b7d306365a65ad5467b4125d6 Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Fri, 30 Jun 2023 17:22:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=B6=A6=E9=A1=B9=E7=9B=AE-=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +- .../projectFront/projectSummary/baseInfo.vue | 2141 +++++++++-------- .../projectSummary/cooperationUnit.vue | 29 +- .../projectSummary/manageTeam.vue | 27 +- .../quality/material/forwardingUnit.vue | 173 +- .../quality/material/receivingUnit.vue | 29 +- 6 files changed, 1295 insertions(+), 1108 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 57726866..73c6e08e 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,12 +84,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 - axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 + // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上(新)地址 // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式 - // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ + axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // axios.defaults.baseURL ='http://192.168.34.221:8079' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 diff --git a/src/views/projectFront/projectSummary/baseInfo.vue b/src/views/projectFront/projectSummary/baseInfo.vue index 79d7ccdf..0e9273bf 100644 --- a/src/views/projectFront/projectSummary/baseInfo.vue +++ b/src/views/projectFront/projectSummary/baseInfo.vue @@ -1,1107 +1,1118 @@ - - + + \ No newline at end of file diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue index 5f3dd22f..7b63ba44 100644 --- a/src/views/projectFront/projectSummary/cooperationUnit.vue +++ b/src/views/projectFront/projectSummary/cooperationUnit.vue @@ -313,7 +313,7 @@ prop="registeredCapital" > { if (valid) { this.enterpriseForm.projectSn = this.projectSn diff --git a/src/views/projectFront/projectSummary/manageTeam.vue b/src/views/projectFront/projectSummary/manageTeam.vue index 7322d699..97085fc4 100644 --- a/src/views/projectFront/projectSummary/manageTeam.vue +++ b/src/views/projectFront/projectSummary/manageTeam.vue @@ -172,6 +172,11 @@ import { projectManagementGroupList } from '../../../assets/js/api/manageTeam' +import { + checkPhone, + IdentityCodeValid, +} from '@/assets/js/util.js' + export default { mounted() { this.getList() @@ -263,9 +268,9 @@ export default { console.log('删除', obj) this.$confirm( this.$t('message.personnelPosition.beaconManage.table.confirmText') + - '【' + - obj.personName + - '】?', + '【' + + obj.personName + + '】?', this.$t('message.personnelPosition.beaconManage.table.Tips'), { confirmButtonText: this.$t( @@ -285,9 +290,23 @@ export default { } }) }) - .catch(() => {}) + .catch(() => { }) }, submit() { + if (this.addEditForm.phone) { + if (!checkPhone(this.addEditForm.phone)) { + this.$message.error('请输入正确的手机号') + return + } + } + + if (this.addEditForm.identityCard) { + if (!IdentityCodeValid(this.addEditForm.identityCard)) { + this.$message.error('请输入正确的身份证号'); + return; + } + } + this.processTheFile() let params = JSON.parse(JSON.stringify(this.addEditForm)) params.projectSn = this.$store.state.projectSn diff --git a/src/views/projectFront/quality/material/forwardingUnit.vue b/src/views/projectFront/quality/material/forwardingUnit.vue index fcb48e06..cf5e48ed 100644 --- a/src/views/projectFront/quality/material/forwardingUnit.vue +++ b/src/views/projectFront/quality/material/forwardingUnit.vue @@ -1,9 +1,17 @@