FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
Superman_Main
2021-11-29 08:59:18 +08:00
parent ebd6d3bc38 9152f18381
commit cf3dc997d9
6 changed files with 93 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+26 -12
View File
@@ -2327,24 +2327,38 @@
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, { this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
_this: this _this: this
}, res => { }, res => {
let SSRQ = res.data.attrInfoMap.SSRQ.split(',')
let SSRQStr = '' let SSRQStr = ''
let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',')
let ZCCSSRQStr = '' let ZCCSSRQStr = ''
let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',')
let XCXSSRQStr = '' let XCXSSRQStr = ''
for (let i = 0; i < SSRQ.length; i++) { if (res.data.attrInfoMap.SSRQ != null && res.data.attrInfoMap.SSRQ!= ''){
SSRQStr += SSRQ[i].substring(0,10)+',' let SSRQ = res.data.attrInfoMap.SSRQ.split(',')
for (let i = 0; i < SSRQ.length; i++) {
SSRQStr += SSRQ[i].substring(0,10)+','
}
SSRQStr = SSRQStr.substring(0,SSRQStr.length-1)
} }
for (let i = 0; i < ZCCSSRQ.length; i++) { if (res.data.attrInfoMap.ZCCSSRQ != null && res.data.attrInfoMap.ZCCSSRQ!= '') {
ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',')
for (let i = 0; i < ZCCSSRQ.length; i++) {
ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+','
}
ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1)
} }
for (let i = 0; i < XCXSSRQ.length; i++) {
XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' if (res.data.attrInfoMap.XCXSSRQ != null && res.data.attrInfoMap.XCXSSRQ!= '') {
let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',')
for (let i = 0; i < XCXSSRQ.length; i++) {
XCXSSRQStr += XCXSSRQ[i].substring(0,10)+','
}
XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1)
} }
SSRQStr = SSRQStr.substring(0,SSRQStr.length-1)
ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1)
XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1)
res.data.attrInfoMap.SSRQ = SSRQStr res.data.attrInfoMap.SSRQ = SSRQStr
res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr
res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+20 -7
View File
@@ -705,7 +705,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)"> <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceWSSMR('wssmr', '选择我司署名人', form.wssmrId)">
</el-input> </el-input>
<!-- <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>--> <!-- <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
<!-- <el-option--> <!-- <el-option-->
@@ -1068,6 +1068,12 @@
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" :nodeList="nodeList2"
></Role-tree> ></Role-tree>
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag5"
@checkedRole="checkedRole2"
:nodeList="nodeList3"
></Role-tree>
<Role-tree <Role-tree
check-box check-box
:is-title="drawerTitle" :is-title="drawerTitle"
@@ -1310,6 +1316,7 @@
callback() callback()
} }
return { return {
nodeList3:[],
fileList: [], fileList: [],
caFileList: [], caFileList: [],
FBGBJBDFileList: [], FBGBJBDFileList: [],
@@ -1412,6 +1419,7 @@
modalShowFlag2: false, // drawer开关 modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关 modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关 modalShowFlag4: false, // drawer开关
modalShowRoleFlag5 : false,
url:'', url:'',
urlChild:'', urlChild:'',
drawerTitle: '', //drawer标题 drawerTitle: '', //drawer标题
@@ -1761,8 +1769,11 @@
this.roleForm.zrUserName=nameList; this.roleForm.zrUserName=nameList;
} }
if (this.drawerTitle === '选择我司署名人'){ if (this.drawerTitle === '选择我司署名人'){
this.roleForm.wssmrId=idList; this.form.wssmrId=idList;
this.form.wssmr = nameList this.form.wssmr = nameList
this.roleForm.wssmrId=idList;
this.roleForm.wssmr = nameList
} }
}, },
checkedRole (data) { checkedRole (data) {
@@ -2122,6 +2133,13 @@
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
}, },
choiceWSSMR (type, title, id) {
this.nodeList3 = []
this.nodeList.push(id)
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag5 = true
},
choiceZRR1 (type, title, id) { choiceZRR1 (type, title, id) {
this.drawerTitle = title this.drawerTitle = title
this.modalShowFlag1 = true this.modalShowFlag1 = true
@@ -2735,17 +2753,14 @@
}, },
handleSubmit() { handleSubmit() {
debugger
// this.form.country=this.countryArr; // this.form.country=this.countryArr;
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
this.$refs['userForm'].validate((valid) => { this.$refs['userForm'].validate((valid) => {
if (valid) { if (valid) {
this.fileInfoHandle() this.fileInfoHandle()
this.isSubmit = true this.isSubmit = true
this.form.country=this.countryArr; this.form.country=this.countryArr;
console.log("this.form",this.form.wssmr);
var json = Object.assign(this.form, this.roleForm) var json = Object.assign(this.form, this.roleForm)
json.zrUserId = this.form.zrUserId json.zrUserId = this.form.zrUserId
json.jlUserId = this.form.jlUserId json.jlUserId = this.form.jlUserId
@@ -2753,8 +2768,6 @@
json.applyUpdUserId = this.form.applyUpdUserId json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser json.prcCreateUser = this.form.prcCreateUser
json.prcCreateUserName = this.form.prcCreateUserName json.prcCreateUserName = this.form.prcCreateUserName
console.log("JSON.stringify(json)",JSON.stringify(json));
this.$http.get('lawss/activiti/startProcess', {type: '1'}, { this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
_this: this _this: this
}, res => { }, res => {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+11 -10
View File
@@ -443,7 +443,7 @@
<el-input v-model="form.dybxh" disabled></el-input> <el-input v-model="form.dybxh" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门"> <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option> <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -526,15 +526,16 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled> <span>{{form.wssmr}}</span>
<el-option <!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
v-for="item in wssmrOptions" <!-- <el-option-->
placeholder="请选择" <!-- v-for="item in wssmrOptions"-->
:key="item.value" <!-- placeholder="请选择"-->
:value="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :value="item.value"-->
></el-option> <!-- :label="item.label"-->
</el-select> <!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled> <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+10 -9
View File
@@ -443,15 +443,16 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled> <span>{{form.wssmr}}</span>
<el-option <!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
v-for="item in wssmrOptions" <!-- <el-option-->
placeholder="请选择" <!-- v-for="item in wssmrOptions"-->
:key="item.value" <!-- placeholder="请选择"-->
:value="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :value="item.value"-->
></el-option> <!-- :label="item.label"-->
</el-select> <!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled> <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+3
View File
@@ -1687,6 +1687,9 @@ export default {
} }
if (this.drawerTitle === '选择我司署名人'){ if (this.drawerTitle === '选择我司署名人'){
this.form.wssmr = nameList this.form.wssmr = nameList
this.roleForm.wssmrId=idList;
this.roleForm.wssmrName=nameList;
} }
}, },
choiceZRRS (type, title, id) { choiceZRRS (type, title, id) {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+23 -12
View File
@@ -3147,24 +3147,35 @@ export default {
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, { this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, {
_this: this _this: this
}, res => { }, res => {
let SSRQ = res.data.attrInfoMap.SSRQ.split(',')
let SSRQStr = '' let SSRQStr = ''
let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',')
let ZCCSSRQStr = '' let ZCCSSRQStr = ''
let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',')
let XCXSSRQStr = '' let XCXSSRQStr = ''
for (let i = 0; i < SSRQ.length; i++) { if (res.data.attrInfoMap.SSRQ != null && res.data.attrInfoMap.SSRQ!= ''){
SSRQStr += SSRQ[i].substring(0,10)+',' let SSRQ = res.data.attrInfoMap.SSRQ.split(',')
for (let i = 0; i < SSRQ.length; i++) {
SSRQStr += SSRQ[i].substring(0,10)+','
}
SSRQStr = SSRQStr.substring(0,SSRQStr.length-1)
} }
for (let i = 0; i < ZCCSSRQ.length; i++) { if (res.data.attrInfoMap.ZCCSSRQ != null && res.data.attrInfoMap.ZCCSSRQ!= '') {
ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',')
for (let i = 0; i < ZCCSSRQ.length; i++) {
ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+','
}
ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1)
} }
for (let i = 0; i < XCXSSRQ.length; i++) {
XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' if (res.data.attrInfoMap.XCXSSRQ != null && res.data.attrInfoMap.XCXSSRQ!= '') {
let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',')
for (let i = 0; i < XCXSSRQ.length; i++) {
XCXSSRQStr += XCXSSRQ[i].substring(0,10)+','
}
XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1)
} }
SSRQStr = SSRQStr.substring(0,SSRQStr.length-1)
ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1)
XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1)
res.data.attrInfoMap.SSRQ = SSRQStr res.data.attrInfoMap.SSRQ = SSRQStr
res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr
res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr