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 
# Conflicts:
#	src/sysConfig/index.js
This commit is contained in:
zhangyanduan
2022-08-25 19:04:48 +08:00
parent 92217f704a 579ba310b4
commit f297daaab5
6 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/pages/mechanism.vue
+13 -7
View File
@@ -172,6 +172,7 @@
<el-dropdown-item v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '0'" :command="[scope.row, '禁用']">
禁用
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'ce2d2b9bb8004e0d9efcabc42a9f354d'" :command="[scope.row, '配置岗位']">
配置岗位
</el-dropdown-item>
@@ -228,7 +229,7 @@
:expand-on-click-node="false"
show-checkbox>
</el-tree>
<pagination :page="page" :pageSize="pageSize" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
<pagination :page="page1" :pageSize="pageSize1" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button
size="mini"
@@ -277,6 +278,8 @@ export default {
total: 0,
total2: 0,
pageSize: this.$store.getters.userInfo.configContent,
page1:1,
pageSize1:20,
sideClose: false,
data: [], // table数据
treeLoading: false,
@@ -298,6 +301,7 @@ export default {
},
resetFormPost() {
this.modalPost = false
this.page1 = 1
},
PostSubmit() {
if (this.drawerTitle === '配置岗位') {
@@ -350,8 +354,8 @@ export default {
getTree2() {
this.$http.get('sarPosition/position', {
current: this.page,
pageSize: this.pageSize,
current: this.page1,
pageSize: this.pageSize1,
...this.sarPost,
}, {
_this: this,
@@ -368,6 +372,7 @@ export default {
})
this.nodeList = arr
this.modalPost = true
this.getTree2()
},
disableFlagEdit(row, type) {
let json = {}
@@ -457,6 +462,7 @@ export default {
current: this.page,
size: this.pageSize,
uname: this.searchForm.uname,
institutionId: this.id,
email: this.searchForm.email
}, {
_this: this,
@@ -518,12 +524,12 @@ export default {
this.getDatas()
}
},
pageChange2(page) {
this.page = page
pageChange2(page1) {
this.page1 = page1
this.getTree2()
},
pageSizeChange2(pageSize) {
this.pageSize = pageSize
pageSizeChange2(pageSize1) {
this.pageSize1 = pageSize1
this.getTree2()
},
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+4 -2
View File
@@ -83,11 +83,13 @@
prop="itermsConditions"
label="条款内容"
fixed="left"
show-overflow-tooltip
:resizable="false"
align="center">
<template slot-scope="scope">
<div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
<el-tooltip placement="top">
<div slot="content">{{scope.row.itermsConditions}}</div>
<div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" :resizable="false" fixed="right">
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+2 -2
View File
@@ -212,8 +212,8 @@
</el-form-item>
<el-form-item label="制修订类型" class="search-item search-item-last">
<el-select :disabled="disabledXX" v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+2 -2
View File
@@ -228,8 +228,8 @@
</el-form-item>
<el-form-item label="制修订类型" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+4 -4
View File
@@ -42,8 +42,8 @@
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select :disabled="disabledXX" disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -219,8 +219,8 @@
</el-form-item>
<el-form-item label="制修订类型" class="search-item search-item-last">
<el-select :disabled="disabledXX" v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+1 -1
View File
@@ -6,7 +6,7 @@
<el-form-item label="计划状态" class="search-item">
<el-select v-model="form.planStatus" placeholder="请选择计划状态">
<el-option label="请选择" value=""></el-option>
<el-option label="未开始" value="0"></el-option>
<!-- <el-option label="未开始" value="0"></el-option>-->
<el-option label="制定中" value="1"></el-option>
<el-option label="修订中" value="2"></el-option>
<el-option label="已取消" value="3"></el-option>