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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Superman_Main
2021-11-28 16:55:35 +08:00
parent 467dae1257 753f1b5993
commit ed591dcde4
12 changed files with 548 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+22 -1
View File
@@ -207,7 +207,7 @@
v-else-if="child.attrType === 'DATE_PICKER'"
class="modular-content-p-val"
>
{{ child.value ? child.value.substring(0, 10) : '-' }}
{{ child.value ? child.value : '-' }}
</span>
<span
v-else-if="child.attrType !== 'FILE'"
@@ -2327,6 +2327,27 @@
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
_this: this
}, res => {
let SSRQ = res.data.attrInfoMap.SSRQ.split(',')
let SSRQStr = ''
let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',')
let ZCCSSRQStr = ''
let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',')
let XCXSSRQStr = ''
for (let i = 0; i < SSRQ.length; i++) {
SSRQStr += SSRQ[i].substring(0,10)+','
}
for (let i = 0; i < ZCCSSRQ.length; i++) {
ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+','
}
for (let i = 0; i < XCXSSRQ.length; i++) {
XCXSSRQStr += XCXSSRQ[i].substring(0,10)+','
}
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.ZCCSSRQ = ZCCSSRQStr
res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr
this.sarStandardsInfoEO = res.data || {}
this.itemExistList=this.sarStandardsInfoEO.attrInfoMap.itemExistList;
console.log("hllo",this.sarStandardsInfoEO);
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+4 -1
View File
@@ -1142,7 +1142,8 @@ export default {
this.selectedList = []
this.selectedAllList = data
for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id,data[i].editFlag)
this.selectedList.push(data[i].id)
this.selectedList1.push(data[i].editFlag)
}
},
// 分页点击后方法
@@ -1407,6 +1408,7 @@ export default {
confirmButtonClass: 'common-button-primary',
roundButton: false
}).then(() => {
this.loading = true
this.deleteItemsModal = false
this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', {
ids: this.selectedList.join(','),
@@ -1427,6 +1429,7 @@ export default {
nodeId = currentNode.id
}
this.selectSarMenu.id = nodeId
this.loading = false
}, e => {
})
}).catch(() => {})
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+27 -13
View File
@@ -578,7 +578,7 @@
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
<tree-select-new
<tree-select-module
width = "800"
:key="key3"
:lazy=true
@@ -590,7 +590,7 @@
:show-checkBox="showCheckBox"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
</el-form-item>
<el-form-item v-show="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="请选择归口管理部门">
@@ -676,15 +676,17 @@
></el-input>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
<el-option
v-for="item in wssmrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
<el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
</el-input>
<!-- <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
<!-- <el-option-->
<!-- v-for="item in wssmrOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cysd" placeholder="请选择我司参与深度">
@@ -1032,7 +1034,7 @@
</div>
</el-dialog>
<Role-tree
is-title="选择责任部门对接人"
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -1240,15 +1242,17 @@
import {saveTaskFirst, queryTaskFirst} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
export default {
name: "bzrkStep1",
components: {
TreeSelectModule,
ProcessHeader,
ProcessFooter,
ProcessTitle,
TreeSelect,
TreeSelectNew
TreeSelectNew,
},
data () {
const validateQcdw = (rule, value, callback) => {
@@ -1707,6 +1711,7 @@
// this.modalshowflag2 = true
// },
checkedRole2 (data) {
console.log('1712',this.drawerTitle)
let idList = ''
let nameList = ''
data.forEach( item => {
@@ -1717,8 +1722,13 @@
idList += item.id
nameList += item.name
})
if (this.drawerTitle === '选择责任人'){
this.roleForm.zrUserId=idList;
this.roleForm.zrUserName=nameList;
}
if (this.drawerTitle === '选择我司署名人'){
this.form.wssmr = nameList
}
},
checkedRole (data) {
if (this.userType === 'jlUserId') {
@@ -2070,6 +2080,7 @@
},
choiceZRRS (type, title, id) {
console.log('2077',title)
this.nodeList = []
this.nodeList.push(id)
this.userType = type
@@ -2825,6 +2836,9 @@
.prc-content-border {
border: none;
padding: 0 20px 0;
/deep/ .el-input__inner {
padding-left: 30px;
}
}
}
position: relative;
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+4 -2
View File
@@ -813,7 +813,7 @@
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
<tree-select-new
<tree-select-module
width = "800"
:key="key3"
:lazy=true
@@ -823,7 +823,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel" ></tree-select-new>
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel" ></tree-select-module>
</el-form-item>
<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="请选择归口管理部门">
@@ -1357,10 +1357,12 @@ import {
} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
export default {
name: "bzrkStep4",
components: {
TreeSelectModule,
ProcessHeader,
ProcessFooter,
ProcessTitle,
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+87 -24
View File
@@ -556,13 +556,13 @@
:disabled="formdisableflag"
></custom-SVPPS>
</template>
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
<custom-date-pick
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ' || field.attrField === 'SSRQ'">
<custom-date-pick-group
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-date-pick>
></custom-date-pick-group>
</template>
<template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
<custom-date-pick-group
@@ -735,14 +735,16 @@
class="add-form-item"
>
<template slot="label">责任工程师</template>
<el-input
:key="field.attrField"
:config="field"
clearable
v-model="sarStandardsInfoEO['ZRGCS']"
:disabled="formdisableflag" placeholder="选择责任工程师"
@click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">
<el-input v-model="sarStandardsInfoEO['ZRGCS']" placeholder="选择责任工程师" @click.native="choiceZRRS('zrgcs', '选择责任工程师', sarStandardsInfoEO['ZRGCS'])">
</el-input>
<!-- <el-input-->
<!-- :key="field.attrField"-->
<!-- :config="field"-->
<!-- clearable-->
<!-- v-model="sarStandardsInfoEO['ZRGCS']"-->
<!-- :disabled="formdisableflag" placeholder="选择责任工程师"-->
<!-- @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">-->
<!-- </el-input>-->
</el-form-item>
</template>
<template v-else-if="field.attrField === 'WSSMR'">
@@ -752,14 +754,16 @@
class="add-form-item"
>
<template slot="label">我司署名人</template>
<el-input
:key="field.attrField"
:config="field"
clearable
v-model="sarStandardsInfoEO['WSSMR']"
:disabled="formdisableflag" placeholder="选择我司署名人"
@click.native="choiceRole('WSSMRUserId', '我司署名人', sarStandardsInfoEO.WSSMRUserId)">
<el-input v-model="sarStandardsInfoEO['WSSMR']" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', sarStandardsInfoEO['WSSMR'])">
</el-input>
<!-- <el-input-->
<!-- :key="field.attrField"-->
<!-- :config="field"-->
<!-- clearable-->
<!-- v-model="sarStandardsInfoEO['WSSMR']"-->
<!-- :disabled="formdisableflag" placeholder="选择我司署名人"-->
<!-- @click.native="choiceRole('WSSMRUserId', '我司署名人', sarStandardsInfoEO.WSSMRUserId)">-->
<!-- </el-input>-->
</el-form-item>
</template>
<template v-else>
@@ -1237,7 +1241,7 @@
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
@popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
<tree-select-new
<tree-select-module
width="500"
:lazy=true
:multiple=true
@@ -1248,7 +1252,7 @@
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
@popoverHideCancel="popoverHideModelCancel()"></tree-select-new>
@popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
<!-- 导入失败-->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
<p slot="title" style="color:#f60">
@@ -1819,6 +1823,12 @@
@confirm="isTreeOk"
></org-table>
<loading style="z-index: 2099;" :loading="importLoading">导入中...</loading>
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
is-title="选择人员信息"
:is-visible.sync="modalshowflagRole"
@@ -1906,6 +1916,7 @@ import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePicke
import {interfaceUrl} from '@/sysConfig'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
@@ -1931,6 +1942,7 @@ export default {
TreeSelect,
MechanismTree,
TreeSelectNew,
treeSelectModule,
ProcessTitle
},
data() {
@@ -1944,7 +1956,9 @@ export default {
OCRModel: false,
ocrList: [],
nodeList: [],
nodeList2: [],
nodeListZRBM: [],
modalShowRoleFlag: false,
modalshowflagRole: false,
modalshowflagZRBM: false,
filterText: '', // 国内法规过滤
@@ -3133,6 +3147,27 @@ export default {
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, {
_this: this
}, res => {
let SSRQ = res.data.attrInfoMap.SSRQ.split(',')
let SSRQStr = ''
let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',')
let ZCCSSRQStr = ''
let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',')
let XCXSSRQStr = ''
for (let i = 0; i < SSRQ.length; i++) {
SSRQStr += SSRQ[i].substring(0,10)+','
}
for (let i = 0; i < ZCCSSRQ.length; i++) {
ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+','
}
for (let i = 0; i < XCXSSRQ.length; i++) {
XCXSSRQStr += XCXSSRQ[i].substring(0,10)+','
}
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.ZCCSSRQ = ZCCSSRQStr
res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr
const item = res.data || {}
this.collectId = item.collectId
this.addOrUPdateFlag = 2
@@ -3971,8 +4006,9 @@ export default {
nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
}
// 代替标准号
if (nowstandinfo.replaceStandNum != null) {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
console.log('4007',nowstandinfo.DTBJH);
if (nowstandinfo.DTBJH != null) {
nowstandinfo.DTBJH = nowstandinfo.DTBJH.replace(/，/ig, ',')
}
if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
@@ -5315,6 +5351,33 @@ export default {
this.$set(this.textStatusMap, item.value, item.label)
})
},
choiceZRRS (type, title, id) {
console.log('2077',title)
this.nodeList = []
this.nodeList.push(id)
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
checkedRole2 (data) {
console.log('1712',this.drawerTitle)
let idList = ''
let nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
if (this.drawerTitle === '选择我司署名人'){
this.sarStandardsInfoEO['WSSMR'] = nameList
}else if (this.drawerTitle === '选择责任工程师'){
this.sarStandardsInfoEO['ZRGCS'] = nameList
}
},
choiceRole(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
@@ -5347,18 +5410,18 @@ export default {
},
drawerCheckZRBM(data) {
console.log("data", data);
console.log("5389", data);
let idList = ''
let nameList = ''
data.forEach(item => {
if (item.hasChild === '0') {
// if (item.hasChild === '0') {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
}
// }
})
this.sarStandardsInfoEO.ZRBMId = idList;
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+44 -7
View File
@@ -1093,14 +1093,16 @@
class="add-form-item"
>
<template slot="label">责任工程师</template>
<el-input
:key="field.attrField"
:config="field"
clearable
v-model="sarStandardsInfoEO['ZRGCS']"
:disabled="formdisableflag" placeholder="选择责任工程师"
@click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">
<el-input v-model="sarStandardsInfoEO['ZRGCS']" placeholder="选择责任工程师" @click.native="choiceZRRS('zrgcs', '选择责任工程师', sarStandardsInfoEO['ZRGCS'])">
</el-input>
<!-- <el-input-->
<!-- :key="field.attrField"-->
<!-- :config="field"-->
<!-- clearable-->
<!-- v-model="sarStandardsInfoEO['ZRGCS']"-->
<!-- :disabled="formdisableflag" placeholder="选择责任工程师"-->
<!-- @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">-->
<!-- </el-input>-->
</el-form-item>
</template>
<template v-else>
@@ -1599,6 +1601,12 @@
@confirm="isTreeOk"
></org-table>
<loading style="z-index: 2099;" :loading="exportLoading">导入中...</loading>
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
is-title="选择人员信息"
:is-visible.sync="modalshowflagRole"
@@ -1667,7 +1675,9 @@ export default {
return {
// 人员树形和部门树形参数
nodeList: [],
nodeList2: [],
nodeListZRBM: [],
modalShowRoleFlag: false,
modalshowflagRole: false,
modalshowflagZRBM: false,
@@ -2473,6 +2483,33 @@ export default {
this.$set(this.textStatusMap, item.value, item.label)
})
},
choiceZRRS (type, title, id) {
console.log('2077',title)
this.nodeList = []
this.nodeList.push(id)
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
checkedRole2 (data) {
console.log('1712',this.drawerTitle)
let idList = ''
let nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
if (this.drawerTitle === '选择我司署名人'){
this.sarStandardsInfoEO['WSSMR'] = nameList
}else if (this.drawerTitle === '选择责任工程师'){
this.sarStandardsInfoEO['ZRGCS'] = nameList
}
},
busVsFunc() {
this.$http.get('sarVppsTree/list', '', {
_this: this