diff --git a/main.js b/main.js index 799a43ae..e0109f94 100644 --- a/main.js +++ b/main.js @@ -35,9 +35,9 @@ Vue.prototype.COMPANY = "" if (process.env.NODE_ENV === 'development') { // 开发环境 console.log('开发环境') - Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址 + // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址 // Vue.prototype.url_config = 'http://47.93.215.234:11211/' // 鞍钢测试地址 - // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 + Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 diff --git a/pages/login/login.vue b/pages/login/login.vue index d391073b..88bf1bb9 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -259,7 +259,7 @@ export default { position: fixed; left: 20rpx; right: 20rpx; - bottom: 50rpx; + bottom: 15%; > view { padding: 20rpx 0; diff --git a/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue b/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue index 0555aa63..ff8aaf7f 100644 --- a/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue +++ b/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue @@ -9,9 +9,9 @@ *验收单位 - + - {{typeList[typeIndex] ? typeList[typeIndex].name : ""}} + {{enterpriseInfoList[typeIndex] ? enterpriseInfoList[typeIndex].name : ""}} @@ -28,8 +28,8 @@ *验收时间 @@ -52,6 +52,11 @@ import { computed } from "vue"; }, data(){ return{ + projectSn: '', + enterpriseInfoList: [], + isDisabled: false, + checkedTime: '', + statusBarHeight: 0, title: "下发验证任务", inspectTime:'', @@ -74,24 +79,50 @@ import { computed } from "vue"; }] } }, + created() { + this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')) + }, onShow(){ this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; }, onLoad(val){ this.formData.dangerousEngineeringId = val.id + this.getEnterpriseInfoList() }, methods:{ + async getEnterpriseInfoList(){ + await this.sendRequest({ + url:'xmgl/enterpriseInfo/list', + method:'post', + data:{ + // engineeringId: this.detailId, + projectSn: this.projectSn, + }, + success:res=>{ + uni.hideLoading() + console.log("xmgl/xzDangerousEngineeringAcceptance/list",res); + this.enterpriseInfoList = res.result; + + + } + }) + }, + + checkRadio(val){ this.formData.acceptanceResult = val }, + bindTextAreaBlur(e){ console.log(e) this.formData.acceptanceDescribe = e.detail.value }, + bindInputBlur(e){ console.log(e) this.formData.acceptanceRegion = e.detail.value }, + uploadImg() { var that = this uni.chooseImage({ @@ -113,6 +144,7 @@ import { computed } from "vue"; } }) }, + //删除附件 deleteImg(val, type) { let that = this; @@ -153,10 +185,12 @@ import { computed } from "vue"; urls: [url] }) }, + bindLength(e){ // console.log(e) this.textareaLengh = e.detail.value.split('').length }, + saveForm(){ // console.log(this.formData) let data = { @@ -205,6 +239,7 @@ import { computed } from "vue"; } }) }, + bindPickerChange(e){ this.typeIndex = e.target.value this.formData.acceptanceType = this.typeList[e.target.value].id diff --git a/pages/projectEnd/dangerBigProject/details.vue b/pages/projectEnd/dangerBigProject/details.vue index 814a1047..277317c4 100644 --- a/pages/projectEnd/dangerBigProject/details.vue +++ b/pages/projectEnd/dangerBigProject/details.vue @@ -123,10 +123,10 @@ id: 7, name: "管控要点" }, - // { - // id: 8, - // name: "最终验收" - // } + { + id: 8, + name: "最终验收" + } ], activeIndex: 1, detailId: "", diff --git a/pages/projectEnd/dangerBigProject/finallyAcceptance.vue b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue index db6a6c2f..dd7d5479 100644 --- a/pages/projectEnd/dangerBigProject/finallyAcceptance.vue +++ b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue @@ -1,20 +1,20 @@