Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -558,14 +558,19 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
//流程保存事件
|
//流程保存事件
|
||||||
handleSave() {
|
handleSave() {
|
||||||
|
|||||||
@@ -289,15 +289,18 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
console.log(item)
|
if(item.standId){
|
||||||
let routeUrl = this.$router.resolve({
|
let routeUrl = this.$router.resolve({
|
||||||
name: "OtherStandardDetails",
|
name: "OtherStandardDetails",
|
||||||
params: {
|
params: {
|
||||||
id: item.standId,
|
id: item.standId,
|
||||||
pageType: "INLAND_STAND"
|
pageType: "INLAND_STAND"
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
window.open(routeUrl.href, "_blank");
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
processTable() {
|
processTable() {
|
||||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||||
|
|||||||
@@ -260,14 +260,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview (item) {
|
handlePreview (item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: 'OtherStandardDetails',
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: 'INLAND_STAND'
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
})
|
}
|
||||||
window.open(routeUrl.href, '_blank')
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//获取数据
|
//获取数据
|
||||||
getData() {
|
getData() {
|
||||||
|
|||||||
@@ -401,14 +401,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
|
|||||||
@@ -399,14 +399,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
|
|||||||
@@ -401,14 +401,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
|
|||||||
@@ -318,14 +318,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview (item) {
|
handlePreview (item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: 'OtherStandardDetails',
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: 'INLAND_STAND'
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
})
|
}
|
||||||
window.open(routeUrl.href, '_blank')
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//获取数据
|
//获取数据
|
||||||
getData() {
|
getData() {
|
||||||
|
|||||||
@@ -344,14 +344,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
|
|||||||
@@ -340,14 +340,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
|
|||||||
@@ -250,14 +250,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
|
|||||||
@@ -604,14 +604,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
|
|||||||
@@ -359,14 +359,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
processTable() {
|
processTable() {
|
||||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||||
|
|||||||
@@ -399,14 +399,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
|
|||||||
@@ -401,14 +401,18 @@ export default {
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview(item) {
|
handlePreview(item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if(item.standId){
|
||||||
name: "OtherStandardDetails",
|
let routeUrl = this.$router.resolve({
|
||||||
params: {
|
name: "OtherStandardDetails",
|
||||||
id: item.standId,
|
params: {
|
||||||
pageType: "INLAND_STAND"
|
id: item.standId,
|
||||||
}
|
pageType: "INLAND_STAND"
|
||||||
});
|
}
|
||||||
window.open(routeUrl.href, "_blank");
|
});
|
||||||
|
window.open(routeUrl.href, "_blank");
|
||||||
|
}else{
|
||||||
|
this.$message.warning('当前标准不存在,请检查');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
|
|||||||
@@ -177,6 +177,9 @@
|
|||||||
size="mini" @click="OCRAdd('2')"
|
size="mini" @click="OCRAdd('2')"
|
||||||
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont"></i>编辑
|
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont"></i>编辑
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button class="common-button-default" v-btn-permission="'56b2eec13fe5b53916b8e2b9dacc6554'"
|
||||||
|
size="mini" @click="MobileStandard('2')"><i class="iconfont"></i>移动标准
|
||||||
|
</el-button>
|
||||||
<!-- <el-button class="common-button-default"-->
|
<!-- <el-button class="common-button-default"-->
|
||||||
<!-- size="mini"-->
|
<!-- size="mini"-->
|
||||||
<!-- :loading="searching"-->
|
<!-- :loading="searching"-->
|
||||||
@@ -1414,6 +1417,32 @@
|
|||||||
:data="standSystemOptions"
|
:data="standSystemOptions"
|
||||||
:defaultProps="defaultProps"
|
:defaultProps="defaultProps"
|
||||||
:nodeKey="nodeKey" @popoverHide="TpopoverHide" @popoverHideCancel="TpopoverHideCancel"></tree-select-new>
|
:nodeKey="nodeKey" @popoverHide="TpopoverHide" @popoverHideCancel="TpopoverHideCancel"></tree-select-new>
|
||||||
|
<!-- 移动标准 -->
|
||||||
|
<el-drawer title="移动标准" :visible.sync="mobileModal" size="500px" @close="mobileeCancel">
|
||||||
|
<div class="demo-drawer-content">
|
||||||
|
<el-tree
|
||||||
|
ref="menuTree"
|
||||||
|
node-key="id"
|
||||||
|
class="tree-line"
|
||||||
|
icon-class="icon-tree"
|
||||||
|
:indent="0"
|
||||||
|
show-checkbox
|
||||||
|
:check-strictly="true"
|
||||||
|
@check-change="handleCheckChange"
|
||||||
|
:props="props"
|
||||||
|
:data="treeList"
|
||||||
|
:default-expanded-keys="['1']"
|
||||||
|
highlight-current
|
||||||
|
:filter-node-method="filterNode">
|
||||||
|
</el-tree>
|
||||||
|
</div>
|
||||||
|
<div class="demo-drawer-footer">
|
||||||
|
<el-button size="mini" type="primary" class="common-button-primary" icon="el-icon-check"
|
||||||
|
@click="mobileStandardBt">提交
|
||||||
|
</el-button>
|
||||||
|
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="mobileeCancel">取消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-drawer>
|
||||||
<!-- 导入失败-->
|
<!-- 导入失败-->
|
||||||
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
|
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
|
||||||
<p slot="title" style="color:#f60">
|
<p slot="title" style="color:#f60">
|
||||||
@@ -2917,6 +2946,7 @@ export default {
|
|||||||
// 分享数据
|
// 分享数据
|
||||||
resType: '',
|
resType: '',
|
||||||
drawerModal: false, // 分享
|
drawerModal: false, // 分享
|
||||||
|
mobileModal: false, // 移动标准
|
||||||
// start 分享相关的
|
// start 分享相关的
|
||||||
// 消息推送保存对象
|
// 消息推送保存对象
|
||||||
personShareEO: {
|
personShareEO: {
|
||||||
@@ -3317,6 +3347,69 @@ export default {
|
|||||||
this.productModal = false
|
this.productModal = false
|
||||||
this.closeDrawer()
|
this.closeDrawer()
|
||||||
},
|
},
|
||||||
|
//节点选中状态发生变化时的回调,当选中另一个后,当前的的节点状态变化也会触发这个事件
|
||||||
|
handleCheckChange(item,checked,self){
|
||||||
|
if(checked){
|
||||||
|
this.editCheckd = item.id
|
||||||
|
this.$refs.menuTree.setCheckedKeys([item.id]);
|
||||||
|
// this.nodeClick(item)
|
||||||
|
}else{
|
||||||
|
if(this.editCheckd === item.id){
|
||||||
|
this.$refs.menuTree.setCheckedKeys([item.id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
},
|
||||||
|
//移动标准
|
||||||
|
MobileStandard(){
|
||||||
|
let checkedObj = []
|
||||||
|
if(this.selectSarMenu.parentId == null || this.selectSarMenu.parentId === '' || this.selectSarMenu.parentId === undefined){
|
||||||
|
this.$message.error('请选择二级及以下目录')
|
||||||
|
}else if (this.selectedList < 1){
|
||||||
|
this.$message.error('请至少选择一条标准')
|
||||||
|
}else {
|
||||||
|
this.mobileModal = true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// 取消
|
||||||
|
mobileeCancel() {
|
||||||
|
let checkedObj = []
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.menuTree.setCheckedKeys(checkedObj);
|
||||||
|
})
|
||||||
|
this.editCheckd = ''
|
||||||
|
this.mobileModal = false
|
||||||
|
|
||||||
|
|
||||||
|
},
|
||||||
|
// 移动标准提交
|
||||||
|
mobileStandardBt(){
|
||||||
|
let checkedObj = []
|
||||||
|
let search = {}
|
||||||
|
// 取最外层目录id
|
||||||
|
search.oldMenuId = this.selectSarMenu.id
|
||||||
|
search.menuId = this.editCheckd
|
||||||
|
search.idlist = []
|
||||||
|
for (let i = 0; i < this.selectedList.length; i++) {
|
||||||
|
search.idlist.push(this.selectedList[i])
|
||||||
|
}
|
||||||
|
if(search.menuId == '' || search.menuId == null || search.menuId == undefined){
|
||||||
|
this.$message.error('请至少选择一个节点')
|
||||||
|
}else{
|
||||||
|
this.$http.putData('lawss/sarStandMenu/moveStandInfo', search, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
// this.$Message.success('取消配置成功!')
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.menuTree.setCheckedKeys(checkedObj);
|
||||||
|
})
|
||||||
|
this.editCheckd = ''
|
||||||
|
this.mobileModal = false
|
||||||
|
this.getDomesticStandardTable()
|
||||||
|
}, e => {
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
// 提交新增/修改
|
// 提交新增/修改
|
||||||
saveProduct(name) {
|
saveProduct(name) {
|
||||||
this.$refs[name].validate((valid) => {
|
this.$refs[name].validate((valid) => {
|
||||||
|
|||||||
+113
@@ -284,6 +284,9 @@
|
|||||||
size="mini" @click="selectBuss()" style="float: right;margin-top: 11px;"
|
size="mini" @click="selectBuss()" style="float: right;margin-top: 11px;"
|
||||||
v-btn-permission="'76742566e1cf930f384ef78cecb86f61'"><i class="iconfont"></i>企标复审计划
|
v-btn-permission="'76742566e1cf930f384ef78cecb86f61'"><i class="iconfont"></i>企标复审计划
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button class="common-button-default" v-btn-permission="'6d0daae8471f16d635bec1529801670a'"
|
||||||
|
size="mini" @click="MobileStandard('2')"><i class="iconfont"></i>移动标准
|
||||||
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<!--表格-->
|
<!--表格-->
|
||||||
<div class="content">
|
<div class="content">
|
||||||
@@ -489,6 +492,32 @@
|
|||||||
@pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
|
@pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
|
||||||
<loading :loading="loading">数据获取中</loading>
|
<loading :loading="loading">数据获取中</loading>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- 移动标准 -->
|
||||||
|
<el-drawer title="移动标准" :visible.sync="mobileModal" size="500px" @close="mobileeCancel">
|
||||||
|
<div class="demo-drawer-content">
|
||||||
|
<el-tree
|
||||||
|
ref="menuTree"
|
||||||
|
node-key="id"
|
||||||
|
class="tree-line"
|
||||||
|
icon-class="icon-tree"
|
||||||
|
:indent="0"
|
||||||
|
show-checkbox
|
||||||
|
:check-strictly="true"
|
||||||
|
@check-change="handleCheckChange"
|
||||||
|
:props="props"
|
||||||
|
:data="treeList1"
|
||||||
|
:default-expanded-keys="['1']"
|
||||||
|
highlight-current
|
||||||
|
:filter-node-method="filterNode">
|
||||||
|
</el-tree>
|
||||||
|
</div>
|
||||||
|
<div class="demo-drawer-footer">
|
||||||
|
<el-button size="mini" type="primary" class="common-button-primary" icon="el-icon-check"
|
||||||
|
@click="mobileStandardBt">提交
|
||||||
|
</el-button>
|
||||||
|
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="mobileeCancel">取消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-drawer>
|
||||||
<!-- 新增、编辑模态窗 -->
|
<!-- 新增、编辑模态窗 -->
|
||||||
<el-drawer :title="drawerTitle"
|
<el-drawer :title="drawerTitle"
|
||||||
:visible.sync="modalshowflag"
|
:visible.sync="modalshowflag"
|
||||||
@@ -1792,6 +1821,7 @@ export default {
|
|||||||
nodeKeyModel: 'model',
|
nodeKeyModel: 'model',
|
||||||
defaultCheckedKeys: [],
|
defaultCheckedKeys: [],
|
||||||
productModal: false, // 模态框是否打开
|
productModal: false, // 模态框是否打开
|
||||||
|
mobileModal: false, // 移动标准
|
||||||
modalType: '',
|
modalType: '',
|
||||||
productTitle: '', // 模态框标题
|
productTitle: '', // 模态框标题
|
||||||
// 规范
|
// 规范
|
||||||
@@ -1841,6 +1871,7 @@ export default {
|
|||||||
},
|
},
|
||||||
filterText: '', // 企业标准库过滤
|
filterText: '', // 企业标准库过滤
|
||||||
treeList: [],
|
treeList: [],
|
||||||
|
treeList1: [],
|
||||||
standId: '',
|
standId: '',
|
||||||
visibleOrgTable: false,
|
visibleOrgTable: false,
|
||||||
visibleShare: false,
|
visibleShare: false,
|
||||||
@@ -2971,6 +3002,19 @@ export default {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
// 查询二级菜单
|
||||||
|
selectMenuListNew1() {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
this.$http.get('sarResource/ts-resource/getListStandLimitData', {
|
||||||
|
sorDivide: 'BUSINESS_STAND',
|
||||||
|
userId: this.$store.getters.userInfo.userId
|
||||||
|
}, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
this.treeList1 = res.data
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
selectMenuList() {
|
selectMenuList() {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
this.$http.get('sarResource/ts-resource/getListStandLimitData', {
|
this.$http.get('sarResource/ts-resource/getListStandLimitData', {
|
||||||
@@ -3192,6 +3236,75 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
//节点选中状态发生变化时的回调,当选中另一个后,当前的的节点状态变化也会触发这个事件
|
||||||
|
handleCheckChange(item,checked,self){
|
||||||
|
if(checked){
|
||||||
|
console.log(item)
|
||||||
|
this.editCheckd = item.id
|
||||||
|
this.NewTreeType = item.treeType
|
||||||
|
this.$refs.menuTree.setCheckedKeys([item.id]);
|
||||||
|
// this.nodeClick(item)
|
||||||
|
}else{
|
||||||
|
if(this.editCheckd === item.id){
|
||||||
|
this.$refs.menuTree.setCheckedKeys([item.id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
},
|
||||||
|
//移动标准
|
||||||
|
MobileStandard(){
|
||||||
|
let checkedObj = []
|
||||||
|
if(this.selectSarMenu.parentId == null || this.selectSarMenu.parentId === '' || this.selectSarMenu.parentId === undefined){
|
||||||
|
this.$message.error('请选择二级及以下目录')
|
||||||
|
}else if (this.selectedList < 1){
|
||||||
|
this.$message.error('请至少选择一条标准')
|
||||||
|
}else {
|
||||||
|
this.selectMenuListNew1()
|
||||||
|
this.mobileModal = true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// 取消
|
||||||
|
mobileeCancel() {
|
||||||
|
let checkedObj = []
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.menuTree.setCheckedKeys(checkedObj);
|
||||||
|
})
|
||||||
|
this.editCheckd = ''
|
||||||
|
this.mobileModal = false
|
||||||
|
|
||||||
|
|
||||||
|
},
|
||||||
|
// 移动标准提交
|
||||||
|
mobileStandardBt(){
|
||||||
|
let checkedObj = []
|
||||||
|
let search = {}
|
||||||
|
// 取最外层目录id
|
||||||
|
search.oldMenuId = this.selectSarMenu.id
|
||||||
|
search.menuId = this.editCheckd
|
||||||
|
search.treeType = this.selectSarMenu.treeType
|
||||||
|
// search.oldTreeType = this.selectSarMenu.treeType
|
||||||
|
// search.NewTreeType = this.NewTreeType
|
||||||
|
search.idlist = []
|
||||||
|
for (let i = 0; i < this.selectedList.length; i++) {
|
||||||
|
search.idlist.push(this.selectedList[i])
|
||||||
|
}
|
||||||
|
if(search.menuId == '' || search.menuId == null || search.menuId == undefined){
|
||||||
|
this.$message.error('请至少选择一个节点')
|
||||||
|
}else{
|
||||||
|
this.$http.putData('lawss/sarBussStandMenu/moveStandInfo', search, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
// this.$Message.success('取消配置成功!')
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.menuTree.setCheckedKeys(checkedObj);
|
||||||
|
})
|
||||||
|
this.editCheckd = ''
|
||||||
|
this.mobileModal = false
|
||||||
|
this.getBussionStandTable()
|
||||||
|
}, e => {
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
// 树点击
|
// 树点击
|
||||||
isTreeOk(checkedList) {
|
isTreeOk(checkedList) {
|
||||||
this.shareStandardSelect = []
|
this.shareStandardSelect = []
|
||||||
|
|||||||
@@ -165,6 +165,9 @@
|
|||||||
size="mini" @click="OCRAdd('2')"
|
size="mini" @click="OCRAdd('2')"
|
||||||
v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'"><i class="iconfont"></i>编辑
|
v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'"><i class="iconfont"></i>编辑
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button class="common-button-default" v-btn-permission="'c596ecef95f5177ecde662acfc9dee02'"
|
||||||
|
size="mini" @click="MobileStandard('2')"><i class="iconfont"></i>移动标准
|
||||||
|
</el-button>
|
||||||
<!--<!– <el-button class="common-button-default"
|
<!--<!– <el-button class="common-button-default"
|
||||||
size="mini" :loading="searching"
|
size="mini" :loading="searching"
|
||||||
@click="uploadImportModal(1)"
|
@click="uploadImportModal(1)"
|
||||||
@@ -1720,6 +1723,32 @@
|
|||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
|
<!-- 移动标准 -->
|
||||||
|
<el-drawer title="移动标准" :visible.sync="mobileModal" size="500px" @close="mobileeCancel">
|
||||||
|
<div class="demo-drawer-content">
|
||||||
|
<el-tree
|
||||||
|
ref="menuTree"
|
||||||
|
node-key="id"
|
||||||
|
class="tree-line"
|
||||||
|
icon-class="icon-tree"
|
||||||
|
:indent="0"
|
||||||
|
show-checkbox
|
||||||
|
:check-strictly="true"
|
||||||
|
@check-change="handleCheckChange"
|
||||||
|
:props="props"
|
||||||
|
:data="treeList"
|
||||||
|
:default-expanded-keys="['1']"
|
||||||
|
highlight-current
|
||||||
|
:filter-node-method="filterNode">
|
||||||
|
</el-tree>
|
||||||
|
</div>
|
||||||
|
<div class="demo-drawer-footer">
|
||||||
|
<el-button size="mini" type="primary" class="common-button-primary" icon="el-icon-check"
|
||||||
|
@click="mobileStandardBt">提交
|
||||||
|
</el-button>
|
||||||
|
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="mobileeCancel">取消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-drawer>
|
||||||
<!-- 组件树-->
|
<!-- 组件树-->
|
||||||
<tree-select-new
|
<tree-select-new
|
||||||
width="500"
|
width="500"
|
||||||
@@ -2002,6 +2031,7 @@ export default {
|
|||||||
isCollapse: true,
|
isCollapse: true,
|
||||||
sideClose: false, // 边栏收展状态
|
sideClose: false, // 边栏收展状态
|
||||||
isAdvancedSearch: false, // 高级检索窗口是否打开
|
isAdvancedSearch: false, // 高级检索窗口是否打开
|
||||||
|
mobileModal: false, // 移动标准
|
||||||
replaceStandNumModel: false,
|
replaceStandNumModel: false,
|
||||||
lawsExplainQuoteModel: false,
|
lawsExplainQuoteModel: false,
|
||||||
page: 1,
|
page: 1,
|
||||||
@@ -3919,6 +3949,71 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
//节点选中状态发生变化时的回调,当选中另一个后,当前的的节点状态变化也会触发这个事件
|
||||||
|
handleCheckChange(item,checked,self){
|
||||||
|
if(checked){
|
||||||
|
this.editCheckd = item.id
|
||||||
|
this.$refs.menuTree.setCheckedKeys([item.id]);
|
||||||
|
// this.nodeClick(item)
|
||||||
|
}else{
|
||||||
|
if(this.editCheckd === item.id){
|
||||||
|
this.$refs.menuTree.setCheckedKeys([item.id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
},
|
||||||
|
//移动标准
|
||||||
|
MobileStandard(){
|
||||||
|
let checkedObj = []
|
||||||
|
console.log(this.selectSarMenu.parentId)
|
||||||
|
if(this.selectSarMenu.parentId == null || this.selectSarMenu.parentId === '' || this.selectSarMenu.parentId === undefined){
|
||||||
|
this.$message.error('请选择二级及以下目录')
|
||||||
|
}else if (this.selectedList < 1){
|
||||||
|
this.$message.error('请至少选择一条标准')
|
||||||
|
}else {
|
||||||
|
this.mobileModal = true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// 取消
|
||||||
|
mobileeCancel() {
|
||||||
|
let checkedObj = []
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.menuTree.setCheckedKeys(checkedObj);
|
||||||
|
})
|
||||||
|
this.editCheckd = ''
|
||||||
|
this.mobileModal = false
|
||||||
|
|
||||||
|
|
||||||
|
},
|
||||||
|
// 移动标准提交
|
||||||
|
mobileStandardBt(){
|
||||||
|
let checkedObj = []
|
||||||
|
let search = {}
|
||||||
|
// 取最外层目录id
|
||||||
|
search.oldMenuId = this.selectSarMenu.id
|
||||||
|
search.menuId = this.editCheckd
|
||||||
|
search.idlist = []
|
||||||
|
for (let i = 0; i < this.selectedList.length; i++) {
|
||||||
|
search.idlist.push(this.selectedList[i])
|
||||||
|
}
|
||||||
|
console.log(search.menuId)
|
||||||
|
if(search.menuId == '' || search.menuId == null || search.menuId == undefined){
|
||||||
|
this.$message.error('请至少选择一个节点')
|
||||||
|
}else{
|
||||||
|
this.$http.putData('lawss/sarStandMenu/moveStandInfo', search, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
// this.$Message.success('取消配置成功!')
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.menuTree.setCheckedKeys(checkedObj);
|
||||||
|
})
|
||||||
|
this.editCheckd = ''
|
||||||
|
this.mobileModal = false
|
||||||
|
this.getDomesticStandardTable()
|
||||||
|
}, e => {
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
// 表格排序
|
// 表格排序
|
||||||
sortChange(sortObj) {
|
sortChange(sortObj) {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user