FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_foton_20231213' into 'master'

Browse Source 
Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!144
This commit is contained in:
高嵩
2024-01-15 10:06:35 +00:00
parent 3a7782faa2 fa5e6a25b4
commit b68470f146
17 changed files with 6064 additions and 5546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/components/SetRoleForDepartment.vue
+5 -2
View File
@@ -21,7 +21,6 @@
:value="getRoleIds"
placeholder="请选择"
multiple
collapse-tags
size="medium"
@change="roleIdsChange"
>
@@ -144,11 +143,15 @@ export default {
/deep/.el-form-item{
margin: 0 !important;
}
/deep/.el-select--medium{
width: 100%;
margin: 5px 0;
}
/deep/.el-divider{
margin: 0 !important;
}
/deep/ .el-select .el-tag {
max-width: 110px !important;
//max-width: 110px !important;
}
}
.drawer-footer {
src/pages/config/pages/mechanismManage/pages/mechanism.vue
+1 -1
View File
@@ -146,7 +146,7 @@
label="角色"
>
<template slot-scope="scope">
{{ getRoleName(scope.row.roles) }}
{{ scope.row.roles }}
</template>
</el-table-column>
<!-- <el-table-column-->
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+2639 -2596
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+11 -4
View File
@@ -382,11 +382,11 @@
<!-- </el-form-item>-->
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.TXLBBUSS"
readonly
:value="form.TXLBBUSS"
placeholder="选择标准体系"
clearable
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS, $event)"
@clear="handleClearStandSystem"
/>
</el-form-item>
</el-col>
@@ -1024,10 +1024,17 @@ export default {
map.set('3', '不采纳');
return map.get(data)
},
choiceZRR1 (type, title, id) {
choiceZRR1 (type, title, id, e) {
if (e.target.className === 'el-input__icon el-icon-circle-close el-input__clear') {
return;
}
this.$emit('formChoiceZRR1', type, title, id)
},
handleClearStandSystem () {
this.$emit('handleClearStandSystem')
},
choiceZRR2 (type, title, id, flag) {
this.$emit('formChoiceZRR2', type, title, id, flag)
},
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+11 -4
View File
@@ -361,11 +361,11 @@
<!-- </el-form-item>-->
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.TXLBBUSS"
readonly
:value="form.TXLBBUSS"
placeholder="选择标准体系"
clearable
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS, $event)"
@clear="handleClearStandSystem"
/>
</el-form-item>
</el-col>
@@ -991,10 +991,17 @@ export default {
map.set('3', '不采纳');
return map.get(data)
},
choiceZRR1 (type, title, id) {
choiceZRR1 (type, title, id, e) {
if (e.target.className === 'el-input__icon el-icon-circle-close el-input__clear') {
return;
}
this.$emit('formChoiceZRR1', type, title, id)
},
handleClearStandSystem () {
this.$emit('handleClearStandSystem')
},
choiceZRR2 (type, title, id, flag) {
this.$emit('formChoiceZRR2', type, title, id, flag)
},
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+20 -203
View File
@@ -75,67 +75,9 @@
</div>
<div v-else style="padding-left: 10px; color: #666666;" />
</template>
<!-- <el-select v-model="form.reviseStatus" filterable clearable>-->
<!-- <el-option-->
<!-- v-for="item in opinionsStand"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item>
<!-- <el-form-item label="标准状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :disabled="disabledXX" :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择标准状态">-->
<!-- <el-option-->
<!-- v-for="item in standStateOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX" v-model="form.standYear"-->
<!-- placeholder="请输入标准年份"-->
<!-- clearable></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker :disabled="disabledXX" v-model="form.FSRQBUSS"-->
<!-- :editable="false"-->
<!-- disabled-->
<!-- placeholder="请选择废止日期"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- clearable></el-datePicker>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<!-- <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
<!-- <el-select :disabled="disabledXX" :popper-append-to-body="false" v-model="form.country" multiple placeholder="国家/地区">-->
<!-- <el-option-->
<!-- v-for="item in countryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX" -->
<!-- v-model="form.standNumber"-->
<!-- placeholder="请输入企标编号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">-->
<!-- <el-button :disabled="disabledXX"-->
<!-- type="primary"-->
<!-- :loading="loadSarStandard"-->
<!-- @click="handleSearchStandard">-->
<!-- 根据企标名称、起草责任单位查询-->
<!-- </el-button>-->
<!-- </el-form-item>-->
<el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
@@ -158,18 +100,6 @@
value-format="yyyy-MM-dd"
/>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker :disabled="disabledXX" v-model="form.issueTime"-->
<!-- :editable="false"-->
<!-- placeholder="请选择发布日期"></el-datePicker>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker :disabled="disabledXX" v-model="form.FZRQBUSS"-->
<!-- :editable="false"-->
<!-- placeholder="请选择废止日期"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- clearable></el-datePicker>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
@@ -189,10 +119,6 @@
/>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;margin-top: 13px">
<!-- <div v-for="(item,index) in FBGBUSSFileList"-->
<!-- :key="index" @click="handleFilePreview(item)"-->
<!-- style="color: #409eff;cursor:pointer" -->
<!-- class="fileClass">{{ item.name }}</div>-->
<div
v-for="(item,index) in FBGBUSSFileList"
:key="index"
@@ -217,8 +143,6 @@
</div>
</div>
<div style="width: 20%;">
<!-- :disabled="disabledXX"-->
<!-- disabled-->
<el-button
type="primary"
class="common-button-primary"
@@ -418,11 +342,12 @@
<!-- </el-form-item>-->
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.TXLBBUSS"
:value="form.TXLBBUSS"
:disabled="disabledXX"
placeholder="选择标准体系"
clearable
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS, $event)"
@clear="handleClearStandSystem"
/>
</el-form-item>
</el-col>
@@ -669,85 +594,6 @@
<!-- </el-collapse-item>-->
<!--</el-collapse>-->
</div>
<!-- <div class="block" id="active2" v-show="active === '2'">-->
<!-- <ProcessTitle>-->
<!-- <template slot="title">模块信息</template>-->
<!-- </ProcessTitle>-->
<!-- <template>-->
<!-- <div class="prc-content-border" style="height: 66vh;position: relative;">-->
<!-- <div class="action-bar">-->
<!-- <el-button :disabled="disabledXX" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
<!-- 批量编辑-->
<!-- </el-button>-->
<!-- <el-button :disabled="disabledXX" -->
<!-- type="primary"-->
<!-- size="mini"-->
<!-- class="common-button-primary add-button"-->
<!-- @click="createRow"-->
<!-- >创建模块</el-button>-->
<!-- </div>-->
<!-- <el-table-->
<!-- ref="selection"-->
<!-- tooltip-effect="dark"-->
<!-- style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
<!-- :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
<!-- fontWeight: 'bold', height: '48px'}"-->
<!-- @selection-change="handleSelectionChange"-->
<!-- row-key="id"-->
<!-- :data="form.modelData"-->
<!-- border-->
<!-- default-expand-all-->
<!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
<!-- <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
<!-- <el-table-column-->
<!-- prop="modelNum"-->
<!-- label="序号"-->
<!-- min-width="15%"-->
<!-- align="center"-->
<!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="名称"-->
<!-- align="center"-->
<!-- min-width="30%">-->
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input :disabled="disabledXX" v-model="scope.row.modelName" :disabled="scope.row.disabled" placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="责任人"-->
<!-- min-width="15%"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input :disabled="disabledXX" v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" min-width="5%">-->
<!-- <template slot-scope="scope">-->
<!-- <div @click.stop style="display: inline-block">-->
<!-- <el-dropdown trigger="click" @command="handleCommand">-->
<!-- <i class="iconfont">&#xe61e;</i>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!--&lt;!&ndash; <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
<!-- </template>-->
<!-- </div>-->
<div v-show="active === '3'" class="block" style="padding-top: 20px;">
<el-timeline>
<el-form
@@ -1230,38 +1076,6 @@
:nodeList="nodeList"
@checkedRole="checkedRole"
/>
<!-- <el-drawer v-if="!disabledXX" -->
<!-- :title="drawerTitle"-->
<!-- :visible.sync="modalShowFlag"-->
<!-- :wrapperClosable="false"-->
<!-- size="800px">-->
<!-- <el-input :disabled="disabledXX" -->
<!-- style="width:70%;padding: 10px"-->
<!-- placeholder="请输入姓名"-->
<!-- v-model="filterText">-->
<!-- </el-input>-->
<!-- <el-tree-->
<!-- :filter-node-method="filterNode"-->
<!-- v-if="modalShowFlag"-->
<!-- node-key="id"-->
<!-- style="height: 100%; overflow: auto;"-->
<!-- class="filter-tree"-->
<!-- :data="treeData"-->
<!-- :props="defaultUserProps"-->
<!-- :default-checked-keys="nodeList"-->
<!-- highlight-current-->
<!-- check-strictly-->
<!-- @check="drawerCheck"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- show-checkbox-->
<!-- ref="tree">-->
<!-- </el-tree>-->
<!-- <div id="roleFormButton" class="demo-drawer-footer">-->
<!-- <el-button :disabled="disabledXX" class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
<!-- <el-button :disabled="disabledXX" class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>-->
<!-- </div>-->
<!-- </el-drawer>-->
<!-- 选择标准的弹框 -->
<el-drawer
v-if="!disabledXX"
@@ -2985,7 +2799,10 @@ export default {
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
choiceZRR1 (type, title, id) {
choiceZRR1 (type, title, id, e) {
if (e.target.className === 'el-input__icon el-icon-circle-close el-input__clear') {
return;
}
this.drawerTitle = title
this.modalShowFlag1 = true
this.key++
@@ -3511,21 +3328,21 @@ export default {
// })
// }
},
handleClearStandSystem () {
this.$set(this.form, 'TXLBBUSS', '')
this.$set(this.form, 'menuId', '')
this.$set(this.form, 'treeType', '')
this.$forceUpdate()
},
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) {
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
this.form.menuId = checkedData.map(item => item.menuId).join(',')
this.form.treeType = checkedData.map(item => item.treeType).join(',')
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
if(checkedData) {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+13 -5
View File
@@ -427,11 +427,11 @@
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.TXLBBUSS"
readonly
:disabled="disabledXX"
placeholder="选择标准体系"
clearable
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS, $event)"
@clear="handleClearStandSystem"
/>
</el-form-item>
</el-col>
@@ -3150,11 +3150,19 @@ export default {
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
choiceZRR1 (type, title, id) {
choiceZRR1 (type, title, id, e) {
if (e.target.className === 'el-input__icon el-icon-circle-close el-input__clear') {
return;
}
this.drawerTitle = title
this.modalShowFlag1 = true
this.key++
},
handleClearStandSystem () {
this.form.TXLBBUSS = ''
this.form.menuId = ''
this.form.treeType = ''
},
choiceZRR2 (type, title, id, flag) {
this.drawerTitle = title
this.modalShowFlag2 = true
@@ -3614,7 +3622,7 @@ export default {
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) {
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
this.form.TXLBBUSS = checkedData.map(item => item.menuNames).join(',')
this.form.menuId = checkedData.map(item => item.menuId).join(',')
this.form.treeType = checkedData.map(item => item.treeType).join(',')
} else {
@@ -3622,7 +3630,7 @@ export default {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+15 -15
View File
@@ -44,6 +44,7 @@
@formChoiceZRR3="formChoiceZRR3"
@formChoiceZRR4="formChoiceZRR4"
@formChoiceZRR5="formChoiceZRR5"
@handleClearStandSystem="handleClearStandSystem"
/>
<ReceiptDescription
ref="formTongGuo"
@@ -2280,21 +2281,20 @@ export default {
// 刷新组件
this.formKey++
},
handleClearStandSystem () {
this.form.TXLBBUSS = ''
this.form.menuId = ''
this.form.treeType = ''
},
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if(checkedData) {
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
this.form.menuId = checkedData.map(item => item.menuId).join(',')
this.form.treeType = checkedData.map(item => item.treeType).join(',')
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
@@ -2790,9 +2790,9 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
/deep/ .el-input__suffix{
display: none !important;
}
///deep/ .el-input__suffix{
// display: none !important;
//}
/deep/ #active2 .el-form-item__content{
margin-left: 0px !important;
}
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+16 -15
View File
@@ -49,6 +49,7 @@
@standSortChange="standSortChange"
@reveseStatusChange="reveseStatusChange"
@standNumChange="standNumChange"
@handleClearStandSystem="handleClearStandSystem"
/>
<ReceiptDescription
ref="formTongGuo"
@@ -2402,21 +2403,21 @@ export default {
}
this.formKey++
},
handleClearStandSystem () {
this.form.TXLBBUSS = ''
this.form.menuId = ''
this.form.treeType = ''
this.formKey++
},
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if(checkedData) {
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
this.form.menuId = checkedData.map(item => item.menuId).join(',')
this.form.treeType = checkedData.map(item => item.treeType).join(',')
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
@@ -3160,9 +3161,9 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
/deep/ .el-input__suffix{
display: none !important;
}
///deep/ .el-input__suffix{
// display: none !important;
//}
/deep/ .cbcd .el-input__suffix{
display: inline-block !important;
}
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+15 -15
View File
@@ -42,6 +42,7 @@
@formChoiceZRR3="formChoiceZRR3"
@formChoiceZRR4="formChoiceZRR4"
@formChoiceZRR5="formChoiceZRR5"
@handleClearStandSystem="handleClearStandSystem"
/>
<ProcessTitle>
<template slot="title">文件汇总</template>
@@ -2293,21 +2294,20 @@ export default {
}
this.formKey++
},
handleClearStandSystem () {
this.form.TXLBBUSS = ''
this.form.menuId = ''
this.form.treeType = ''
},
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if(checkedData) {
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
this.form.menuId = checkedData.map(item => item.menuId).join(',')
this.form.treeType = checkedData.map(item => item.treeType).join(',')
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
@@ -2772,9 +2772,9 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
/deep/ .el-input__suffix{
display: none !important;
}
///deep/ .el-input__suffix{
// display: none !important;
//}
/deep/ #active2 .el-form-item__content{
margin-left: 0px !important;
}
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+15 -15
View File
@@ -172,6 +172,7 @@
@formChoiceZRR3="formChoiceZRR3"
@formChoiceZRR4="formChoiceZRR4"
@formChoiceZRR5="formChoiceZRR5"
@handleClearStandSystem="handleClearStandSystem"
/>
<ProcessTitle>
<template slot="title">意见信息</template>
@@ -2653,21 +2654,20 @@ export default {
}
this.formKey++
},
handleClearStandSystem () {
this.form.TXLBBUSS = ''
this.form.menuId = ''
this.form.treeType = ''
},
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if(checkedData) {
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
this.form.menuId = checkedData.map(item => item.menuId).join(',')
this.form.treeType = checkedData.map(item => item.treeType).join(',')
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
@@ -3155,9 +3155,9 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
/deep/ .el-input__suffix{
display: none !important;
}
///deep/ .el-input__suffix{
// display: none !important;
//}
/deep/ #active1 .el-form-item__content{
margin-left: 0px !important;
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+16 -7
View File
@@ -171,6 +171,7 @@
@formChoiceZRR3="formChoiceZRR3"
@formChoiceZRR4="formChoiceZRR4"
@formChoiceZRR5="formChoiceZRR5"
@handleClearStandSystem="handleClearStandSystem"
/>
<ReceiptDescription
ref="formTongGuo"
@@ -2492,16 +2493,24 @@ export default {
}
this.formKey++
},
handleClearStandSystem () {
this.form.TXLBBUSS = ''
this.form.menuId = ''
this.form.treeType = ''
},
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if(checkedData) {
if(checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
}else {
this.form.TXLBBUSS = checkedData.menuName
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
this.formKey++
},
popoverHideCancel () {
this.modalShowFlag1 = false
@@ -3001,9 +3010,9 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
/deep/ .el-input__suffix{
display: none !important;
}
///deep/ .el-input__suffix{
// display: none !important;
//}
/deep/ #active1 .el-form-item__content{
margin-left: 0px !important;
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+15 -15
View File
@@ -42,6 +42,7 @@
@formChoiceZRR3="formChoiceZRR3"
@formChoiceZRR4="formChoiceZRR4"
@formChoiceZRR5="formChoiceZRR5"
@handleClearStandSystem="handleClearStandSystem"
/>
<ProcessTitle>
<template slot="title">文件汇总</template>
@@ -2266,21 +2267,20 @@ export default {
}
this.formKey++
},
handleClearStandSystem () {
this.form.TXLBBUSS = ''
this.form.menuId = ''
this.form.treeType = ''
},
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if(checkedData) {
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
this.form.menuId = checkedData.map(item => item.menuId).join(',')
this.form.treeType = checkedData.map(item => item.treeType).join(',')
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
@@ -2746,9 +2746,9 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
/deep/ .el-input__suffix{
display: none !important;
}
///deep/ .el-input__suffix{
// display: none !important;
//}
/deep/ #active2 .el-form-item__content{
margin-left: 0px !important;
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+15 -15
View File
@@ -172,6 +172,7 @@
@formChoiceZRR3="formChoiceZRR3"
@formChoiceZRR4="formChoiceZRR4"
@formChoiceZRR5="formChoiceZRR5"
@handleClearStandSystem="handleClearStandSystem"
/>
<ProcessTitle>
<template slot="title">意见信息</template>
@@ -2642,21 +2643,20 @@ export default {
}
this.formKey++
},
handleClearStandSystem () {
this.form.TXLBBUSS = ''
this.form.menuId = ''
this.form.treeType = ''
},
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if(checkedData) {
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
this.form.menuId = checkedData.map(item => item.menuId).join(',')
this.form.treeType = checkedData.map(item => item.treeType).join(',')
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
@@ -3180,9 +3180,9 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
/deep/ .el-input__suffix{
display: none !important;
}
///deep/ .el-input__suffix{
// display: none !important;
//}
/deep/ #active1 .el-form-item__content{
margin-left: 0px !important;
}
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1750 -1377
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+21 -5
View File
@@ -796,7 +796,13 @@
class="add-form-item"
>
<template slot="label">标准体系</template>
<el-input v-model="sarBussionessStandEO.TXLBBUSS" placeholder="选择标准体系" @click.native="choiceZRR1('TXLBBUSS', '标准体系', sarBussionessStandEO.TXLBBUSS)" />
<el-input
:value="sarBussionessStandEO.TXLBBUSS"
placeholder="选择标准体系"
clearable
@click.native="choiceZRR1('TXLBBUSS', '标准体系', sarBussionessStandEO.TXLBBUSS, $event)"
@clear="handleClearStandSystem"
/>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSBMBUSS'">
@@ -3288,7 +3294,6 @@ export default {
this.sarBussionessStandEO.menuId = checkedData.map(item => item.menuId).join(',')
this.sarBussionessStandEO.txlbId = checkedData.map(item => item.menuId).join(',')
this.sarBussionessStandEO.treeType = checkedData.map(item => item.treeType).join(',')
this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuNames).join(',')
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
@@ -3298,12 +3303,17 @@ export default {
this.sarBussionessStandEO.menuId = checkedData.id
this.sarBussionessStandEO.txlbId = checkedData.id
this.sarBussionessStandEO.treeType = checkedData.treeType
this.sarBussionessSearch.TXLBBUSS = checkedData.menuNames
}
}
this.modalShowFlag1 = false
this.$forceUpdate()
},
handleClearStandSystem () {
this.sarBussionessStandEO.TXLBBUSS = ''
this.sarBussionessStandEO.menuId = ''
this.sarBussionessStandEO.txlbId = ''
this.sarBussionessStandEO.treeType = ''
},
choiceZRR2 (type, title, id, multFlag) {
this.drawerTitle2 = title
this.modalShowFlag2 = true
@@ -3340,7 +3350,10 @@ export default {
this.url = 'sarModelTree/listByType'
this.urlChild = 'sarModelTree/childByList'
},
choiceZRR1 (type, title, id) {
choiceZRR1 (type, title, id, e) {
if (e.target.className === 'el-input__icon el-icon-circle-close el-input__clear') {
return;
}
this.drawerTitle1 = title
this.modalShowFlag1 = true
},
@@ -4567,7 +4580,10 @@ export default {
// this.pageChange(1)
this.resetForm()
this.getBussionStandTableBtn(this.sarBussionessSearch)
// this.getBussionStandTableBtn(this.sarBussionessSearch)
this.tableFlag = this.sarBussionessSearch
this.getBussionStandTable(this.sarBussionessSearch)
this.isAdvancedSearch = false
}
}, e => {
})
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1486 -1252
View File
File diff suppressed because it is too large Load Diff