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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-03-25 10:56:40 +08:00
parent 493abe361a da4974199e
commit 6dd29135df
5 changed files with 194 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
+178 -168
View File
@@ -1,168 +1,178 @@
<template> <template>
<div class="ZQYJAddFileDetails"> <div class="ZQYJAddFileDetails">
<div class="left"> <div class="left">
<iframe name = "iframeMap" id="iframeMapViewComponent" v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)" <iframe name = "iframeMap" id="iframeMapViewComponent" v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)"
width="100%" height="100%" width="100%" height="100%"
frameborder="0" scrolling="no" ref="iframeDom" frameborder="0" scrolling="no" ref="iframeDom"
></iframe> ></iframe>
</div> </div>
<div class="rightDiv"> <div class="rightDiv">
<div class="height"> <div class="height">
新增意见 新增意见
</div> </div>
<div class="search-area"> <div class="search-area">
<el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form"> <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
<el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item"> <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
<el-select filterable v-model="opinionContent.partCode" placeholder="请选择条款章节" @change="optionsChange"> <el-select filterable v-model="opinionContent.partCode" placeholder="请选择条款章节" @change="optionsChange">
<el-option <el-option
v-for="(item,index) in options" v-for="(item,index) in options"
:key="index" :key="index"
:label="item.itemsNum" :label="item.itemsNum"
:value="item.itemsNum"></el-option> :value="item.itemsNum"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item"> <el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item">
<el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input> <el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="修改前" label-width="" class="add-form-item"> <el-form-item label="修改前" label-width="" class="add-form-item">
<div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div> <div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
</el-form-item> </el-form-item>
<el-form-item label="修改后" prop="newText" label-width="" class="add-form-item"> <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
<el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input> <el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item"> <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
<el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input> <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">--> <!-- <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
<!-- <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>--> <!-- <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo"> <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
提交 提交
</el-button> </el-button>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "ZQYJAddFileDetails", name: "ZQYJAddFileDetails",
data () { data () {
return { return {
options: [], options: [],
opinionContent: { // 抽屉数据 opinionContent: { // 抽屉数据
partCode: '', partCode: '',
oldText: '', oldText: '',
newText: '', newText: '',
reason: '', reason: '',
chapterName: '', chapterName: '',
// cause: '', // cause: '',
}, },
opinionContentRules: { opinionContentRules: {
partCode: [ partCode: [
{required: true, message: '请输入章节编号', trigger: 'blur'}, {required: true, message: '请输入章节编号', trigger: 'blur'},
], ],
oldText: [ oldText: [
{required: true, message: '请输入修改前内容', trigger: 'blur'} {required: true, message: '请输入修改前内容', trigger: 'blur'}
], ],
newText: [ newText: [
{required: true, message: '请输入修改后内容', trigger: 'blur'} {required: true, message: '请输入修改后内容', trigger: 'blur'}
], ],
reason: [ reason: [
{required: true, message: '请输入修改理由', trigger: 'blur'} {required: true, message: '请输入修改理由', trigger: 'blur'}
], ],
}, },
isSubmit: false, isSubmit: false,
} }
}, },
methods: { methods: {
saveUserInfo () { saveUserInfo () {
this.$refs['formAdd'].validate((valid) => { this.$refs['formAdd'].validate((valid) => {
if (valid) { if (valid) {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
var form = { var form = {
id: id, id: id,
oldText: this.opinionContent.oldText, oldText: this.opinionContent.oldText,
newText: this.opinionContent.newText, newText: this.opinionContent.newText,
reason: this.opinionContent.reason, reason: this.opinionContent.reason,
chapterNumber: this.opinionContent.partCode, chapterNumber: this.opinionContent.partCode,
chapterName: this.opinionContent.chapterName, chapterName: this.opinionContent.chapterName,
} }
this.$store.commit('SET_REFRESH_FLAG', true) this.$store.commit('SET_REFRESH_FLAG', true)
localStorage.setItem('bzzqyjForm', JSON.stringify(form)) localStorage.setItem('bzzqyjForm', JSON.stringify(form))
localStorage.setItem('freshClueNum', new Date().getTime()) localStorage.setItem('freshClueNum', new Date().getTime())
this.opinionContent.partCode = '' this.opinionContent.partCode = ''
this.opinionContent.reason = '' this.opinionContent.reason = ''
this.opinionContent.oldText = '' this.opinionContent.oldText = ''
this.opinionContent.newText = '' this.opinionContent.newText = ''
this.opinionContent.chapterName = '' this.opinionContent.chapterName = ''
} }
}) })
}, },
optionsChange (data) { optionsChange (data) {
for (let a = 0; a < this.options.length; a++) { for (let a = 0; a < this.options.length; a++) {
if (data === this.options[a].itemsNum) { if (data === this.options[a].itemsNum) {
this.opinionContent.oldText = this.options[a].termsConditions this.opinionContent.oldText = this.options[a].termsConditions
this.opinionContent.chapterName = this.options[a].itemsName this.opinionContent.chapterName = this.options[a].itemsName
} }
} }
}, },
}, },
mounted() { mounted() {
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
standId: this.$route.query.standId, standId: this.$route.query.standId,
fileType: this.$route.query.fileType, fileType: this.$route.query.fileType,
pageSize: 9999, pageSize: 9999,
page: 1 page: 1
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
this.options = res.data.list let arr1 = res.data.list
} for (let i=0;i<arr1.length;i++) {
}, e => { for (let j = i + 1; j < arr1.length; j++) {
}) if (arr1[i].itemsNum === arr1[j].itemsNum) {
} arr1.splice(j,1)
} // delete arr1[i]
</script> j--
}
<style lang="less" scoped> }
@import '~@/assets/styles/mixins'; }
@import '~@/assets/styles/style'; this.options = arr1
.ZQYJAddFileDetails { }
height: 100%; }, e => {
display: flex; })
.left { }
width: 60%; }
height: 100%; </script>
}
.rightDiv { <style lang="less" scoped>
background: #fff; @import '~@/assets/styles/mixins';
width: 40%; @import '~@/assets/styles/style';
height: 100%; .ZQYJAddFileDetails {
.height { height: 100%;
margin-bottom: 0; display: flex;
padding: 10px 20px; .left {
font-size: 18px; width: 60%;
font-weight: bold; height: 100%;
color: #333333; }
border-bottom: 1px solid #e5e5e5; .rightDiv {
} background: #fff;
.search-area { width: 40%;
height: calc(~'100% - 90px'); height: 100%;
overflow: auto; .height {
} margin-bottom: 0;
.demo-drawer-footer { padding: 10px 20px;
width: 100%; font-size: 18px;
padding: 0 20px; font-weight: bold;
height: 50px; color: #333333;
line-height: 50px; border-bottom: 1px solid #e5e5e5;
border-top: 1px solid #e8e8e8; }
text-align: right; .search-area {
background: #fff; height: calc(~'100% - 90px');
z-index: 999; overflow: auto;
} }
} .demo-drawer-footer {
} width: 100%;
</style> padding: 0 20px;
height: 50px;
line-height: 50px;
border-top: 1px solid #e8e8e8;
text-align: right;
background: #fff;
z-index: 999;
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+7 -1
View File
@@ -549,9 +549,15 @@ export default {
this.$message.warning('请勿上传为空的文件') this.$message.warning('请勿上传为空的文件')
} }
}else{ }else{
this.$confirm(res.data, "提示", { const arr = res.data.split('；')
let newDatas = [],h = this.$createElement;
for (const i in arr) {
newDatas.push(h('p', null, arr[i]))
}
this.$confirm(h('div', null, newDatas), "提示", {
confirmButtonText: "确认", confirmButtonText: "确认",
confirmButtonClass: "common-button-primary", confirmButtonClass: "common-button-primary",
dangerouslyUseHTMLString: true,
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(() => { }).then(() => {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -3
View File
@@ -341,7 +341,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" <el-table-column fixed="right"
v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50') >0"
label="收藏" align="center" width="50px" label="收藏" align="center" width="50px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@@ -370,13 +370,11 @@
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<!-- <i class="iconfont">&#xe61e;</i>--> <!-- <i class="iconfont">&#xe61e;</i>-->
<el-button title="收藏" class="collection-btn" icon="el-icon-star-off" <el-button title="收藏" class="collection-btn" icon="el-icon-star-off"
v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
v-if="scope.row.collectBtn" v-if="scope.row.collectBtn"
@click="handleCommand([scope.row, '收藏'])" @click="handleCommand([scope.row, '收藏'])"
> >
</el-button> </el-button>
<el-button title="取消收藏" class="collection-btn" icon="el-icon-star-on" <el-button title="取消收藏" class="collection-btn" icon="el-icon-star-on"
v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
v-else v-else
@click="handleCommand([scope.row, '取消收藏'])" @click="handleCommand([scope.row, '取消收藏'])"
> >
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -333,7 +333,7 @@
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span> <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="收藏" align="center" width="50"> <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc')>0" label="收藏" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"--> <!-- <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"-->
<!-- @command="handleCommand"--> <!-- @command="handleCommand"-->
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+7 -1
View File
@@ -89,8 +89,11 @@
<el-table <el-table
:data="standinfoList" :data="standinfoList"
height="100%" height="100%"
tooltip-effect="dark"
header-cell-class-name="zTable_style"
border border
style="width: 100%" style="width: 100%; flex: auto;"
class="drag-table"
:default-sort = "{prop: 'partCode', order: 'ascending'}" :default-sort = "{prop: 'partCode', order: 'ascending'}"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
@@ -608,6 +611,9 @@
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.consultationDetails { .consultationDetails {
/deep/.zTable_style {
border-bottom: 1px solid #d1d1d1;
}
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;