Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
yanyizhou
@@ -425,7 +425,7 @@
|
||||
<div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">
|
||||
</div>
|
||||
<!-- <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
|
||||
<!--查看标准条款列表-->
|
||||
<!--查看分解单-->
|
||||
<el-drawer
|
||||
title="查看分解单"
|
||||
:wrapperClosable="false"
|
||||
@@ -559,11 +559,11 @@
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="xcxssrq"
|
||||
prop="xccssrq"
|
||||
label="新车型实施日期(文本)"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '' }}</span>
|
||||
<span>{{ scope.row.xccssrq ? $moment(scope.row.xccssrq).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -819,9 +819,9 @@
|
||||
<div class="see-drawer-div">
|
||||
<label class="see-drawer-name" title="解读内容">解读内容</label>
|
||||
<span class="see-drawer-val"
|
||||
:title="standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''">
|
||||
:title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
|
||||
{{
|
||||
standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''
|
||||
standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
|
||||
}}</span>
|
||||
</div>
|
||||
|
||||
@@ -1251,6 +1251,7 @@ export default {
|
||||
knowIdList: '',
|
||||
total7: 0,
|
||||
page7: 1,
|
||||
pageSize7: this.$store.getters.userInfo.configContent,
|
||||
addForm: {
|
||||
title: '',
|
||||
content: '',
|
||||
@@ -2331,12 +2332,14 @@ export default {
|
||||
selectSarStandItems(id, flag) {
|
||||
this.standItemSearch.standId = this.sarStandardsInfoEO.id
|
||||
this.standItemSearch.fileType = this.fileType
|
||||
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
|
||||
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
|
||||
...this.standItemSearch,
|
||||
pageSize: this.pageSize7, page: this.page7,
|
||||
}, {}, res => {
|
||||
this.selectedItemList = []
|
||||
if (res.ok) {
|
||||
this.standItemList = res.data;
|
||||
console.log(res.data);
|
||||
this.total7 = res.data.length // 分页需要
|
||||
this.standItemList = res.data.list;
|
||||
this.total7 = res.data.count // 分页需要
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
|
||||
@@ -354,7 +354,6 @@
|
||||
this.form.cid = data.cid
|
||||
this.form.endTime = data.endTime
|
||||
this.form.cname = data.cname
|
||||
console.log(data);
|
||||
this.oldData = JSON.parse(JSON.stringify(data.summaryList))
|
||||
data.summaryList.forEach( item => {
|
||||
if (item.state) {
|
||||
|
||||
@@ -366,6 +366,7 @@
|
||||
})
|
||||
this.json = data
|
||||
this.data = arr
|
||||
|
||||
this.oldData = data.oldinfo
|
||||
}).catch(e => {
|
||||
})
|
||||
|
||||
@@ -214,11 +214,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="footer">
|
||||
<pagination
|
||||
:page="pageNo"
|
||||
:total="total"
|
||||
@pageChange="pageChange"
|
||||
@pageSizeChange="pageSizeChange"></pagination>
|
||||
<pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
|
||||
<el-drawer
|
||||
title='查看'
|
||||
:visible.sync="historySee"
|
||||
|
||||
@@ -60,6 +60,24 @@
|
||||
align="center"
|
||||
label="修改意见内容(包括理由或依据)"
|
||||
>
|
||||
<el-table-column
|
||||
prop="oldText"
|
||||
align="center"
|
||||
label="修改前"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newText"
|
||||
align="center"
|
||||
label="修改后"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="reason"
|
||||
align="center"
|
||||
label="修改理由"
|
||||
>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="deptName"
|
||||
@@ -104,12 +122,18 @@
|
||||
>
|
||||
<div class="demo-drawer-content add-demo">
|
||||
<div class="search-area">
|
||||
<el-form :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
|
||||
<el-form-item label="章节编号" label-width="80px" prop="partCode" class="add-form-item">
|
||||
<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-input v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="修改意见内容(包括理由或依据)" prop="content" label-width="" class="add-form-item">
|
||||
<el-input :autosize="{ minRows: 2, maxRows: 8}" type="textarea" v-model="opinionContent.content" autocomplete="off" placeholder="请输入修改意见内容"></el-input>
|
||||
<el-form-item label="修改前" prop="oldText" label-width="" class="add-form-item">
|
||||
<el-input v-model="opinionContent.oldText" autocomplete="off" placeholder="请输入"></el-input>
|
||||
</el-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-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-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
@@ -139,14 +163,22 @@
|
||||
isSubmit: false,
|
||||
opinionContent: { // 抽屉数据
|
||||
partCode: '',
|
||||
content: '',
|
||||
oldText: '',
|
||||
newText: '',
|
||||
reason: ''
|
||||
},
|
||||
opinionContentRules: {
|
||||
partCode: [
|
||||
{ required: true, message: '请输入章节编号', trigger: 'blur' },
|
||||
],
|
||||
content: [
|
||||
{ required: true, message: '请输入修改意见内容(包括理由或依据)', trigger: 'blur' }
|
||||
oldText: [
|
||||
{ required: true, message: '请输入修改前内容', trigger: 'blur' }
|
||||
],
|
||||
newText: [
|
||||
{ required: true, message: '请输入修改后内容', trigger: 'blur' }
|
||||
],
|
||||
reason: [
|
||||
{ required: true, message: '请输入修改理由', trigger: 'blur' }
|
||||
],
|
||||
},
|
||||
standinfoList: [], // 详情列表
|
||||
@@ -231,12 +263,16 @@
|
||||
this.id = row.id
|
||||
this.opiniontitle = '编辑意见内容'
|
||||
this.opinionContent.partCode = row.partCode
|
||||
this.opinionContent.content = row.content
|
||||
this.opinionContent.reason = row.reason
|
||||
this.opinionContent.oldText = row.oldText
|
||||
this.opinionContent.newText = row.newText
|
||||
} else {
|
||||
this.id = ''
|
||||
this.opiniontitle = '新增意见'
|
||||
this.opinionContent.partCode = ''
|
||||
this.opinionContent.content = ''
|
||||
this.opinionContent.reason = ''
|
||||
this.opinionContent.oldText = ''
|
||||
this.opinionContent.newText = ''
|
||||
}
|
||||
this.isDialog = true
|
||||
},
|
||||
@@ -275,6 +311,9 @@
|
||||
var form = {
|
||||
cid: this.$route.query.item.cid,
|
||||
content: this.opinionContent.content,
|
||||
oldText: this.opinionContent.oldText,
|
||||
newText: this.opinionContent.newText,
|
||||
reason: this.opinionContent.reason,
|
||||
partCode: this.opinionContent.partCode,
|
||||
userId: this.$store.getters.userInfo.userId || '',
|
||||
userName: this.$store.getters.userInfo.userName || '',
|
||||
|
||||
Reference in New Issue
Block a user