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 17:00:50 +08:00
parent 463d35ad14 ed591dcde4
commit a9488b7835
11 changed files with 529 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/DatePicker.vue
+1 -4
View File
@@ -14,7 +14,7 @@
:value-format="valueFormat"
format="yyyy-MM-dd"
:value="value"
type="dates"
type="date"
:editable="true"
:disabled="disabled"
:placeholder="placeholder"
@@ -74,7 +74,4 @@ export default {
</script>
<style scoped>
/deep/ .el-input__inner {
padding-left: 30px;
}
</style>
src/components/mechanismTree/index.vue
+1
View File
@@ -23,6 +23,7 @@
class="filter-tree tree-line"
:data="treeData"
:props="defaultProps"
:check-strictly="true"
:current-node-key="nodeKeyId"
node-key="id"
:filter-node-method="filterNode"
src/components/treeSelect/treeSelectModule.vue
+332
View File
@@ -0,0 +1,332 @@
<template>
<el-drawer
class="org-tree"
:title="drawerTitle"
:visible.sync="modalShowFlag"
:size="width"
:append-to-body=true
:before-close="cancelUserInfo"
:show-checkbox="showCheckBox"
>
<el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
:load="loadNode"
:lazy="lazy"
:show-checkbox="multiple"
:node-key="nodeKey"
:check-strictly="checkStrictly"
:expand-on-click-node="false"
:default-checked-keys="defaultCheckedKeys"
:highlight-current="true"
@node-click="handleNodeClick"
@check-change="handleCheckChange">
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
</div>
</el-drawer>
</template>
<script>
// 模块单元结构只能叶子节点多选, 关联模块vpps不用限制只能叶子节点,所以另起一个组件实现只能叶子节点多选功能 …(⊙_⊙;)…(技术有限)
export default {
name: "treeSelectModule",
props: {
// 树结构数据
data: {
type: Array,
default () {
return [];
}
},
url: {
type: String,
default () {
return "";
}
},
type: {
type: String,
default () {
return "";
}
},
urlChild: {
type: String,
default () {
return "";
}
},
params: {
type: Object,
default () {
return {};
}
},
defaultProps: {
type: Object,
default () {
return {};
}
},
// 配置是否可多选
multiple: {
type: Boolean,
default () {
return false;
}
},
lazy: {
type: Boolean,
default () {
return false;
}
},
nodeKey: {
type: String,
default () {
return 'id';
}
},
// 显示复选框情况下，是否严格遵循父子不互相关联
checkStrictly: {
type: Boolean,
default () {
return false;
}
},
disabled: {
type: Boolean,
default () {
return false;
}
},
// 默认选中的节点key数组
checkedKeys: {
type: Array,
default () {
return [];
}
},
width: {
type: String,
default () {
return "";
}
},
drawerTitle:{
type: String,
default () {
return '';
}
},
showCheckBox:{
type: Boolean,
default () {
return true;
}
},
// 配置是否展开
modalShowFlag: {
type: Boolean,
default () {
return false;
}
},
},
data () {
return {
nodeList: [],
defaultCheckedKeys: [],
isShowSelect: false, // 是否显示树状选择器
options: [],
selectedData: [], // 选中的节点
style: 'width:' + this.width + 'px;' + '',
selectStyle: 'width:100%;',
checkedIds: [],
checkedData: [],
};
},
created(){
},
mounted () {
if (this.checkedKeys.length > 0) {
if (this.multiple) {
this.defaultCheckedKeys = this.checkedKeys;
this.getChildByIDSList(this.defaultCheckedKeys);
// this.selectedData = this.checkedKeys.map((item) => {
// var node = this.$refs.tree.getNode(item);
// return node.label;
// });
} else {
const item = this.checkedKeys[0];
this.getChildByIDSList(item);
// this.$refs.tree.setCurrentKey(item);
// var node = this.$refs.tree.getNode(item);
// this.selectedData = node.label;
}
}
},
methods: {
loadNode(node, resolve) {
const that = this;
if (node.level === 0) {
that.loadTreeData(resolve);
}
if (node.level >= 1) {
setTimeout(() => {
this.getChildByList(node.data.level,node.data.id, resolve);
}, 500);
return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。
}
},
getChildByIDSList( _parentID) { // 获取子节点请求
let params = {ids : _parentID};
this.$http.get(this.urlChild, params, {
_this: this
}, res => {
if(res.data){
this.$emit('popoverHide', this.checkedIds, res.data,false);
}
})
},
getChildByList( level,id,resolve) { // 获取子节点请求
let params = {level : level,id :id,type : this.type};
this.$http.get(this.urlChild, params, {
_this: this
}, res => {
if(res.data){
resolve(res.data);
}else {
return false;
}
})
},
loadTreeData(resolve) {
// 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据
this.$http.get(this.url, {type : this.type}, {
_this: this
}, res => {
if(res.data){
resolve(res.data)
}else {
return false;
}
})
},
popoverHide () {
},
// 节点被点击时的回调,返回被点击的节点数据
handleNodeClick (data, node) {
if (!this.multiple) {
let tmpMap = {};
tmpMap.value = node.key;
tmpMap.label = node.label;
this.options = [];
this.options.push(tmpMap);
this.selectedData = node.label;
this.isShowSelect = !this.isShowSelect;
}
},
// 递归
getTreeData(data) {
// 循环遍历json数据
for (let i = 0; i < data.length; i++) {
if (data[i].children.length < 1) {
// children若为空数组，则将children设为undefined
delete data[i].children
} else {
// children若不为空数组，则继续 递归调用 本方法
this.getTreeData(data[i].children)
}
}
return data
},
// 节点选中状态发生变化时的回调
handleCheckChange () {
var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
this.options = checkedKeys.map((item) => {
var node = this.$refs.tree.getNode(item); // 所有被选中的节点对应的node
let tmpMap = {};
tmpMap.value = node.key;
tmpMap.label = node.label;
return tmpMap;
});
this.selectedData = this.options.map((item) => {
return item.label;
});
},
saveUserInfo () {
if (this.multiple) {
this.checkedIds = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
this.checkedData = this.$refs.tree.getCheckedNodes(); // 所有被选中的节点所组成的数组数据
} else {
this.checkedIds = this.$refs.tree.getCurrentKey();
this.checkedData = this.$refs.tree.getCurrentNode();
}
this.$emit('popoverHide', this.checkedIds, this.checkedData,false);
},
cancelUserInfo () {
this.$emit('popoverHideCancel', this.checkedIds, this.checkedData,false);
},
},
watch: {
}
}
</script>
<style lang="less" scoped>
/deep/ .expanded{
background-image: none !important;
background-size:100% 100%;
}
.el-drawer__body{
& > div:first-child{
display: flex;
flex: auto;
flex-direction: column;
}
}
::v-deep .el-drawer__header{
&>span:first-child{
outline: none!important;
}
}
::v-deep .el-drawer{
outline: none!important;
}
//#tree {
// .el-checkbox .el-checkbox__inner {
// display: none;
// }
// div[role="group"] {
// .el-checkbox .el-checkbox__inner {
// display: inline-block;
// }
// }
//}
//
//.el-tree-node {
// .is-leaf + .el-checkbox .el-checkbox__inner {
// display: inline-block;
// }
// .el-checkbox .el-checkbox__inner {
// display: none;
// }
//}
/deep/ .el-tree-node{
.is-leaf + .el-checkbox .el-checkbox__inner{
display: inline-block;
}
.el-checkbox .el-checkbox__inner{
display: none;
}
}
</style>
src/components/treeSelect/treeSelectNew.vue
+23 -1
View File
@@ -18,7 +18,8 @@
:default-checked-keys="defaultCheckedKeys"
:highlight-current="true"
@node-click="handleNodeClick"
@check-change="handleCheckChange"></el-tree>
@check-change="handleCheckChange">
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
@@ -298,4 +299,25 @@
::v-deep .el-drawer{
outline: none!important;
}
//#tree {
// .el-checkbox .el-checkbox__inner {
// display: none;
// }
// div[role="group"] {
// .el-checkbox .el-checkbox__inner {
// display: inline-block;
// }
// }
//}
//
//.el-tree-node {
// .is-leaf + .el-checkbox .el-checkbox__inner {
// display: inline-block;
// }
// .el-checkbox .el-checkbox__inner {
// display: none;
// }
//}
</style>
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/localTool/standContrast/pages/textComparison.vue
+6 -5
View File
@@ -145,7 +145,7 @@ export default {
}
},
methods: {
comparisonClick () {
comparisonClick (flag) {
if (this.saveItemId === '' && this.saveItemIdRight === '') {
return this.$Message.warning('请选择比对的条款内容')
}
@@ -155,7 +155,8 @@ export default {
this.spinShow = true
let itemsEoPage = {
oldItemId: this.saveItemId,
newItemId: this.saveItemIdRight
newItemId: this.saveItemIdRight,
flag: flag
}
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this
@@ -164,8 +165,8 @@ export default {
this.oldRightId = '#right_' + this.saveItemIdRight
this.oldLeftContent = $('#itemsLeftText_' + this.saveItemId).html()
this.oldRightContent = $('#itemsRightText_' + this.saveItemIdRight).html()
$('#left_' + this.saveItemId).find('#itemsLeftText_' + this.saveItemId).html(res.data.leftString)
$('#right_' + this.saveItemIdRight).find('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString)
$('#itemsLeftText_' + this.saveItemId).html(res.data.leftString)
$('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString)
this.text = res.data.similarityDegree
if (parseFloat(res.data.similarityDegree) >= parseFloat('75%') && parseFloat(res.data.similarityDegree) !== parseFloat('100%')) {
this.textcontent = '相似'
@@ -299,7 +300,7 @@ export default {
scrollTop: scrollToContainer.offset().top - mainContainer.offset().top + mainContainer.scrollTop()
})// 2秒滑动到指定位置
}
this.comparisonClick()
this.comparisonClick(flag)
},
// 返回
back () {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+5 -3
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="请选择归口管理部门">
@@ -1242,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) => {
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