Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
This commit is contained in:
commit
8ecafcc1ae
|
@ -2,7 +2,7 @@
|
|||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-04-11 10:11:40
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-08-01 14:33:29
|
||||
* @LastEditTime: 2022-08-01 14:42:22
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
|
|
|
@ -755,6 +755,9 @@ export default {
|
|||
if (!this.submitFrom.deptContacts) {
|
||||
this.notFilled.push('部门联系人')
|
||||
}
|
||||
if (!this.submitFrom.deptId) {
|
||||
this.notFilled.push('归属部门')
|
||||
}
|
||||
if (!this.submitFrom.deptPhone) {
|
||||
this.notFilled.push('部门联系人电话')
|
||||
}
|
||||
|
|
|
@ -680,6 +680,9 @@ export default {
|
|||
if (!this.submitFrom.shareCondition) {
|
||||
this.notFilled.push('共享条件')
|
||||
}
|
||||
if (!this.submitFrom.deptId) {
|
||||
this.notFilled.push('归属部门')
|
||||
}
|
||||
if (!this.submitFrom.deptContacts) {
|
||||
this.notFilled.push('部门联系人')
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-03-29 16:45:25
|
||||
* @LastEditors: hisense.liangjunhua
|
||||
* @LastEditTime: 2022-07-30 19:11:54
|
||||
* @LastEditTime: 2022-08-01 11:15:53
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
|
@ -59,12 +59,11 @@
|
|||
// window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
|
||||
// window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
|
||||
// window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
|
||||
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
|
||||
window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://192.168.124.5:8888/renren-admin';
|
||||
window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
window.SITE_CONFIG['backUrl'] = 'http://192.168.124.236:9797';
|
||||
window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
|
||||
window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
|
||||
window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
// 穿透版本
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
|
||||
|
|
|
@ -677,7 +677,9 @@
|
|||
break
|
||||
case '归属部门':
|
||||
dataFrom.value.deptId = obj.attrValue
|
||||
if (obj.attrValueTwo) {
|
||||
dataFrom.value.deptName = obj.attrValueTwo.label
|
||||
}
|
||||
break
|
||||
case '部门联系人':
|
||||
dataFrom.value.deptContacts = obj.attrValue
|
||||
|
|
|
@ -522,7 +522,9 @@
|
|||
break
|
||||
case '归属部门':
|
||||
dataFrom.value.deptId = obj.attrValue
|
||||
if (obj.attrValueTwo) {
|
||||
dataFrom.value.deptName = obj.attrValueTwo.label
|
||||
}
|
||||
break
|
||||
case '部门联系人':
|
||||
dataFrom.value.deptContacts = obj.attrValue
|
||||
|
|
|
@ -600,7 +600,9 @@
|
|||
break
|
||||
case '归属部门':
|
||||
dataFrom.value.deptId = obj.attrValue
|
||||
if (obj.attrValueTwo) {
|
||||
dataFrom.value.deptName = obj.attrValueTwo.label
|
||||
}
|
||||
break
|
||||
case '部门联系人':
|
||||
dataFrom.value.deptContacts = obj.attrValue
|
||||
|
|
|
@ -599,7 +599,9 @@
|
|||
break
|
||||
case '归属部门':
|
||||
dataFrom.value.deptId = obj.attrValue
|
||||
if (obj.attrValueTwo) {
|
||||
dataFrom.value.deptName = obj.attrValueTwo.label
|
||||
}
|
||||
break
|
||||
case '部门联系人':
|
||||
dataFrom.value.deptContacts = obj.attrValue
|
||||
|
|
|
@ -496,7 +496,9 @@
|
|||
break
|
||||
case '归属部门':
|
||||
dataFrom.value.deptId = obj.attrValue
|
||||
if (obj.attrValueTwo) {
|
||||
dataFrom.value.deptName = obj.attrValueTwo.label
|
||||
}
|
||||
break
|
||||
case '部门联系人':
|
||||
dataFrom.value.deptContacts = obj.attrValue
|
||||
|
|
Loading…
Reference in New Issue