修改按钮权限id

This commit is contained in:
shen_yan_pu
2021-07-15 17:49:07 +08:00
parent e71a959714
commit 49c6a49bef
14 changed files with 168 additions and 78 deletions
@@ -76,8 +76,8 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'QNDKHM2VNP8D938ZA9CQ'">编辑</el-dropdown-item> <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'18f50c76137df9b3112d07942b0d517f'">编辑</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'eca5a9d90a5de7bf86c349cd0e73b1cf'" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -76,8 +76,8 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'XFFUQ8ASE5SS9HGDGANZ'">编辑</el-dropdown-item> <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'b1e60ec7b60389713bf5b450ec2d1115'">编辑</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'c157be4e073787ea6c4a04bd39686c2d'" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -331,7 +331,7 @@ export default {
{required: true, message: '所属模块不能为空', trigger: 'change'} {required: true, message: '所属模块不能为空', trigger: 'change'}
], ],
showIndex: [ showIndex: [
{ type: 'number', required: true, message: '请输入排序号', trigger: 'blur' }, { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
{ type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' } { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
] ]
}, },
@@ -2,8 +2,8 @@
<template> <template>
<div class="attribute-custom v-class"> <div class="attribute-custom v-class">
<div class="action-bar1"> <div class="action-bar1">
<el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button> <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'df57f63c9e993bbfb2a4b400d5257577'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button> <el-button class="common-button-default" size="mini" v-btn-permission="'9557b51320a50728d7047448d01c57c6'" @click="showDisplayLocationDialog">展示区域管理</el-button>
</div> </div>
<loading :loading="attributeDataLoading">数据处理中</loading> <loading :loading="attributeDataLoading">数据处理中</loading>
<div class="content"> <div class="content">
@@ -76,8 +76,8 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item> <el-dropdown-item v-btn-permission="'abba040e019fad5092624ffd71a70372'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item v-btn-permission="'730c9240a8f80bcdb88c71adb37f2aa7'" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -199,7 +199,7 @@
width="400px" width="400px"
> >
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button> <el-button class="common-button-primary add-button" v-btn-permission="'e128da8f053dd19113e75772f2c70f29'" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
</div> </div>
<el-table <el-table
:loading="displayLocationDialogTableConfig.loading" :loading="displayLocationDialogTableConfig.loading"
@@ -230,8 +230,8 @@
<el-dropdown trigger="click" @command="handleCommand2"> <el-dropdown trigger="click" @command="handleCommand2">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '修改']">修改</el-dropdown-item> <el-dropdown-item v-btn-permission="'2a788bca1cca66384e97f8ff722d4232'" :command="[scope.row, '修改']">修改</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item v-btn-permission="'116a3f339f3600e639271d0073045912'" :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -330,7 +330,7 @@ export default {
{required: true, message: '所属模块不能为空', trigger: 'change'} {required: true, message: '所属模块不能为空', trigger: 'change'}
], ],
showIndex: [ showIndex: [
{ type: 'number', required: true, message: '请输入排序号', trigger: 'blur' }, { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
{ type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' } { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
] ]
}, },
@@ -39,10 +39,9 @@
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left"
@click="resetSelect" @click="resetSelect"
size="mini" size="mini"
></el-button> >清空</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -78,7 +77,7 @@
}" }"
@selection-change="handleSelectone" @selection-change="handleSelectone"
> >
<el-table-column type="selection" width="55" align="center"> <el-table-column type="selection" :selectable="handleSelected" width="55" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="dictionaryCode" label="数据字典编码"> <el-table-column prop="dictionaryCode" label="数据字典编码">
</el-table-column> </el-table-column>
@@ -406,6 +405,12 @@ export default {
this.selectedList.push(data[i].id) this.selectedList.push(data[i].id)
} }
}, },
// 判断可选择的项
handleSelected(row, index) {
if (row.enable === '1') {
return true
}
},
pageChange (page) { pageChange (page) {
this.pageNo = page this.pageNo = page
this.getAttrByPage() this.getAttrByPage()
@@ -17,26 +17,26 @@
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" icon="el-icon-search" round @click="selectProductBtn"></el-button> <el-button class="common-button-primary" type="primary" size="mini" @click="selectProductBtn">搜索</el-button>
</el-form-item> </el-form-item>
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" icon="el-icon-refresh-left" @click="resetSelect" round></el-button> <el-button class="common-button-default" size="mini" @click="resetSelect" >清空</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="right"> <div class="right">
<el-button class="common-button-primary add-button" <el-button class="common-button-primary add-button"
v-btn-permission="'4UF7LY2ZSCFHBKYS7VE2'" v-btn-permission="'8969811dc465528909628a3a13529023'"
type="primary" type="primary"
icon="add" icon="add"
size="small"
v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'" v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
round
@click="productAdd">新增</el-button> @click="productAdd">新增</el-button>
<el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
v-btn-permission="'7WBE2BGZ2F745MDQ8VVD'" v-btn-permission="'df889d64e87c977e4bc9f9a0851d4c27'"
round
v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'" v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
icon="delete" icon="delete"
size="small"
@click="productBatchDel">删除</el-button> @click="productBatchDel">删除</el-button>
</div> </div>
</div> </div>
@@ -85,8 +85,8 @@
<div v-if="relateDicId"> <div v-if="relateDicId">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'AQCEYWZK8F4DL85BZPRB'">查看</el-dropdown-item> <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'AQCEYWZK8F4DL85BZPRB'">查看</el-dropdown-item>
</div> </div>
<el-dropdown-item :command="[scope.row, '编辑']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== 'D975E8V5KVQUY3DZFV7E' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'8DGUGJTPV32F9F478K4P'">编辑</el-dropdown-item> <el-dropdown-item :command="[scope.row, '编辑']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== 'D975E8V5KVQUY3DZFV7E' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'7WBE2BGZ2F745MDQ8VVD'">删除</el-dropdown-item> <el-dropdown-item :command="[scope.row, '删除']" v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'" v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">删除</el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
+4 -4
View File
@@ -31,8 +31,8 @@
</table-tools-bar> </table-tools-bar>
<div class="content"> <div class="content">
<div class="action-bar"> <div class="action-bar">
<el-button size="mini" v-btn-permission="''" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button> <el-button size="mini" v-btn-permission="'36078b3c8e897f8c1b6d6974a612d0c7'" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button>
<el-button size="mini" v-btn-permission="''" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button> <el-button size="mini" v-btn-permission="'83981863baa8716bdcc9e52a1fb1d2dc'" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
</div> </div>
<div class="table-wrap"> <div class="table-wrap">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;"> <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
@@ -120,8 +120,8 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="''" :command="[scope.row, '查看']">查看</el-dropdown-item> <el-dropdown-item v-btn-permission="'13219b54a6f41280818e7ade5cf2cfad'" :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item v-btn-permission="''" :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item v-btn-permission="'b6b048e926ecc9334cad769d4be7c4ec'" :command="[scope.row, '删除']">删除</el-dropdown-item>
<!-- <el-dropdown-item v-btn-permission="''" :command="[scope.row, '分享']">分享</el-dropdown-item> <!-- <el-dropdown-item v-btn-permission="''" :command="[scope.row, '分享']">分享</el-dropdown-item>
<el-dropdown-item <el-dropdown-item
v-if="scope.row.collectBtn" v-if="scope.row.collectBtn"
@@ -15,13 +15,13 @@
</el-formItem> </el-formItem>
<el-formItem> <el-formItem>
<el-button <el-button
icon="el-icon-search"
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
@click="getSarFileSplitInfoEOPage"> @click="getSarFileSplitInfoEOPage">
搜索
</el-button> </el-button>
<el-button size="mini" icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand"></el-button> <el-button size="mini" class="common-button-default" @click="clearSearchStand">清空</el-button>
</el-formItem> </el-formItem>
</el-form> </el-form>
</div> </div>
@@ -103,13 +103,13 @@
</el-formItem> </el-formItem>
<el-formItem class="search-item"> <el-formItem class="search-item">
<el-button <el-button
icon="el-icon-search"
size="mini" size="mini"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@click="getSarFileSplitInfoEOPage2"> @click="getSarFileSplitInfoEOPage2">
搜索
</el-button> </el-button>
<el-button size="mini" icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand2"></el-button> <el-button size="mini" class="common-button-default" @click="clearSearchStand2">清空</el-button>
</el-formItem> </el-formItem>
</el-form> </el-form>
</div> </div>
@@ -4,10 +4,10 @@
<div class="action-bar"> <div class="action-bar">
<div slot="left"> <div slot="left">
<!-- <el-button type="primary" @click="changeData">转化</Button>--> <!-- <el-button type="primary" @click="changeData">转化</Button>-->
<el-button size="mini" @click="uploadPdf" v-btn-permission="''" <el-button size="mini" @click="uploadPdf" v-btn-permission="'f56e5f765a93c14cba88f8c3270388c6'"
><i class="iconfont">&#xe65d;</i>上传</el-button ><i class="iconfont">&#xe65d;</i>上传</el-button
> >
<el-button size="mini" @click="delData" v-btn-permission="''" <el-button size="mini" @click="delData" v-btn-permission="'ef6262d0bf66a25633e903d76a93e579'"
><i class="iconfont">&#xe61b;</i>删除</el-button ><i class="iconfont">&#xe61b;</i>删除</el-button
> >
</div> </div>
@@ -106,13 +106,13 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '获取文件']" v-btn-permission="" <el-dropdown-item :command="[scope.row, '获取文件']" v-btn-permission="'018cb58e72025fc43a9bfe1bde00c14a'"
>获取文件</el-dropdown-item >获取文件</el-dropdown-item
> >
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="" <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'14bdb937d168478e65b139214e982a8c'"
>编辑</el-dropdown-item >编辑</el-dropdown-item
> >
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="" <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'74cffbebad841dbe2e0597792e5aba3f'"
>删除</el-dropdown-item >删除</el-dropdown-item
> >
<!-- <el-dropdown-item :command="[scope.row, '在线编辑']" v-btn-permission="" <!-- <el-dropdown-item :command="[scope.row, '在线编辑']" v-btn-permission=""
+5 -5
View File
@@ -29,7 +29,7 @@
</el-form> </el-form>
</div> </div>
<div class="content" style="height: 100%; padding-top: 5px; "> <div class="content" style="height: 100%; padding-top: 5px; ">
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider> <el-divider content-position="left" class="dynamic-child-title"></el-divider>
<el-table <el-table
:data="newItems" :data="newItems"
:height="height" :height="height"
@@ -59,7 +59,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="putTime" label="新车型实施日期" align="center" sortable> <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }} <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center"> <el-table-column prop="applyType" label="适用车型" align="center">
@@ -124,7 +124,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="putTime" label="在产车实施日期" align="center" sortable> <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }} <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center"> <el-table-column prop="applyType" label="适用车型" align="center">
@@ -190,7 +190,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="putTime" label="实施日期" align="center" sortable> <el-table-column prop="putTime" label="实施日期" align="center" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }} <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center"> <el-table-column prop="applyType" label="适用车型" align="center">
@@ -256,7 +256,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="putTime" label="实施日期" align="center" sortable> <el-table-column prop="putTime" label="实施日期" align="center" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }} <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center"> <el-table-column prop="applyType" label="适用车型" align="center">
@@ -8,7 +8,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
</div> </div>
<div class="content" v-if="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; overflow: auto;">
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
@@ -50,7 +50,7 @@
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-if="active === '2'"> <div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
<el-timeline> <el-timeline>
<el-form <el-form
@@ -378,6 +378,7 @@ export default {
this.$message.warning("请选择至少一条数据进行带入"); this.$message.warning("请选择至少一条数据进行带入");
} }
}, },
// 勾选事件
selectedChange(val) { selectedChange(val) {
this.selectedList = val this.selectedList = val
}, },
@@ -433,7 +434,7 @@ export default {
this.modalshowflag = true this.modalshowflag = true
}, },
drawerCheck (data) { drawerCheck (data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); let getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if(getlist.length == 1) { if(getlist.length == 1) {
this.roleRow = getlist[0] this.roleRow = getlist[0]
}else { }else {
@@ -364,7 +364,7 @@ export default {
this.modalshowflag = false this.modalshowflag = false
}, },
//查询按钮 //查询按钮
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询 getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => { this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选 let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选 let matchName = true; // 项目名称 筛选
@@ -12,11 +12,11 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<el-form :modal="dataList" inline class="label-input-form"> <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
size="small" size="small"
v-model="dataList.standId" v-model="nonSearch.standId"
placeholder="请输入" placeholder="请输入"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
@@ -24,13 +24,13 @@
<el-form-item label="项目名称" class="search-item"> <el-form-item label="项目名称" class="search-item">
<el-input <el-input
size="small" size="small"
v-model="dataList.productName" v-model="nonSearch.productName"
placeholder="请输入" placeholder="请输入"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input v-model="dataList.responsibleUnit" v-show="false" /> <el-input v-model="nonSearch.responsibleUnit" v-show="false" />
<el-popover <el-popover
placement="bottom" placement="bottom"
popper-class="user-dept-popper" popper-class="user-dept-popper"
@@ -40,7 +40,7 @@
<el-input <el-input
size="small" size="small"
slot="reference" slot="reference"
v-model="dataList.responseUnitShow" v-model="nonSearch.responseUnitShow"
placeholder="根据责任部门查找" placeholder="根据责任部门查找"
readonly readonly
clearable clearable
@@ -64,7 +64,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'" v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
@click="getTableByPage('dataList')"> @click="getTableByPage(nonSearch)">
查询 查询
</el-button> </el-button>
</el-form-item> </el-form-item>
@@ -120,7 +120,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="textarea"> v-model="commentText">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -129,8 +129,10 @@
<ProcessFooter <ProcessFooter
show-save show-save
show-submit show-submit
show-back
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@back="handleSubmitNo"
@save="handleSave" @save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
> >
@@ -174,10 +176,10 @@ export default {
name: "wfhxzgStep3", name: "wfhxzgStep3",
data() { data() {
return { return {
textarea: '', // 意见 commentText: '', // 意见
title: '', // 新增编辑抽屉标题 title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
nonConformitySearch: { nonSearch: {
standId: '', // 标准号/名称 standId: '', // 标准号/名称
productName: '', // 项目名称 productName: '', // 项目名称
responsibleUnit: '' // 责任部门 responsibleUnit: '' // 责任部门
@@ -243,6 +245,25 @@ export default {
this.active = name this.active = name
}, },
handleSubmitNo() {
if (this.commentText) {
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
}
},
// 保存按钮 // 保存按钮
handleSave() {}, handleSave() {},
// 提交按钮 // 提交按钮
@@ -317,11 +338,32 @@ export default {
this.modalshowflag = false this.modalshowflag = false
}, },
//查询按钮 //查询按钮
getTableByPage() { getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选
let matchUnit = true; // 部门 筛选
if (standId) {
const keysId = standId
.toUpperCase() // 转大写
.replace(' ', '') // 删掉空格
.split('') // 切割成 单个字
matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
}
if (productName) {
matchName = item.productName === productName;
}
if (responsibleUnit) {
matchUnit = item.responsibleUnit === responsibleUnit;
}
return matchId && matchName && matchUnit;
})
this.dataList = this.realList
}, },
// 清空 查询条件 // 清空 查询条件
clearAllSearch (search = true) { clearAllSearch (search = true) {
this.nonConformitySearch = { this.nonSearch = {
standId: '', standId: '',
productName: '', productName: '',
responsibleUnit: '' responsibleUnit: ''
@@ -12,11 +12,11 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<el-form :modal="dataList" inline class="label-input-form"> <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
size="small" size="small"
v-model="dataList.standId" v-model="nonSearch.standId"
placeholder="请输入" placeholder="请输入"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
@@ -24,13 +24,13 @@
<el-form-item label="项目名称" class="search-item"> <el-form-item label="项目名称" class="search-item">
<el-input <el-input
size="small" size="small"
v-model="dataList.productName" v-model="nonSearch.productName"
placeholder="请输入" placeholder="请输入"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input v-model="dataList.responsibleUnit" v-show="false" /> <el-input v-model="nonSearch.responsibleUnit" v-show="false" />
<el-popover <el-popover
placement="bottom" placement="bottom"
popper-class="user-dept-popper" popper-class="user-dept-popper"
@@ -40,7 +40,7 @@
<el-input <el-input
size="small" size="small"
slot="reference" slot="reference"
v-model="dataList.responseUnitShow" v-model="nonSearch.responseUnitShow"
placeholder="根据责任部门查找" placeholder="根据责任部门查找"
readonly readonly
clearable clearable
@@ -64,7 +64,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'" v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
@click="getTableByPage('dataList')"> @click="getTableByPage(nonSearch)">
查询 查询
</el-button> </el-button>
</el-form-item> </el-form-item>
@@ -177,7 +177,7 @@ export default {
textarea: '', // 意见 textarea: '', // 意见
title: '', // 新增编辑抽屉标题 title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
nonConformitySearch: { nonSearch: {
standId: '', // 标准号/名称 standId: '', // 标准号/名称
productName: '', // 项目名称 productName: '', // 项目名称
responsibleUnit: '' // 责任部门 responsibleUnit: '' // 责任部门
@@ -323,16 +323,37 @@ export default {
}, },
//未整改项抽屉中的查询按钮 //未整改项抽屉中的查询按钮
getTableByPage() { getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选
let matchUnit = true; // 部门 筛选
if (standId) {
const keysId = standId
.toUpperCase() // 转大写
.replace(' ', '') // 删掉空格
.split('') // 切割成 单个字
matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
}
if (productName) {
matchName = item.productName === productName;
}
if (responsibleUnit) {
matchUnit = item.responsibleUnit === responsibleUnit;
}
return matchId && matchName && matchUnit;
})
this.dataList = this.realList
}, },
// 清空 查询条件 // 清空 查询条件
clearAllSearch (search = true) { clearAllSearch () {
this.nonConformitySearch = { this.nonSearch = {
standId: '', standId: '',
productName: '', productName: '',
responsibleUnit: '' responsibleUnit: ''
} }
this.getTableByPage() this.getData()
}, },
// 分页事件 // 分页事件
pageChange (page) { pageChange (page) {
@@ -12,11 +12,11 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<el-form :modal="dataList" inline class="label-input-form"> <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
size="small" size="small"
v-model="dataList.standId" v-model="nonSearch.standId"
placeholder="请输入" placeholder="请输入"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
@@ -24,13 +24,13 @@
<el-form-item label="项目名称" class="search-item"> <el-form-item label="项目名称" class="search-item">
<el-input <el-input
size="small" size="small"
v-model="dataList.productName" v-model="nonSearch.productName"
placeholder="请输入" placeholder="请输入"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input v-model="dataList.responsibleUnit" v-show="false" /> <el-input v-model="nonSearch.responsibleUnit" v-show="false" />
<el-popover <el-popover
placement="bottom" placement="bottom"
popper-class="user-dept-popper" popper-class="user-dept-popper"
@@ -40,7 +40,7 @@
<el-input <el-input
size="small" size="small"
slot="reference" slot="reference"
v-model="dataList.responseUnitShow" v-model="nonSearch.responseUnitShow"
placeholder="根据责任部门查找" placeholder="根据责任部门查找"
readonly readonly
clearable clearable
@@ -64,7 +64,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'" v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
@click="getTableByPage('dataList')"> @click="getTableByPage(nonSearch)">
查询 查询
</el-button> </el-button>
</el-form-item> </el-form-item>
@@ -141,7 +141,7 @@ export default {
title: '', // 新增编辑抽屉标题 title: '', // 新增编辑抽屉标题
saveLoading: false, saveLoading: false,
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
nonConformitySearch: { nonSearch: {
standId: '', // 标准号/名称 standId: '', // 标准号/名称
productName: '', // 项目名称 productName: '', // 项目名称
responsibleUnit: '' // 责任部门 responsibleUnit: '' // 责任部门
@@ -231,16 +231,37 @@ export default {
} }
}, },
//未整改项抽屉中的查询按钮 //未整改项抽屉中的查询按钮
getTableByPage() { getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选
let matchUnit = true; // 部门 筛选
if (standId) {
const keysId = standId
.toUpperCase() // 转大写
.replace(' ', '') // 删掉空格
.split('') // 切割成 单个字
matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
}
if (productName) {
matchName = item.productName === productName;
}
if (responsibleUnit) {
matchUnit = item.responsibleUnit === responsibleUnit;
}
return matchId && matchName && matchUnit;
})
this.dataList = this.realList
}, },
// 清空 查询条件 // 清空 查询条件
clearAllSearch (search = true) { clearAllSearch (search = true) {
this.nonConformitySearch = { this.nonSearch = {
standId: '', standId: '',
productName: '', productName: '',
responsibleUnit: '' responsibleUnit: ''
} }
this.getTableByPage() this.getData()
}, },
// 分页事件 // 分页事件
pageChange (page) { pageChange (page) {