Merge remote-tracking branch 'origin/develop' into develop-1
This commit is contained in:
@@ -125,11 +125,11 @@ export default {
|
||||
// // // title: '本地产品/项目库',
|
||||
// // // path: '/localProductsOrProjectLibrary'
|
||||
// // // },
|
||||
// {
|
||||
// title: '企业标准库',
|
||||
// path: '/enterpriseStandardDatabase',
|
||||
// menuId: '3YVZP8R4TC'
|
||||
// },
|
||||
{
|
||||
title: '企业标准库',
|
||||
path: '/enterpriseStandardDatabase',
|
||||
menuId: '01ed8f752748227777b3572d56ee9ab5'
|
||||
},
|
||||
// {
|
||||
// title: '企标制修订计划',
|
||||
// path: '/enterBSysRevPlanManaLib',
|
||||
|
||||
@@ -22,7 +22,7 @@ export default {
|
||||
},
|
||||
{
|
||||
label:'标准清单发布/更新流程',
|
||||
value: '6'
|
||||
value: '4'
|
||||
},
|
||||
{
|
||||
label: '项目合规评估流程',
|
||||
|
||||
@@ -122,17 +122,12 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
|
||||
<tree-select-new
|
||||
<tree-select
|
||||
:key="key"
|
||||
:multiple=false
|
||||
:lazy=false
|
||||
:modalShowFlag="modalShowFlag1"
|
||||
:drawerTitle="drawerTitle"
|
||||
width = "340"
|
||||
:data="standSystemOptions"
|
||||
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="verifySarStandard" v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
@@ -506,46 +501,28 @@
|
||||
</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编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
|
||||
<tree-select-new
|
||||
<tree-select
|
||||
width = "340"
|
||||
:key="key1"
|
||||
:lazy=true
|
||||
:multiple=false
|
||||
:modalShowFlag="modalShowFlag2"
|
||||
:drawerTitle="drawerTitle"
|
||||
:url="url"
|
||||
:urlChild="urlChild"
|
||||
:data="busVppsOptions"
|
||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
|
||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
|
||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
|
||||
<tree-select-new
|
||||
<tree-select
|
||||
width = "340"
|
||||
:key="key2"
|
||||
:lazy=true
|
||||
:multiple=false
|
||||
:modalShowFlag="modalShowFlag3"
|
||||
:drawerTitle="drawerTitle"
|
||||
:url="url"
|
||||
:urlChild="urlChild"
|
||||
:data="busVppsOptions"
|
||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
|
||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
|
||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
|
||||
</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
|
||||
width = "340"
|
||||
<tree-select
|
||||
:key="key3"
|
||||
:lazy=true
|
||||
:multiple=false
|
||||
:modalShowFlag="modalShowFlag4"
|
||||
:drawerTitle="drawerTitle"
|
||||
:url="url"
|
||||
:urlChild="urlChild"
|
||||
width = "340"
|
||||
:data="modelOptions"
|
||||
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
|
||||
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
|
||||
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
@@ -728,20 +705,20 @@
|
||||
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 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"-->
|
||||
@@ -1127,17 +1104,9 @@
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {saveTaskFirst} from "api/process";
|
||||
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
||||
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
|
||||
|
||||
export default {
|
||||
name: "bzrkStep1",
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle,
|
||||
TreeSelect,
|
||||
TreeSelectNew
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
standardDrawer: false,
|
||||
@@ -1222,12 +1191,6 @@
|
||||
key3:4,
|
||||
treeData: [], // 人员数据
|
||||
modalShowFlag: false, // drawer开关
|
||||
modalShowFlag1: false, // drawer开关
|
||||
modalShowFlag2: false, // drawer开关
|
||||
modalShowFlag3: false, // drawer开关
|
||||
modalShowFlag4: false, // drawer开关
|
||||
url:'',
|
||||
urlChild:'',
|
||||
drawerTitle: '', //drawer标题
|
||||
nodeKey: 'id',
|
||||
defaultCheckedKeys: [],
|
||||
@@ -1285,15 +1248,15 @@
|
||||
// 适用范围
|
||||
txlb: '', // 体系类别
|
||||
gkdw: '', // 归口管理部门
|
||||
qcdw: [], // 起草单位
|
||||
wssmr: [], // 我司署名人
|
||||
qcdw: '', // 起草单位
|
||||
wssmr: '', // 我司署名人
|
||||
cysd: '', // 我司参与深度
|
||||
cllx: [], // 适用车型
|
||||
nylx: [],// 能源类型
|
||||
sycpx: [],// 适用产品线
|
||||
syrz: [], // 适用认证
|
||||
zrbm: [], // 责任部门
|
||||
zrgcs: [], // 责任工程师
|
||||
cllx: '', // 适用车型
|
||||
nylx: '',// 能源类型
|
||||
sycpx: '',// 适用产品线
|
||||
syrz: '', // 适用认证
|
||||
zrbm: '', // 责任部门
|
||||
zrgcs: '', // 责任工程师
|
||||
cycvppsbm: '', // 关联模块--乘用车VPPS编码
|
||||
cycvppscn: '', // 关联模块--乘用车vpps中文名称
|
||||
kccvppsbm: '', // 关联模块--卡车VPPS编码
|
||||
@@ -1367,9 +1330,7 @@
|
||||
standStateOptions: [], // 文本状态
|
||||
standSystemOptions: [], // 标准体系
|
||||
busVppsOptions: [], // 车系体系架构
|
||||
busVppsChildOptions: [], // 车系体系架构子集合
|
||||
modelOptions: [], // 模块体系架构
|
||||
modelChildOptions: [], // 模块体系架构子集合
|
||||
applyArcticOptions: [], // 适用车型
|
||||
categoryOptions: [], // 能源类型
|
||||
applyAuthOptions: [], // 适用认证
|
||||
@@ -1437,6 +1398,12 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle,
|
||||
TreeSelect
|
||||
},
|
||||
methods: {
|
||||
clearFormData(data){
|
||||
this.form = {
|
||||
@@ -1485,15 +1452,15 @@
|
||||
// 适用范围
|
||||
txlb: '', // 体系类别
|
||||
gkdw: '', // 归口管理部门
|
||||
qcdw: [], // 起草单位
|
||||
wssmr: [], // 我司署名人
|
||||
qcdw: '', // 起草单位
|
||||
wssmr: '', // 我司署名人
|
||||
cysd: '', // 我司参与深度
|
||||
cllx: [], // 适用车型
|
||||
nylx: [],// 能源类型
|
||||
sycpx: [],// 适用产品线
|
||||
syrz: [], // 适用认证
|
||||
zrbm: [], // 责任部门
|
||||
zrgcs: [], // 责任工程师
|
||||
cllx: '', // 适用车型
|
||||
nylx: '',// 能源类型
|
||||
sycpx: '',// 适用产品线
|
||||
syrz: '', // 适用认证
|
||||
zrbm: '', // 责任部门
|
||||
zrgcs: '', // 责任工程师
|
||||
cycvppsbm: '', // 关联模块--乘用车VPPS编码
|
||||
cycvppscn: '', // 关联模块--乘用车vpps中文名称
|
||||
kccvppsbm: '', // 关联模块--卡车VPPS编码
|
||||
@@ -1661,6 +1628,7 @@
|
||||
this.zrUserIds.push(data)
|
||||
}
|
||||
|
||||
console.log(this.zrUserIds)
|
||||
}else {
|
||||
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
|
||||
if(getlist.length == 1) {
|
||||
@@ -1678,38 +1646,6 @@
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag = true
|
||||
},
|
||||
choiceZRR1 (type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag1 = true
|
||||
this.key++
|
||||
},
|
||||
choiceZRR2 (type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag2 = true
|
||||
this.url = ''
|
||||
this.urlChild = ''
|
||||
this.url="sarVppsTree/list"
|
||||
this.urlChild="sarVppsTree/childByList"
|
||||
this.key1++
|
||||
},
|
||||
choiceZRR3 (type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag3 = true
|
||||
this.url = ''
|
||||
this.urlChild = ''
|
||||
this.url="sarVppsTree/list"
|
||||
this.urlChild="sarVppsTree/childByList"
|
||||
this.key2++
|
||||
},
|
||||
choiceZRR4 (type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag4 = true
|
||||
this.url = ''
|
||||
this.urlChild = ''
|
||||
this.url="sarModelTree/list"
|
||||
this.urlChild="sarModelTree/childByList"
|
||||
this.key3++
|
||||
},
|
||||
getTree () {
|
||||
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
|
||||
this.treeData = res.data
|
||||
@@ -1953,51 +1889,29 @@
|
||||
this.fileMadel = true
|
||||
this.fileType = type;
|
||||
},
|
||||
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
|
||||
popoverHide (checkedIds, checkedData) {
|
||||
if(checkedData) {
|
||||
if(checkedData.length > 0){
|
||||
this.form.standSystem = checkedData.map(item => item.menuName).join(",")
|
||||
}else {
|
||||
this.form.standSystem = checkedData.menuName
|
||||
}
|
||||
this.form.standSystem = checkedData.id
|
||||
this.form.standSystemName = checkedData.menuName
|
||||
}
|
||||
this.modalShowFlag1 = false
|
||||
},
|
||||
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
|
||||
if(checkedData) {
|
||||
if(checkedData.length > 0){
|
||||
this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
|
||||
this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
|
||||
}else {
|
||||
this.form.cycvppsbm = checkedData.code
|
||||
this.form.cycvppscn = checkedData.chineseName
|
||||
}
|
||||
popoverHideBusVs (checkedIds, checkedData) {
|
||||
if(checkedData){
|
||||
this.form.cycvppsbm = checkedData.code
|
||||
this.form.cycvppscn = checkedData.chineseName
|
||||
}
|
||||
this.modalShowFlag2 = false
|
||||
},
|
||||
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
|
||||
if(checkedData) {
|
||||
if(checkedData.length > 0){
|
||||
this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
|
||||
this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
|
||||
}else {
|
||||
this.form.kccvppsbm = checkedData.code
|
||||
this.form.kccvppscn = checkedData.chineseName
|
||||
}
|
||||
popoverHideCarVs (checkedIds, checkedData) {
|
||||
if(checkedData){
|
||||
this.form.kccvppsbm = checkedData.code
|
||||
this.form.kccvppscn = checkedData.chineseName
|
||||
}
|
||||
this.modalShowFlag3 = false
|
||||
},
|
||||
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
|
||||
if(checkedData) {
|
||||
if(checkedData.length > 0){
|
||||
this.form.dybxh = checkedData.map(item => item.model).join(",")
|
||||
this.form.dymc = checkedData.map(item => item.name).join(",")
|
||||
}else {
|
||||
this.form.dybxh = checkedData.model
|
||||
this.form.dymc = checkedData.name
|
||||
}
|
||||
popoverHideModel (checkedIds, checkedData) {
|
||||
if(checkedData){
|
||||
this.form.dybxh = checkedData.model
|
||||
this.form.dymc = checkedData.name
|
||||
}
|
||||
this.modalShowFlag4 = false
|
||||
},
|
||||
closeDrawer() {
|
||||
this.ListModel = false
|
||||
@@ -2092,14 +2006,6 @@
|
||||
this.busVppsOptions = res.data
|
||||
})
|
||||
},
|
||||
busVsChildFunc(id){
|
||||
this.$http.get('sarVppsTree/childByList', {id:id}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.busVppsChildOptions = []
|
||||
this.busVppsChildOptions = res.data
|
||||
})
|
||||
},
|
||||
modelFunc(){
|
||||
this.$http.get('sarModelTree/list', '', {
|
||||
_this: this
|
||||
|
||||
@@ -764,13 +764,13 @@
|
||||
<el-form :model="sarConfigStandSearch" :inline="true" class="label-input-form">
|
||||
<el-formItem label="标准类别" prop="standSort" class="search-item">
|
||||
<el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
|
||||
@keyup.enter.native="searchConfiguraStand" clearable>
|
||||
@keyup.enter.native="searchConfiguraStand(true)" clearable>
|
||||
<el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-formItem>
|
||||
<el-formItem label="标准号/名称" prop="standNumber" class="search-item">
|
||||
<el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand"
|
||||
<el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand(true)"
|
||||
placeholder="根据标准号/名称查找" clearable/>
|
||||
</el-formItem>
|
||||
<el-form-item label="" class="search-item btn-box">
|
||||
|
||||
+328
-23
@@ -4,27 +4,43 @@
|
||||
<!--左侧树-->
|
||||
<div class="tree-content" :class="{ 'tree-closed': sideClose }" >
|
||||
<div class="tree">
|
||||
<laws-tree :zNodes="lawsZNodes"
|
||||
ref="enterpriseStandardTree"
|
||||
treeDivId="enterpriseStandardTree"
|
||||
:deptSelect = true
|
||||
showRMenu
|
||||
autoSelect
|
||||
add-id="TB9979T4Y4"
|
||||
edit-id="AES4L4E52G"
|
||||
remove-id="4PP7QBKXSQ"
|
||||
:drag="hasPermissionDrag"
|
||||
drag-bind=".drag-table"
|
||||
:hideRMenuNode="['wdsc']"
|
||||
drag-dom="drag-row"
|
||||
v-if="treeReload"
|
||||
@treeAdd="(treeId, treeNode) => clickDropMenu('newMenu', treeNode)"
|
||||
@treeEdit="(treeId, treeNode) => clickDropMenu('editMenu', treeNode)"
|
||||
@treeClick="(treeId, treeNode) => treeClick(treeNode)"
|
||||
@treeRightClick="(treeId, treeNode) => treeRightClick(treeNode)"
|
||||
@treeRemove="(treeId, treeNode) => clickDropMenu('deleteMenu', treeNode)"
|
||||
@drag="drag"
|
||||
></laws-tree>
|
||||
<el-tree
|
||||
ref="tree"
|
||||
node-key="id"
|
||||
class="filter-tree"
|
||||
:props="props"
|
||||
:data="treeList"
|
||||
highlight-current
|
||||
@node-click="treeClick"
|
||||
default-expand-all
|
||||
:expand-on-click-node="false">
|
||||
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
|
||||
<span> {{ node.label}} </span>
|
||||
<span>
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
v-show="data.show"
|
||||
@click="() => append(data)">
|
||||
新增
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
v-show="data.show"
|
||||
@click="() => update(data)">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
v-show="data.showDel"
|
||||
@click="() => remove(node, data)">
|
||||
删除
|
||||
</el-button>
|
||||
</span>
|
||||
</span>
|
||||
</el-tree>
|
||||
</div>
|
||||
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
|
||||
<!--切换折叠样式-->
|
||||
@@ -860,6 +876,64 @@
|
||||
}"
|
||||
@confirm="isTreeOk"
|
||||
></org-table>
|
||||
<!-- 新建抽屉 -->
|
||||
<el-drawer
|
||||
:wrapperClosable="false"
|
||||
:title="productTitle"
|
||||
:visible.sync="productModal"
|
||||
size="800px"
|
||||
:before-close="closeDrawer"
|
||||
label-width="130px"
|
||||
>
|
||||
<div class="demo-drawer-content">
|
||||
<el-form :model="productModelAdd"
|
||||
ref="productModelAdd"
|
||||
:rules="productRules"
|
||||
class="label-input-form"
|
||||
label-width="130px">
|
||||
<el-row>
|
||||
<el-col>
|
||||
<el-form-item label="菜单名称" prop="menuName" class="add-form-item">
|
||||
<el-input v-model.trim="productModelAdd.menuName" placeholder="请输入菜单名称" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col>
|
||||
<el-form-item label="排序号" prop="displaySeq" class="add-form-item">
|
||||
<el-input v-model.number="productModelAdd.displaySeq"
|
||||
number
|
||||
placeholder="请输入排序号"
|
||||
:maxlength="4"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col>
|
||||
<el-form-item v-if="modalType === 2" label="上级菜单" prop="parentIdsName" class="add-form-item">
|
||||
<el-input v-model="productModelAdd.parentIdsName" disabled
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col>
|
||||
<el-form-item label="描述" prop="remarks" class="add-form-item">
|
||||
<el-input v-model.trim="productModelAdd.remarks"
|
||||
placeholder="请输入描述"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button
|
||||
class="common-button-primary"
|
||||
icon="el-icon-check"
|
||||
type="primary"
|
||||
@click="saveProduct('productModelAdd')">提交</el-button>
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
icon="el-icon-close"
|
||||
@click="closeModal">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -893,6 +967,60 @@ export default {
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
props: {
|
||||
label: 'menuName',
|
||||
children: 'children'
|
||||
},
|
||||
productModal: false, // 模态框是否打开
|
||||
modalType: '',
|
||||
productTitle: '', // 模态框标题
|
||||
// 规范
|
||||
productRules: {
|
||||
menuName: [
|
||||
{required: true, message: '一级菜单不能为空', trigger: 'blur'},
|
||||
{type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'}
|
||||
],
|
||||
displaySeq: [
|
||||
{type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
|
||||
{type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'}
|
||||
],
|
||||
remarks: [
|
||||
{type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'}
|
||||
],
|
||||
dicTypeName: [
|
||||
{required: true, message: '选项不能为空', trigger: 'blur'},
|
||||
{type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'}
|
||||
],
|
||||
showIndex: [
|
||||
{type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
|
||||
{type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'}
|
||||
],
|
||||
describes: [
|
||||
{type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'}
|
||||
]
|
||||
},
|
||||
productModelAdd: {
|
||||
id : "",
|
||||
sorDivide : "INLAND_STAND",
|
||||
menuName : "",
|
||||
parentId : null,
|
||||
parentIds : null,
|
||||
parentIdsName : "",
|
||||
displaySeq : "",
|
||||
validFlag : "",
|
||||
creationTime : "",
|
||||
modifyTime : "",
|
||||
remarks : "",
|
||||
children : [],
|
||||
// 模态框信息
|
||||
dicTypeName: '',
|
||||
showIndex: '',
|
||||
// 描述
|
||||
describes: '',
|
||||
// 唯一辨识
|
||||
dicId: ""
|
||||
},
|
||||
treeList: [],
|
||||
standId: '',
|
||||
visibleOrgTable: false,
|
||||
visibleShare: false,
|
||||
@@ -1423,6 +1551,183 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
closeModal () {
|
||||
this.productModal = false
|
||||
this.closeDrawer()
|
||||
},
|
||||
// 提交新增/修改
|
||||
saveProduct (name) {
|
||||
this.$refs[name].validate((valid) => {
|
||||
if (valid) {
|
||||
if (this.modalType === 1) {
|
||||
this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.selectMenuList()
|
||||
this.productModal = false
|
||||
this.productModelAdd = {
|
||||
// 模态框信息
|
||||
dicTypeName: '',
|
||||
showIndex: '',
|
||||
// 描述
|
||||
describes: '',
|
||||
// 唯一辨识
|
||||
dicId: this.$route.params.id
|
||||
}
|
||||
} else {
|
||||
this.productModal = true
|
||||
}
|
||||
}, e => {})
|
||||
} else if (this.modalType === 2) {
|
||||
this.$http.putData('sarResource/ts-resource', this.productModelAdd, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.selectMenuList()
|
||||
this.productModal = false
|
||||
this.productModelAdd = {
|
||||
// 模态框信息
|
||||
dicTypeName: '',
|
||||
showIndex: '',
|
||||
// 描述
|
||||
describes: '',
|
||||
// 唯一辨识
|
||||
dicId: this.$route.params.id
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
}
|
||||
} else {
|
||||
}
|
||||
})
|
||||
},
|
||||
closeDrawer () {
|
||||
this.$nextTick(() => {
|
||||
this.$refs['productModelAdd'].resetFields()
|
||||
this.productModelAdd = {
|
||||
// 模态框信息
|
||||
dicTypeName: '',
|
||||
showIndex: '',
|
||||
// 描述
|
||||
describes: '',
|
||||
// 唯一辨识
|
||||
dicId: this.$route.params.id
|
||||
}
|
||||
})
|
||||
this.productModal = false
|
||||
},
|
||||
// 查询二级菜单
|
||||
selectMenuList () {
|
||||
this.$http.get('sarResource/ts-resource', {
|
||||
sorDivide: 'BUSINESS_STAND'
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
this.treeList = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
// 查询二级菜单
|
||||
selectChildMenu (row) {
|
||||
this.$http.get('sarResource/ts-resource/getMenuById', {
|
||||
menuId: row.id
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
if(this.modalType === 1){
|
||||
let idsName = ""
|
||||
if(row.parentIds !== null){
|
||||
if(row.parentIds.indexOf(res.data.id) != -1){
|
||||
this.productModelAdd.parentIds = row.parentIds
|
||||
}else {
|
||||
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
|
||||
idsName = row.parentIdsName + ',' + res.data.menuName
|
||||
}
|
||||
}else {
|
||||
this.productModelAdd.parentIds = res.data.id
|
||||
idsName = res.data.menuName;
|
||||
}
|
||||
this.productModelAdd.parentId = res.data.id
|
||||
this.productModelAdd.parentIdsName = idsName
|
||||
this.$forceUpdate()
|
||||
}else {
|
||||
this.productModelAdd = res.data
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
update(data) {
|
||||
this.modalType = 2
|
||||
this.selectChildMenu(data)
|
||||
this.productModal = true
|
||||
this.productTitle = '编辑信息'
|
||||
// const newChild = { id: this.id++, label: 'testtest', children: [] };
|
||||
// if (!data.children) {
|
||||
// this.$set(data, 'children', []);
|
||||
// }
|
||||
// data.children.push(newChild);
|
||||
},
|
||||
|
||||
append(data) {
|
||||
this.modalType = 1
|
||||
this.selectChildMenu(data)
|
||||
this.productModal = true
|
||||
this.productTitle = '新增下级菜单信息'
|
||||
this.productModelAdd.dicTypeCode = ''
|
||||
// const newChild = { id: this.id++, label: 'testtest', children: [] };
|
||||
// if (!data.children) {
|
||||
// this.$set(data, 'children', []);
|
||||
// }
|
||||
// data.children.push(newChild);
|
||||
},
|
||||
|
||||
remove(node, data) {
|
||||
this.$confirm('是否删除菜单?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
confirmButtonClass: 'common-button-primary',
|
||||
cancelButtonText: '取消',
|
||||
roundButton: true,
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$http.delete("sarResource/ts-resource", {
|
||||
resourceId: data.id
|
||||
}, res => {
|
||||
}, e => {
|
||||
if(e.ok){
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: "删除成功"
|
||||
})
|
||||
this.selectMenuList()
|
||||
}else {
|
||||
this.$message({
|
||||
type: 'warning',
|
||||
message: e.message
|
||||
})
|
||||
}
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$refs.selections.clearSelection()
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
})
|
||||
})
|
||||
// const parent = node.parent;
|
||||
// const children = parent.data.children || parent.data;
|
||||
// const index = children.findIndex(d => d.id === data.id);
|
||||
// children.splice(index, 1);
|
||||
},
|
||||
// 树节点鼠标移入移出
|
||||
mouseenter(data){
|
||||
console.log(data)
|
||||
this.$set(data, 'show', true)
|
||||
if(data.parentId !== null){
|
||||
this.$set(data, 'showDel', true)
|
||||
}
|
||||
},
|
||||
mouseleave(data){
|
||||
this.$set(data, 'show', false)
|
||||
this.$set(data, 'showDel', false)
|
||||
},
|
||||
/**
|
||||
* @description: 起草人名称展示
|
||||
* @author: chenxiaoxi
|
||||
@@ -3147,7 +3452,7 @@ export default {
|
||||
mounted () {
|
||||
this.treeReload = true
|
||||
// 进入页面后查询树形结构目录
|
||||
this.selectMenu()
|
||||
this.selectMenuList()
|
||||
// 查询各下拉框数据
|
||||
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||
_this: this
|
||||
@@ -3194,7 +3499,7 @@ export default {
|
||||
height: 100%;
|
||||
//background: #fff;
|
||||
.tree-content {
|
||||
width: 16%;
|
||||
width: 20%;
|
||||
position: relative;
|
||||
/*height: 100%;*/
|
||||
background: #fff;
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
</el-row>
|
||||
<el-row style="margin-top: 10px">
|
||||
<el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.projectManager }} </span></el-col>
|
||||
<el-col :span="5" :push="1"> 项目计划开始时间: <span class="valueColor">{{ localProEO.projectStartDate}}</span></el-col>
|
||||
<el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{localProEO.projectEndDate }} </span></el-col>
|
||||
<el-col :span="5" :push="1"> 项目计划开始时间: <span class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD')}}</span></el-col>
|
||||
<el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-card>
|
||||
@@ -420,7 +420,7 @@ export default {
|
||||
okStand() {
|
||||
let _this = this;
|
||||
if (this.standList.length < 1) {
|
||||
_this.$message.warning("请选择需要添加进清单的数据");
|
||||
_this.$message.warning("请选择标准");
|
||||
} else {
|
||||
for (let i=0;i<this.dataList.length;i++){
|
||||
let newStand = false;
|
||||
|
||||
Reference in New Issue
Block a user