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:
super_liu
2022-01-22 23:14:01 +08:00
parent 566219dddd 223c42141f
commit 280e86f4c9
10 changed files with 565 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/DatePickerGroup.vue
+1 -1
View File
@@ -87,7 +87,7 @@ export default {
},
labelWidth: {
type: String,
default: '150px'
default: '210px'
}
},
components: {},
src/components/treeSelect/treeSelectStand.vue
+308
View File
@@ -0,0 +1,308 @@
<template>
<el-drawer
class="org-tree"
:title="drawerTitle"
:visible.sync="modalShowFlag"
:size="width"
:append-to-body=true
:before-close="cancelUserInfo"
:show-checkbox="showCheckBox"
>
<el-input
style="border-bottom: 1px #e5e5e5 solid"
placeholder="输入关键字进行过滤"
v-model="filterText">
</el-input>
<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"
:filter-node-method="filterNode"
: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>
export default {
name: "treeSelectStand",
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 {
filterText: '',
nodeList: [],
defaultCheckedKeys: [],
isShowSelect: false, // 是否显示树状选择器
options: [],
selectedData: [], // 选中的节点
style: 'width:' + this.width + 'px;' + 'height: 100%;',
selectStyle: 'width:100%;',
};
},
created(){
},
mounted () {
if (this.checkedKeys.length > 0) {
if (this.multiple) {
this.defaultCheckedKeys = this.checkedKeys;
this.getChildByIDSList(this.defaultCheckedKeys);
} else {
const item = this.checkedKeys[0];
this.getChildByIDSList(item);
}
}
},
methods: {
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
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: {
filterText(val) {
this.$refs.tree.filter(val);
}
},
}
</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;
}
</style>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+111 -100
View File
@@ -160,19 +160,31 @@
clearable
></el-input>
</el-form-item>
<!--<el-form-item label="归档位置">
<el-form-item v-if="verifySarStandard" label="归档位置" class="add-form-item form-item-disabled">
<el-input
style="display: none"
v-model="form.treeListId"
placeholder="请"
readonly
></el-input>
<el-input
v-model="form.treeListName"
placeholder="请输入标准英文名称"
readonly
></el-input>
</el-form-item>-->
<el-tooltip effect="dark" :content=form.treeListName placement="top-start">
<el-input
v-model="form.treeListName"
clearable
placeholder="选择归档位置"
@click.native="choiceTree('treeListName', '归档位置', form.treeListName)">
</el-input>
</el-tooltip>
<tree-select-stand
:key="key"
:multiple=true
:lazy=false
:checkStrictly=true
:modalShowFlag="modalShowTree"
:drawerTitle="drawerTitle"
width="800"
:data="treeListOptions"
:defaultProps="defaultProps" :checkedKeys="treeCheckedKeys"
:nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"></tree-select-stand>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -566,33 +578,6 @@
v-model="form['nylx']"
></custom-select-array>
</template>
<!-- <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">-->
<!-- <custom-select-array-->
<!-- :key="applyArcticOptions.value"-->
<!-- :config="applyArcticOptions.label"-->
<!-- v-model="applyArcticOptions"-->
<!-- ></custom-select-array>-->
<!-- <el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>-->
<!-- <el-option-->
<!-- v-for="item in applyArcticOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.nylx" placeholder="请选择能源类型" multiple>-->
<!-- <el-option-->
<!-- v-for="item in categoryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<el-input v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" clearable @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
<tree-select-new
@@ -644,12 +629,12 @@
: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" filterable v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-select :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple filterable>
<el-select :popper-append-to-body="false" clearable v-model="form.qcdw" placeholder="请选择起草单位" multiple filterable>
<el-option
v-for="item in qcdwOption"
placeholder="请选择"
@@ -920,27 +905,27 @@
>{{ '手动查找' }}
</el-button>
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.byybj"-->
<!-- placeholder="请输入被引用标准"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('byybj'),config.attrName = '被引用标准'"-->
<!-- >{{'手动查找'}}</el-button>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.chjl"-->
<!-- placeholder="请输入参会记录"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
<el-input
v-model="form.byybj"
placeholder="请输入被引用标准"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('byybj'),config.attrName = '被引用标准'"
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
<el-input
v-model="form.chjl"
placeholder="请输入参会记录"
clearable
></el-input>
</el-form-item>-->
</el-col>
</el-row>
</div>
@@ -1179,38 +1164,6 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- <el-drawer
:title="drawerTitle"
:visible.sync="modalShowFlag"
:wrapperClosable="false"
size="800px">
<el-input
style="width:70%;padding: 10px"
placeholder="请输入姓名"
v-model="filterText">
</el-input>
<el-tree
:filter-node-method="filterNode"
v-if="modalShowFlag"
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree"
:data="treeData"
:props="defaultUserProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</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>-->
<!-- 选择标准的弹框 -->
<el-drawer
ref="standard"
@@ -1380,17 +1333,19 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId, taskDel, processBack} from "api/process";
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId, taskDel} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
export default {
name: "bzrkStep1",
components: {
TreeSelectStand,
CusTomDataPickerGroup,
CustomDatePickGroup,
TreeSelectModule,
@@ -1529,6 +1484,7 @@ export default {
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
modalShowRoleFlag5: false,
modalShowTree: false, // 归档位置drawer开关
url: '',
urlChild: '',
drawerTitle: '', //drawer标题
@@ -1540,6 +1496,10 @@ export default {
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
// 归档位置所选
treeCheckedKeys: [],
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
@@ -1560,6 +1520,9 @@ export default {
isRelateAccess: '', // 是否纳入认证清单
standSystem: '',// 标准体系
standSystemName: '',// 标准体系名称
treeListId: '', // 归档位置Id
treeListName: '', // 归档位置名称
gxhbq: '', // 标签
// 实施日期
ssrq: '', // 实施日期(标准文本)
@@ -1682,6 +1645,8 @@ export default {
busVppsChildOptions: [], // 车系体系架构子集合
modelOptions: [], // 模块体系架构
modelChildOptions: [], // 模块体系架构子集合
treeListOptions: [],//归档位置数据储存
applyArcticOptions: {
attrName: '适用车型',
options: []
@@ -1738,7 +1703,6 @@ export default {
},
'form' : {
handler: function () {
console.log(this.form.standInData)
if(this.form.standInData === '1') {
this.rules.standYear[0].required = false;
this.rules.standName[0].required = false
@@ -1897,7 +1861,6 @@ export default {
// 标准来源改变事件
standInChange(val) {
this.verifySarStandard = false
/** val === '1' (国外) val === '0'（ 国内 ）*/
// 国内英文名称不必填 国外必填 ，标准性质国内不体现
if (val === '1') {
@@ -2071,6 +2034,7 @@ export default {
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
this.defaultCheckedKeys3 = [this.form.dybxh]
this.treeCheckedKeys = this.form.treeListId.split(',')
this.form.standType = this.form.standInData === "0" ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
@@ -2189,10 +2153,9 @@ export default {
const bringData = res.data
bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
console.log(this.form)
this.getListTree(bringData)
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : ''
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : ''
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : ''
@@ -2211,9 +2174,6 @@ export default {
this.key3++
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
// this.form.ssrq = this.form.ssrq ? this.$moment(this.form.ssrq).format("YYYY-MM-DD") : null
// this.form.zccssrq = this.form.zccssrq ? this.$moment(this.form.zccssrq).format("YYYY-MM-DD") : null
// this.form.xcxssrq = this.form.xcxssrq ? this.$moment(this.form.xcxssrq).format("YYYY-MM-DD") : null
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = bringData.id
@@ -2229,7 +2189,6 @@ export default {
this.initializeFileList(p, this.form[p]);
}
}
console.log("res", res);
})
} else if (this.standardCheckedList.length > 1) {
@@ -2307,6 +2266,34 @@ export default {
}, e => {
})
},
/** 归档位置树结构查询 */
getListTree(bringData) {
this.$http.get('sarResource/ts-resource/getListStand', {
sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
this.treeListOptions = res.data
this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
standId: bringData.id,
}, {}, reson => {
if (reson.ok) {
let treeList = ''
reson.data.forEach(item=>{
this.treeCheckedKeys.push(item.menuId)
if (item.menuId.length > 0) {
treeList += ','
}
treeList = item.menuName
this.treeListName = treeList
})
}
})
this.form.treeListId = this.treeCheckedKeys.join(',')
}
})
},
handleStandardPageChange(page) {
this.standardSearchForm.page = page
this.handleSearchStandard()
@@ -2464,6 +2451,13 @@ export default {
this.urlChild = "sarModelTree/childByList"
this.key3++
},
choiceTree(type, title, id) {
this.drawerTitle = title
this.getListTree(this.form)
this.modalShowTree = true
this.key++
},
getTree() {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res => {
@@ -2925,6 +2919,23 @@ export default {
popoverHideCancel() {
this.modalShowFlag1 = false
},
treeHide(checkedIds, checkedData) {
if (checkedData) {
if (checkedData.length > 0 && checkedData.length != 0) {
this.form.treeListName = checkedData.map(item => item.menuName).join(",")
this.form.treeListId = checkedData.map(item => item.id).join(",")
} else {
this.form.treeListName = checkedData.menuName
this.form.treeListId = checkedData.id
}
this.modalShowTree = false
}
},
treeHideCancel() {
this.modalShowTree = false
},
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0 && checkedData.length != 0) {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+14
View File
@@ -143,6 +143,20 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="归档位置" class="add-form-item form-item-disabled">
<el-input
style="display: none"
v-model="form.treeListId"
></el-input>
<el-tooltip effect="dark" :content=form.treeListName placement="top-start">
<el-input
v-model="form.treeListName"
clearable
placeholder="选择归档位置"
readonly>
</el-input>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
</div>
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+14 -2
View File
@@ -142,6 +142,20 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="归档位置" class="add-form-item form-item-disabled">
<el-input
style="display: none"
v-model="form.treeListId"
></el-input>
<el-tooltip effect="dark" :content=form.treeListName placement="top-start">
<el-input
v-model="form.treeListName"
clearable
placeholder="选择归档位置"
readonly>
</el-input>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -158,7 +172,6 @@
:disabled="true"
></custom-date-pick-group>
<custom-date-pick-group
:labelWidth="210"
:key="'zccssrq'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.zccssrq"
@@ -185,7 +198,6 @@
</el-col>
<el-col :span="12">
<custom-date-pick-group
:labelWidth="210"
:key="'zccssrq'"
:config="{attrName:'新车型实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.xcxssrq"
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+68 -3
View File
@@ -147,6 +147,31 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="归档位置" class="add-form-item form-item-disabled">
<el-input
style="display: none"
v-model="form.treeListId"
></el-input>
<el-tooltip effect="dark" :content=form.treeListName placement="top-start">
<el-input
v-model="form.treeListName"
clearable
placeholder="选择归档位置"
@click.native="choiceTree('treeListName', '归档位置', form.treeListName)">
</el-input>
</el-tooltip>
<tree-select-stand
:key="key"
:multiple=true
:lazy=false
:checkStrictly=true
:modalShowFlag="modalShowTree"
:drawerTitle="drawerTitle"
width="800"
:data="treeListOptions"
:defaultProps="defaultProps" :checkedKeys="treeCheckedKeys"
:nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"></tree-select-stand>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -851,12 +876,12 @@
: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" filterable v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-select :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple filterable>
<el-select v-model="form.qcdw" clearable placeholder="请选择起草单位" multiple filterable>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择"
@@ -1452,10 +1477,11 @@ import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
export default {
name: "bzrkStep4",
components: {
TreeSelectStand,
CusTomDataPickerGroup,
TreeSelectModule,
ProcessHeader,
@@ -1520,10 +1546,13 @@ export default {
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
treeCheckedKeys: [],
treeListOptions: [],
modalShowFlag1: false, // drawer开关
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
modalShowTree: false, // 归档位置drawer开关
url: '',
urlChild: '',
drawerTitle: '', //drawer标题
@@ -1610,6 +1639,8 @@ export default {
standSystem: '',// 标准体系
standSystemName: '',// 标准体系
gxhbq: '', // 标签
treeListName: '',
treeListId: '',
// 实施日期
ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本)
@@ -1884,6 +1915,12 @@ export default {
this.key3++
},
choiceTree(type, title, id) {
this.drawerTitle = title
this.getListTree(this.form)
this.modalShowTree = true
this.key++
},
busVsFunc() {
this.$http.get('sarVppsTree/list', '', {
_this: this
@@ -2370,6 +2407,22 @@ export default {
popoverHideCancel() {
this.modalShowFlag1 = false
},
treeHide(checkedIds, checkedData) {
if (checkedData) {
if (checkedData.length > 0 && checkedData.length != 0) {
this.form.treeListName = checkedData.map(item => item.menuName).join(",")
this.form.treeListId = checkedData.map(item => item.id).join(",")
} else {
this.form.treeListName = checkedData.menuName
this.form.treeListId = checkedData.id
}
this.modalShowTree = false
}
},
treeHideCancel() {
this.modalShowTree = false
},
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0 && checkedData.length != 0) {
@@ -2462,6 +2515,7 @@ export default {
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
this.defaultCheckedKeys3 = [this.form.dybxh];
this.treeCheckedKeys = this.form.treeListId.split(',')
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
this.form.prcNum = this.prcNum
@@ -2538,6 +2592,17 @@ export default {
}, e => {
})
},
/** 归档位置树结构查询 */
getListTree(bringData) {
this.$http.get('sarResource/ts-resource/getListStand', {
sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
this.treeListOptions = res.data
}
})
},
closeDrawer() {
this.ListModel = false
},
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+16 -11
View File
@@ -17,10 +17,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="fbNode" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.issueTime" :disabled="disabledState"
:editable="false"
></el-datePicker>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template>
<div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
</template>
</el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
@@ -29,6 +29,13 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
placeholder="请输入英文名称"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
<!-- <el-option-->
@@ -79,6 +86,11 @@
clearable
></el-input>
</el-form-item>
<el-form-item v-show="fbNode" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.issueTime" :disabled="disabledState"
:editable="false"
></el-datePicker>
</el-form-item>
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime"
:editable="false"
@@ -86,13 +98,6 @@
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
placeholder="请输入英文名称"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.issueTime"-->
<!-- :editable="false"-->
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+5
View File
@@ -22,6 +22,11 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template>
<div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
</template>
</el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
<!-- <el-option-->
src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+14 -9
View File
@@ -16,16 +16,22 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template>
<div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
</template>
</el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standName" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.issueTime" :disabled="disabledState"
:editable="false"
></el-datePicker>
<el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
@@ -74,11 +80,10 @@
<el-datePicker v-model="form.putTime" :disabled="disabledState"
:editable="false"></el-datePicker>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName" :disabled="disabledState"
clearable
></el-input>
<el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.issueTime" :disabled="disabledState"
:editable="false"
></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.standYear" :disabled="disabledState"-->
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+14 -9
View File
@@ -44,6 +44,11 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template>
<div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
</template>
</el-form-item>
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
<!-- <el-option-->
@@ -60,13 +65,6 @@
<!-- placeholder="请输入标准年份"-->
<!-- clearable></el-input>-->
<!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime"
:editable="false"
placeholder="请选择企标实施日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FSRQBUSS"-->
<!-- :editable="false"-->
@@ -110,6 +108,13 @@
clearable
></el-input>
</el-form-item>
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime"
:editable="false"
placeholder="请选择企标实施日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.issueTime"-->
<!-- :editable="false"-->
@@ -582,7 +587,7 @@
<el-form-item prop="fggcsUserName" style="margin-bottom: 0">
<h4>标准法规部标准化工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.fggcsUserName" readonly="readonly" placeholder="标准法规部标准化工程师" @click.native="choiceZRRList('fggcsUserId', '选择标准法规部标准化工程师', roleForm.fggcsUserId)"></el-input>
<el-input v-model="roleForm.fggcsUserName" readonly="readonly" placeholder="标准法规部标准化工程师" @click.native="choiceZRR('fggcsUserId', '选择标准法规部标准化工程师', roleForm.fggcsUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1440,7 +1445,7 @@
{ required: true, message: '选择会签征求意见人员', trigger: 'blur' },
],
fggcsUserName: [
{ required: true, message: '选择起草单位高级经理', trigger: 'blur' },
{ required: true, message: '选择标准法规部标准化工程师', trigger: 'blur' },
],
jsfzrUserName: [
{ required: true, message: '选择起草单位高级经理', trigger: 'blur' },