Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -37,10 +37,10 @@
|
||||
<div class="content">
|
||||
<div class="action-bar">
|
||||
<el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'" size="mini" @click="importItemInfo" ><i class="iconfont"></i>导入</el-button>
|
||||
<el-button v-btn-permission="'KPEQQ6YM53S98RKUC9GZ'" size="mini" @click="exportItemInfo"><i class="iconfont"></i>导出</el-button>
|
||||
<el-button v-btn-permission="'V4YJY54NVWSYHA2EF3PQ'" size="mini" @click="judgebatchDeleteItem"><i class="iconfont"></i>删除</el-button>
|
||||
<el-button v-btn-permission="''" size="mini" @click="exportItemInfo"><i class="iconfont"></i>导出</el-button>
|
||||
<el-button v-btn-permission="''" size="mini" @click="judgebatchDeleteItem"><i class="iconfont"></i>删除</el-button>
|
||||
<el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'" size="mini" @click="uploadImportModal"><i class="iconfont"></i>模板下载</el-button>
|
||||
<el-button v-btn-permission="'8WS6LEYJSYNQU9YCS7U2'" size="mini" @click="batchCopy">批量复制</el-button>
|
||||
<el-button v-btn-permission="''" size="mini" @click="batchCopy">批量复制</el-button>
|
||||
<el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'" size="mini" @click="combineItems">合并条款</el-button>
|
||||
<el-button v-btn-permission="'P5NLYUS4XTP9P676XDEW'" size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>
|
||||
<el-button v-if="auditFlag==='1'" size="mini" @click="splitCheckBtn">审核</el-button>
|
||||
@@ -64,6 +64,7 @@
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="150"
|
||||
fixed="left"
|
||||
:resizable="false"
|
||||
align="center">
|
||||
@@ -80,7 +81,6 @@
|
||||
<el-table-column
|
||||
prop="itermsConditions"
|
||||
label="条款内容"
|
||||
width="250"
|
||||
fixed="left"
|
||||
show-overflow-tooltip
|
||||
:resizable="false"
|
||||
@@ -89,40 +89,16 @@
|
||||
<div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="dutyEngineerShow"
|
||||
label="解读内容"
|
||||
width="150">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="foShow"
|
||||
label="实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="适用车型"
|
||||
width="150">
|
||||
<template slot-scope="scope">{{ getDicTypeName('applyArcticOptions', scope.row.applyArctic) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="responsibleUnitShow"
|
||||
label="责任部门"
|
||||
width="150">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="svppsShow"
|
||||
label="责任工程师"
|
||||
width="150">
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('m.operation')" align="center" width="50" :resizable="false" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<div @click.stop style="display: inline-block">
|
||||
<el-dropdown trigger="click" @command="handleCommand">
|
||||
<i class="iconfont"></i>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="'TMB2N38FC7NSKSLUBYLV'">属性</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="'EYLPEA9EG9XTTAJV2LJ2'">编辑</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="'8WS6LEYJSYNQU9YCS7U2'">复制</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'V4YJY54NVWSYHA2EF3PQ'">删除</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="''">编辑</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</div>
|
||||
@@ -216,7 +192,7 @@
|
||||
<el-form-item label="条款名称" prop="itemsName" class="add-form-item">
|
||||
<el-input v-model="standItemEO.itemsName" placeholder="请输入内容"></el-input>
|
||||
</el-form-item>
|
||||
<custom-org
|
||||
<!-- <custom-org
|
||||
key="责任部门"
|
||||
:config="{
|
||||
attrName: '责任部门',
|
||||
@@ -290,7 +266,7 @@
|
||||
:value="item.value"
|
||||
:label="item.label"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<el-divider content-position="left">内容简介</el-divider>
|
||||
<div style="border:1px dashed #999;margin-bottom:20px;padding:10px">
|
||||
<el-row type="flex" class="row-bg" justify="space-between">
|
||||
@@ -354,7 +330,7 @@
|
||||
<label class="see-drawer-name" title="内容简介">内容简介</label>
|
||||
<span class="see-drawer-val" :title="showItemInfoEO.itermsConditions ? showItemInfoEO.itermsConditions.replace(/<.*?>/ig, ' ') : ''">{{ showItemInfoEO.itermsConditions ? showItemInfoEO.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</span>
|
||||
</div>
|
||||
<div class="see-drawer-div">
|
||||
<!-- <div class="see-drawer-div">
|
||||
<label class="see-drawer-name" title="责任部门">责任部门</label>
|
||||
<span class="see-drawer-val" :title="showItemInfoEO.responsibleUnitShow">{{ showItemInfoEO.responsibleUnitShow }}</span>
|
||||
</div>
|
||||
@@ -381,7 +357,7 @@
|
||||
<div class="see-drawer-div">
|
||||
<label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>
|
||||
<span class="see-drawer-val" :title="getDicTypeName('BZFGGXOUIUJ', showItemInfoEO.busStandCover)">{{ getDicTypeName('BZFGGXOUIUJ', showItemInfoEO.busStandCover) }}</span>
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
</el-drawer>
|
||||
<!--编辑条款内容-->
|
||||
|
||||
Reference in New Issue
Block a user