Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -104,7 +104,7 @@
|
||||
label-width="150px"
|
||||
>
|
||||
<input v-model="attributeEO.id" v-show="false">
|
||||
<el-form-item label="所属模块" prop="sarType" class="add-form-item">
|
||||
<el-form-item label="所属模块" class="add-form-item">
|
||||
<el-select
|
||||
v-model="attributeEO.sarType"
|
||||
placeholder="请选择"
|
||||
@@ -118,13 +118,13 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="属性字段" prop="attrField" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
|
||||
<el-form-item label="属性字段" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
|
||||
<el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="属性名称" prop="attrName" class="add-form-item">
|
||||
<el-form-item label="属性名称" class="add-form-item">
|
||||
<el-input v-model.trim="attributeEO.attrName" placeholder="请输入属性名称" clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="属性类型" prop="attrType" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
|
||||
<el-form-item label="属性类型" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
|
||||
<el-select v-model="attributeEO.attrType" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
|
||||
<el-option
|
||||
v-for="item in attrTypeOptions"
|
||||
@@ -134,7 +134,7 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
|
||||
<el-form-item label="选项值" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
|
||||
<el-select v-model="attributeEO.selVal" placeholder="请选择" filterable>
|
||||
<el-option
|
||||
v-for="item in relateDicIdOptions"
|
||||
@@ -149,18 +149,18 @@
|
||||
<!-- <Option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>-->
|
||||
<!-- </Select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="字段长度" prop="attrLen" class="add-form-item">
|
||||
<el-form-item label="字段长度" class="add-form-item">
|
||||
<el-input v-model.number="attributeEO.attrLen" :disabled="addOrEdit === 'edit'" placeholder="只允许输入正整数" number :maxlength="4"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="展示顺序" prop="orderNum" class="add-form-item">
|
||||
<el-form-item label="展示顺序" class="add-form-item">
|
||||
<el-input v-model.number="attributeEO.orderNum" placeholder="只允许输入正整数" number :maxlength="3"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否必填" prop="isMust" class="add-form-item">
|
||||
<el-form-item label="是否必填" class="add-form-item">
|
||||
<el-select v-model="attributeEO.isMust">
|
||||
<el-option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value" :label="opt.label">{{ opt.label }}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否展示" prop="isShowImp" class="add-form-item">
|
||||
<el-form-item label="是否展示" class="add-form-item">
|
||||
<el-select v-model="attributeEO.isShowImp">
|
||||
<el-option
|
||||
v-for="opt in isMustOptions"
|
||||
@@ -170,7 +170,7 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="展示区域" prop="showRegionId" class="add-form-item" v-if="attributeEO.isShowImp === '0'">
|
||||
<el-form-item label="展示区域" class="add-form-item" v-if="attributeEO.isShowImp === '0'">
|
||||
<el-select v-model="attributeEO.showRegionId">
|
||||
<el-option
|
||||
v-for="opt in showRegionOptions"
|
||||
@@ -261,7 +261,7 @@
|
||||
<el-form-item label="所属模块" prop="sarType" class="add-form-item">
|
||||
<el-select v-model="displayLocationDialogFormData.sarType" filterable>
|
||||
<el-option
|
||||
v-for="item in sarTypeLocationOptions"
|
||||
v-for="item in sarTypeOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
|
||||
@@ -467,6 +467,7 @@
|
||||
<el-date-picker
|
||||
v-model="standItemSearch.XCXSSRQ"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="新车实施日期">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
@@ -477,6 +478,7 @@
|
||||
<el-date-picker
|
||||
v-model="standItemSearch.ZCCSSRQ"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="在产车实施日期">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
@@ -2396,6 +2398,9 @@ export default {
|
||||
this.standItemSearch.parts = ''
|
||||
this.standItemSearch.nameOrRequest = ''
|
||||
this.standItemSearch.fileType = ''
|
||||
this.standItemSearch.itemsName=''
|
||||
this.standItemSearch.ZCCSSRQ=''
|
||||
this.standItemSearch.XCXSSRQ=''
|
||||
this.selectSarStandItems()
|
||||
},
|
||||
inputChange() {
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
<i class="iconfont"></i>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-if="splitStatus === '0'" v-btn-permission="''">编辑</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-if="splitStatus === '0' || splitStatus === '4'" v-btn-permission="''">编辑</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-else :disabled="true" 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>
|
||||
|
||||
@@ -47,14 +47,14 @@
|
||||
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="standCode" label="编号" align="center">
|
||||
<el-table-column prop="standCode" label="标准编号" align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="standName" label="标准名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
|
||||
@@ -112,14 +112,14 @@
|
||||
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="standCode" label="编号" align="center">
|
||||
<el-table-column prop="standCode" label="标准编号" align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="standName" label="标准名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
|
||||
@@ -170,12 +170,12 @@
|
||||
>
|
||||
<el-table-column prop="standCode" label="标准编号" align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="standName" label="标准名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="itemsId" label="条款号" align="center">
|
||||
@@ -236,12 +236,12 @@
|
||||
>
|
||||
<el-table-column prop="standCode" label="标准编号" align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="standName" label="标准名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="itemsId" label="条款号" align="center">
|
||||
@@ -492,6 +492,17 @@ export default {
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
//点击查看详情
|
||||
handlePreview(item) {
|
||||
let routeUrl = this.$router.resolve({
|
||||
name: 'OtherStandardDetails',
|
||||
params: {
|
||||
id: item.standId,
|
||||
pageType: item.standType + '_STAND'
|
||||
}
|
||||
})
|
||||
window.open(routeUrl.href, '_blank')
|
||||
},
|
||||
//获取政策预警数据(type用于区别分页器切换)
|
||||
getPolicyDate() {
|
||||
this.loading[this.field] = true
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -328,11 +328,13 @@
|
||||
handleSave() {
|
||||
this.saveLoading = true;
|
||||
let _formData = new FormData();
|
||||
let json = this.form
|
||||
json.data = this.data
|
||||
_formData.append("id", this.bpnId || "");
|
||||
_formData.append("prcType", "3");
|
||||
_formData.append("taskIds", this.taskIds);
|
||||
_formData.append("json", JSON.stringify({
|
||||
form: this.json,
|
||||
form: json,
|
||||
commentText: this.commentText
|
||||
}));
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
@@ -400,7 +402,7 @@
|
||||
this.form.endTime = data.endTime || data.form.endTime
|
||||
this.form.cname = data.cname || data.form.cname
|
||||
this.json = data
|
||||
this.data = data.info || data.data || []
|
||||
this.data = data.info || data.data || data.form.data|| []
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,450 +1,505 @@
|
||||
<template>
|
||||
<div class="bzdyStep5">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">汇总填写处理意见</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cid"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cname"
|
||||
placeholder="请输入标准名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
<ProcessTitle>
|
||||
<template slot="title">征求意见列表</template>
|
||||
</ProcessTitle>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="data"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
style="width: 100%; flex: auto;"
|
||||
class="drag-table"
|
||||
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}">
|
||||
<el-table-column
|
||||
type="index"
|
||||
label="序号"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterNumber"
|
||||
label="章条编号"
|
||||
width="170px">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterName"
|
||||
label="章节名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="commentText"
|
||||
align="center"
|
||||
label="修改意见内容（包括理由或依据）">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改前">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.oldText }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改后">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.newText }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改理由">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.reason }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="department"
|
||||
label="提出部门">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="responUserName"
|
||||
label="提出人">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="state"
|
||||
label="处理意见">
|
||||
<template slot-scope="scope">
|
||||
<div style="margin: 5px 0;">
|
||||
<el-select
|
||||
:disabled="scope.row.type"
|
||||
v-model="scope.row.state"
|
||||
collapse-tags
|
||||
style="margin-left: 20px;"
|
||||
placeholder="请选择处理意见">
|
||||
<el-option key="1" label="上报" value="1"></el-option>
|
||||
<el-option key="2" label="处理后上报" value="2"></el-option>
|
||||
<el-option key="3" label="不上报" value="3"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="审批意见"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
</ProcessFooter>
|
||||
<div class="bzdyStep5">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">汇总填写处理意见</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cid"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cname"
|
||||
placeholder="请输入标准名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
<ProcessTitle>
|
||||
<template slot="title">征求意见列表</template>
|
||||
</ProcessTitle>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="data"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
style="width: 100%; flex: auto;"
|
||||
class="drag-table"
|
||||
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}">
|
||||
<el-table-column
|
||||
type="index"
|
||||
label="序号"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterNumber"
|
||||
label="章条编号"
|
||||
width="170px">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterName"
|
||||
label="章节名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="commentText"
|
||||
align="center"
|
||||
label="修改意见内容（包括理由或依据）">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改前">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.oldText }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改后">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.newText }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改理由">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.reason }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="department"
|
||||
label="提出部门">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="responUserName"
|
||||
label="提出人">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="state"
|
||||
label="处理意见">
|
||||
<template slot-scope="scope">
|
||||
<div style="margin: 5px 0;">
|
||||
<el-select
|
||||
:disabled="scope.row.type"
|
||||
v-model="scope.row.state"
|
||||
collapse-tags
|
||||
style="margin-left: 20px;"
|
||||
placeholder="请选择处理意见">
|
||||
<el-option key="1" label="上报" value="1"></el-option>
|
||||
<el-option key="2" label="处理后上报" value="2"></el-option>
|
||||
<el-option key="3" label="不上报" value="3"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="审批意见"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
show-save
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process";
|
||||
|
||||
export default {
|
||||
name: "bzzqyjStep5",
|
||||
data() {
|
||||
return {
|
||||
histortData: [],
|
||||
oldData: [],
|
||||
data: [],
|
||||
commentText: '',
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
roleRow: {},
|
||||
nodeList: [],
|
||||
type: '',
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'name'
|
||||
},
|
||||
treeData: [], // 人员数据
|
||||
modalshowflag: false, // drawer开关
|
||||
drawerTitle: '', //drawer标题
|
||||
textarea: '', // 意见
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
active: '1', // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
cid: '', // 编号
|
||||
endTime: '', // 结束日期
|
||||
cname: '', // 名称
|
||||
},
|
||||
formRules: {
|
||||
responUserList: [
|
||||
{ required: true, message: '请选择责任人', trigger: 'change' },
|
||||
]
|
||||
},
|
||||
json: {}
|
||||
}
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
getHistoryData () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
}, {}, res => {
|
||||
this.histortData = res
|
||||
}, e => {})
|
||||
},
|
||||
changeInput (index) {
|
||||
this.data[index].type = true
|
||||
},
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
handleSave() {},
|
||||
handleSubmit() {
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning('请输入征求意见搞')
|
||||
} else {
|
||||
var a = 0
|
||||
var b = 0
|
||||
// var c = 0
|
||||
for (let s1 = 0; s1 < this.data.length; s1++) {
|
||||
if (!this.data[s1].chapterNumber) {
|
||||
a++
|
||||
}
|
||||
if (!this.data[s1].chapterName) {
|
||||
b++
|
||||
}
|
||||
// if (!this.data[s1].commentText) {
|
||||
// c++
|
||||
// }
|
||||
}
|
||||
if (a > 0) {
|
||||
this.$message.warning('请输入章节编号')
|
||||
} else if (b > 0) {
|
||||
this.$message.warning('请输入章节名称')
|
||||
}
|
||||
// else if (c > 0) {
|
||||
// this.$message.warning('请输入意见内容')
|
||||
// }
|
||||
else {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.oldinfo = this.oldData
|
||||
json.commentText = this.commentText
|
||||
json.introduce = true
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.cid = data.cid || data.form.cid
|
||||
this.form.endTime = data.endTime || data.form.endTime
|
||||
this.form.cname = data.cname || data.form.cname
|
||||
this.oldData = JSON.parse(JSON.stringify(data.summaryList))
|
||||
data.summaryList.forEach( item => {
|
||||
if (item.state) {
|
||||
} else {
|
||||
item.state = '1'
|
||||
}
|
||||
item.type = false
|
||||
})
|
||||
this.json = data
|
||||
this.data = data.summaryList
|
||||
if (data.introduce) {
|
||||
} else {
|
||||
this.$http.get('slrs/sar-public-idea-all/getPublicIdea', {
|
||||
unique: data.uniques
|
||||
}, {}, res => {
|
||||
res.data.forEach(item => {
|
||||
item.chapterNumber = item.partCode
|
||||
item.responUserName= item.userName
|
||||
this.data.push(item)
|
||||
})
|
||||
})
|
||||
}
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getHistoryData()
|
||||
this.getData()
|
||||
export default {
|
||||
name: "bzzqyjStep5",
|
||||
data() {
|
||||
return {
|
||||
histortData: [],
|
||||
oldData: [],
|
||||
data: [],
|
||||
commentText: "",
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
roleRow: {},
|
||||
nodeList: [],
|
||||
type: "",
|
||||
defaultProps: {
|
||||
children: "children",
|
||||
label: "name"
|
||||
},
|
||||
treeData: [], // 人员数据
|
||||
modalshowflag: false, // drawer开关
|
||||
drawerTitle: "", //drawer标题
|
||||
textarea: "", // 意见
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
active: "1", // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
cid: "", // 编号
|
||||
endTime: "", // 结束日期
|
||||
cname: "" // 名称
|
||||
},
|
||||
formRules: {
|
||||
responUserList: [
|
||||
{ required: true, message: "请选择责任人", trigger: "change" }
|
||||
]
|
||||
},
|
||||
json: {}
|
||||
};
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
getHistoryData() {
|
||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||
prcNum: this.$route.query.prcNum
|
||||
}, {}, res => {
|
||||
this.histortData = res;
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
changeInput(index) {
|
||||
this.data[index].type = true;
|
||||
},
|
||||
handleTabs(name) {
|
||||
this.active = name;
|
||||
},
|
||||
//保存事件
|
||||
handleSave() {
|
||||
this.saveLoading = true;
|
||||
let _formData = new FormData();
|
||||
let json = this.form;
|
||||
json.data = this.data;
|
||||
console.log(json);
|
||||
_formData.append("id", this.bpnId || "");
|
||||
_formData.append("prcType", "3");
|
||||
_formData.append("taskIds", this.taskIds);
|
||||
_formData.append("json", JSON.stringify({
|
||||
form: json,
|
||||
commentText: this.commentText
|
||||
}));
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false;
|
||||
this.$message.success("保存成功");
|
||||
this.bpnId = res.result;
|
||||
}).catch(e => {
|
||||
this.saveLoading = false;
|
||||
});
|
||||
},
|
||||
handleSubmit() {
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning("请输入征求意见搞");
|
||||
} else {
|
||||
var a = 0;
|
||||
var b = 0;
|
||||
// var c = 0
|
||||
for (let s1 = 0; s1 < this.data.length; s1++) {
|
||||
if (!this.data[s1].chapterNumber) {
|
||||
a++;
|
||||
}
|
||||
if (!this.data[s1].chapterName) {
|
||||
b++;
|
||||
}
|
||||
// if (!this.data[s1].commentText) {
|
||||
// c++
|
||||
// }
|
||||
}
|
||||
if (a > 0) {
|
||||
this.$message.warning("请输入章节编号");
|
||||
} else if (b > 0) {
|
||||
this.$message.warning("请输入章节名称");
|
||||
}
|
||||
// else if (c > 0) {
|
||||
// this.$message.warning('请输入意见内容')
|
||||
// }
|
||||
else {
|
||||
this.isSubmit = true;
|
||||
var json = this.json;
|
||||
json.oldinfo = this.oldData;
|
||||
json.commentText = this.commentText;
|
||||
json.introduce = true;
|
||||
console.log(json);
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success("提交成功");
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg);
|
||||
console.log(data);
|
||||
this.form.cid = data.cid || data.form.cid;
|
||||
this.form.endTime = data.endTime || data.form.endTime;
|
||||
this.form.cname = data.cname || data.form.cname;
|
||||
if (data.summaryList === undefined && data.info === undefined) {
|
||||
this.oldData = JSON.parse(JSON.stringify(data.form));
|
||||
this.data = data.form.data;
|
||||
}
|
||||
if (data.summaryList.length !== 0) {
|
||||
this.oldData = JSON.parse(JSON.stringify(data.summaryList));
|
||||
}
|
||||
if (data.info.length !== 0) {
|
||||
this.oldData = JSON.parse(JSON.stringify(data.info));
|
||||
}
|
||||
data.summaryList.forEach(item => {
|
||||
if (item.state) {
|
||||
} else {
|
||||
item.state = "1";
|
||||
}
|
||||
item.type = false;
|
||||
});
|
||||
data.info.forEach(item => {
|
||||
if (item.state) {
|
||||
} else {
|
||||
item.state = "1";
|
||||
}
|
||||
item.type = false;
|
||||
});
|
||||
this.json = data;
|
||||
if (data.summaryList.length === 0) {
|
||||
this.data = data.info;
|
||||
} else {
|
||||
this.data = data.summaryList;
|
||||
}
|
||||
if (data.introduce) {
|
||||
} else {
|
||||
this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
|
||||
unique: data.uniques
|
||||
}, {}, res => {
|
||||
res.data.forEach(item => {
|
||||
item.chapterNumber = item.partCode;
|
||||
item.responUserName = item.userName;
|
||||
this.data.push(item);
|
||||
});
|
||||
});
|
||||
}
|
||||
}).catch(e => {
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData();
|
||||
this.getData();
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
.bzdyStep5 {
|
||||
/deep/.el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
.fileClass {
|
||||
cursor: pointer;
|
||||
}
|
||||
.fileClass:hover{
|
||||
color: #0c91e5;
|
||||
}
|
||||
position: relative;
|
||||
height: 100%;
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@import '~@/assets/styles/style';
|
||||
|
||||
.bzdyStep5 {
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.fileClass {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.fileClass:hover {
|
||||
color: #0c91e5;
|
||||
}
|
||||
|
||||
position: relative;
|
||||
height: 100%;
|
||||
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,446 +1,477 @@
|
||||
<template>
|
||||
<div class="bzdyStep6">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">责任人会签</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cid"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cname"
|
||||
placeholder="请输入标准名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
<ProcessTitle>
|
||||
<template slot="title">征求意见列表</template>
|
||||
</ProcessTitle>
|
||||
<div class="button-list">
|
||||
<el-button type="primary"
|
||||
class="common-button-primary add-button"
|
||||
@click="upload(data, '汇总单.xls')"
|
||||
size="mini">导出汇总单</el-button>
|
||||
<el-button type="primary"
|
||||
class="common-button-primary add-button"
|
||||
@click="upload(oldData, '征求意见搞.xls')"
|
||||
size="mini">导出征求意见搞</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="data"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
style="width: 100%; flex: auto;"
|
||||
class="drag-table"
|
||||
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}">
|
||||
<el-table-column
|
||||
type="index"
|
||||
label="序号"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterNumber"
|
||||
label="章条编号"
|
||||
width="170px">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterName"
|
||||
label="章节名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="commentText"
|
||||
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="department"
|
||||
label="提出部门">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="responUserName"
|
||||
label="提出人">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="state"
|
||||
label="处理意见">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ stateText(scope.row.state) }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="审批意见"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
show-back
|
||||
@back="handleSubmitNo"
|
||||
approval
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
<div class="bzdyStep6">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">责任人会签</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cid"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cname"
|
||||
placeholder="请输入标准名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
<ProcessTitle>
|
||||
<template slot="title">征求意见列表</template>
|
||||
</ProcessTitle>
|
||||
<div class="button-list">
|
||||
<el-button type="primary"
|
||||
class="common-button-primary add-button"
|
||||
@click="upload(data, '汇总单.xls')"
|
||||
size="mini">导出汇总单
|
||||
</el-button>
|
||||
<el-button type="primary"
|
||||
class="common-button-primary add-button"
|
||||
@click="upload(oldData, '征求意见搞.xls')"
|
||||
size="mini">导出征求意见搞
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="data"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
style="width: 100%; flex: auto;"
|
||||
class="drag-table"
|
||||
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}">
|
||||
<el-table-column
|
||||
type="index"
|
||||
label="序号"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterNumber"
|
||||
label="章条编号"
|
||||
width="170px">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterName"
|
||||
label="章节名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="commentText"
|
||||
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="department"
|
||||
label="提出部门">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="responUserName"
|
||||
label="提出人">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="state"
|
||||
label="处理意见">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ stateText(scope.row.state) }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="审批意见"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
show-back
|
||||
@back="handleSubmitNo"
|
||||
approval
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { inboundLiaisonDetail, processCreateStand } from "api/process";
|
||||
|
||||
export default {
|
||||
name: "bzzqyjStep6",
|
||||
data() {
|
||||
return {
|
||||
histortData: [],
|
||||
oldData: [],
|
||||
data: [],
|
||||
commentText: '',
|
||||
oldText : '',
|
||||
newText : '',
|
||||
reason : '' ,
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
roleRow: {},
|
||||
nodeList: [],
|
||||
type: '',
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'name'
|
||||
},
|
||||
treeData: [], // 人员数据
|
||||
modalshowflag: false, // drawer开关
|
||||
drawerTitle: '', //drawer标题
|
||||
textarea: '', // 意见
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
active: '1', // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
cid: '', // 编号
|
||||
endTime: '', // 结束日期
|
||||
cname: '', // 名称
|
||||
},
|
||||
formRules: {
|
||||
responUserList: [
|
||||
{ required: true, message: '请选择责任人', trigger: 'change' },
|
||||
]
|
||||
},
|
||||
json: {}
|
||||
}
|
||||
export default {
|
||||
name: "bzzqyjStep6",
|
||||
data() {
|
||||
return {
|
||||
histortData: [],
|
||||
oldData: [],
|
||||
data: [],
|
||||
commentText: "",
|
||||
oldText: "",
|
||||
newText: "",
|
||||
reason: "",
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
roleRow: {},
|
||||
nodeList: [],
|
||||
type: "",
|
||||
defaultProps: {
|
||||
children: "children",
|
||||
label: "name"
|
||||
},
|
||||
treeData: [], // 人员数据
|
||||
modalshowflag: false, // drawer开关
|
||||
drawerTitle: "", //drawer标题
|
||||
textarea: "", // 意见
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
active: "1", // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
cid: "", // 编号
|
||||
endTime: "", // 结束日期
|
||||
cname: "" // 名称
|
||||
},
|
||||
formRules: {
|
||||
responUserList: [
|
||||
{ required: true, message: "请选择责任人", trigger: "change" }
|
||||
]
|
||||
},
|
||||
json: {}
|
||||
};
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
getHistoryData() {
|
||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||
prcNum: this.$route.query.prcNum
|
||||
}, {}, res => {
|
||||
this.histortData = res;
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
stateText(row) {
|
||||
if (row === "1") {
|
||||
return "上报";
|
||||
} else if (row === "2") {
|
||||
return "处理后上报";
|
||||
}
|
||||
},
|
||||
upload(row, title) {
|
||||
var params = {
|
||||
columnName: {
|
||||
chapterNumber: "章条编号",
|
||||
chapterName: "章节名称",
|
||||
commentText: "修改意见内容（包括理由或依据）",
|
||||
oldText: "修改前",
|
||||
newText: "修改后",
|
||||
reason: "修改理由",
|
||||
department: "提出部门",
|
||||
responUserName: "提出人",
|
||||
stateText: "处理意见"
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
getHistoryData () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
}, {}, res => {
|
||||
this.histortData = res
|
||||
}, e => {})
|
||||
},
|
||||
stateText (row) {
|
||||
if (row === '1') {
|
||||
return '上报'
|
||||
} else if (row === '2') {
|
||||
return '处理后上报'
|
||||
}
|
||||
},
|
||||
upload (row, title) {
|
||||
var params = {
|
||||
columnName: {
|
||||
chapterNumber : '章条编号',
|
||||
chapterName : '章节名称',
|
||||
commentText: '修改意见内容（包括理由或依据）',
|
||||
oldText : '修改前',
|
||||
newText : '修改后',
|
||||
reason : '修改理由',
|
||||
department: '提出部门',
|
||||
responUserName: '提出人',
|
||||
stateText: '处理意见'
|
||||
},
|
||||
dataList: []
|
||||
}
|
||||
params.dataList = JSON.parse(JSON.stringify(row))
|
||||
params.dataList.forEach(item => {
|
||||
if (item.state === '1') {
|
||||
item.stateText = '上报'
|
||||
} else if (item.state === '2') {
|
||||
item.stateText = '处理后上报'
|
||||
} else {
|
||||
item.stateText = '不上报'
|
||||
}
|
||||
})
|
||||
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
|
||||
},
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
handleSave() {},
|
||||
handleSubmit() {
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning('请输入征求意见搞')
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
},
|
||||
handleSubmitNo() {
|
||||
if (this.commentText) {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 1
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskIds: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('驳回成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.cid = data.cid
|
||||
this.form.endTime = data.endTime
|
||||
this.form.cname = data.cname
|
||||
var arr = []
|
||||
data.summaryList.forEach( item => {
|
||||
if (item.state != '3') {
|
||||
arr.push(item)
|
||||
}
|
||||
})
|
||||
this.json = data
|
||||
this.data = arr
|
||||
this.oldData = data.oldinfo
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getHistoryData()
|
||||
this.getData()
|
||||
dataList: []
|
||||
};
|
||||
params.dataList = JSON.parse(JSON.stringify(row));
|
||||
params.dataList.forEach(item => {
|
||||
if (item.state === "1") {
|
||||
item.stateText = "上报";
|
||||
} else if (item.state === "2") {
|
||||
item.stateText = "处理后上报";
|
||||
} else {
|
||||
item.stateText = "不上报";
|
||||
}
|
||||
});
|
||||
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
|
||||
});
|
||||
},
|
||||
handleTabs(name) {
|
||||
this.active = name;
|
||||
},
|
||||
handleSave() {
|
||||
},
|
||||
handleSubmit() {
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning("请输入征求意见搞");
|
||||
} else {
|
||||
this.isSubmit = true;
|
||||
var json = this.json;
|
||||
json.actionFlag = 0;
|
||||
json.commentText = this.commentText;
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success("提交成功");
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false;
|
||||
});
|
||||
}
|
||||
},
|
||||
handleSubmitNo() {
|
||||
if (this.commentText) {
|
||||
this.isSubmit = true;
|
||||
var json = this.json;
|
||||
json.actionFlag = 1;
|
||||
json.commentText = this.commentText;
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
json: JSON.stringify(json),
|
||||
taskIds: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success("驳回成功");
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false;
|
||||
});
|
||||
} else {
|
||||
this.$message.warning("请输入反馈意见");
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg);
|
||||
console.log(data);
|
||||
if (data.oldinfo === undefined) {
|
||||
this.form.cid = data.cid;
|
||||
this.form.endTime = data.endTime;
|
||||
this.form.cname = data.cname;
|
||||
var arr = [];
|
||||
data.summaryList.forEach(item => {
|
||||
if (item.state != "3") {
|
||||
arr.push(item);
|
||||
}
|
||||
});
|
||||
this.json = data;
|
||||
this.data = arr;
|
||||
this.oldData = data.oldinfo;
|
||||
} else {
|
||||
this.form.cid = data.oldinfo.cid;
|
||||
this.form.endTime = data.oldinfo.endTime;
|
||||
this.form.cname = data.oldinfo.cname;
|
||||
var arr = [];
|
||||
data.oldinfo.data.forEach(item => {
|
||||
if (item.state != "3") {
|
||||
arr.push(item);
|
||||
}
|
||||
});
|
||||
this.json = data;
|
||||
this.data = arr;
|
||||
this.oldData = data.oldinfo;
|
||||
}
|
||||
}).catch(e => {
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData();
|
||||
this.getData();
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
.bzdyStep6 {
|
||||
/deep/.el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
.fileClass {
|
||||
cursor: pointer;
|
||||
}
|
||||
.fileClass:hover{
|
||||
color: #0c91e5;
|
||||
}
|
||||
position: relative;
|
||||
height: 100%;
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@import '~@/assets/styles/style';
|
||||
|
||||
.bzdyStep6 {
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.fileClass {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.fileClass:hover {
|
||||
color: #0c91e5;
|
||||
}
|
||||
|
||||
position: relative;
|
||||
height: 100%;
|
||||
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -355,19 +355,34 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.cid = data.cid
|
||||
this.form.endTime = data.endTime
|
||||
this.form.cname = data.cname
|
||||
var arr = []
|
||||
data.summaryList.forEach( item => {
|
||||
if (item.state != '3') {
|
||||
arr.push(item)
|
||||
}
|
||||
})
|
||||
this.json = data
|
||||
this.data = arr
|
||||
if (data.oldinfo === undefined) {
|
||||
this.form.cid = data.cid;
|
||||
this.form.endTime = data.endTime;
|
||||
this.form.cname = data.cname;
|
||||
var arr = [];
|
||||
data.summaryList.forEach(item => {
|
||||
if (item.state != "3") {
|
||||
arr.push(item);
|
||||
}
|
||||
});
|
||||
this.json = data;
|
||||
this.data = arr;
|
||||
this.oldData = data.oldinfo;
|
||||
} else {
|
||||
this.form.cid = data.oldinfo.cid;
|
||||
this.form.endTime = data.oldinfo.endTime;
|
||||
this.form.cname = data.oldinfo.cname;
|
||||
var arr = [];
|
||||
data.oldinfo.data.forEach(item => {
|
||||
if (item.state != "3") {
|
||||
arr.push(item);
|
||||
}
|
||||
});
|
||||
this.json = data;
|
||||
this.data = arr;
|
||||
this.oldData = data.oldinfo;
|
||||
}
|
||||
|
||||
this.oldData = data.oldinfo
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
|
||||
@@ -355,18 +355,33 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.cid = data.cid
|
||||
this.form.endTime = data.endTime
|
||||
this.form.cname = data.cname
|
||||
var arr = []
|
||||
data.summaryList.forEach( item => {
|
||||
if (item.state != '3') {
|
||||
arr.push(item)
|
||||
}
|
||||
})
|
||||
this.json = data
|
||||
this.data = arr
|
||||
this.oldData = data.oldinfo
|
||||
if (data.oldinfo === undefined) {
|
||||
this.form.cid = data.cid;
|
||||
this.form.endTime = data.endTime;
|
||||
this.form.cname = data.cname;
|
||||
var arr = [];
|
||||
data.summaryList.forEach(item => {
|
||||
if (item.state != "3") {
|
||||
arr.push(item);
|
||||
}
|
||||
});
|
||||
this.json = data;
|
||||
this.data = arr;
|
||||
this.oldData = data.oldinfo;
|
||||
} else {
|
||||
this.form.cid = data.oldinfo.cid;
|
||||
this.form.endTime = data.oldinfo.endTime;
|
||||
this.form.cname = data.oldinfo.cname;
|
||||
var arr = [];
|
||||
data.oldinfo.data.forEach(item => {
|
||||
if (item.state != "3") {
|
||||
arr.push(item);
|
||||
}
|
||||
});
|
||||
this.json = data;
|
||||
this.data = arr;
|
||||
this.oldData = data.oldinfo;
|
||||
}
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,440 +1,470 @@
|
||||
<template>
|
||||
<div class="bzdyStep9">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">工程研究总院院长批准</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cid"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cname"
|
||||
placeholder="请输入标准名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
<ProcessTitle>
|
||||
<template slot="title">征求意见列表</template>
|
||||
</ProcessTitle>
|
||||
<div class="button-list">
|
||||
<el-button type="primary"
|
||||
class="common-button-primary add-button"
|
||||
@click="upload(data, '汇总单.xls')"
|
||||
size="mini">导出汇总单</el-button>
|
||||
<el-button type="primary"
|
||||
class="common-button-primary add-button"
|
||||
@click="upload(oldData, '征求意见搞.xls')"
|
||||
size="mini">导出征求意见搞</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="data"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
style="width: 100%; flex: auto;"
|
||||
class="drag-table"
|
||||
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}">
|
||||
<el-table-column
|
||||
type="index"
|
||||
label="序号"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterNumber"
|
||||
label="章条编号"
|
||||
width="170px">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterName"
|
||||
label="章节名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="commentText"
|
||||
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="department"
|
||||
label="提出部门">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="responUserName"
|
||||
label="提出人">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="state"
|
||||
label="处理意见">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ stateText(scope.row.state) }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="审批意见"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
show-back
|
||||
@back="handleSubmitNo"
|
||||
approval
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
<div class="bzdyStep9">
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">工程研究总院院长批准</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cid"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="form.cname"
|
||||
placeholder="请输入标准名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
<ProcessTitle>
|
||||
<template slot="title">征求意见列表</template>
|
||||
</ProcessTitle>
|
||||
<div class="button-list">
|
||||
<el-button type="primary"
|
||||
class="common-button-primary add-button"
|
||||
@click="upload(data, '汇总单.xls')"
|
||||
size="mini">导出汇总单
|
||||
</el-button>
|
||||
<el-button type="primary"
|
||||
class="common-button-primary add-button"
|
||||
@click="upload(oldData, '征求意见搞.xls')"
|
||||
size="mini">导出征求意见搞
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="data"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
style="width: 100%; flex: auto;"
|
||||
class="drag-table"
|
||||
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}">
|
||||
<el-table-column
|
||||
type="index"
|
||||
label="序号"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterNumber"
|
||||
label="章条编号"
|
||||
width="170px">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterName"
|
||||
label="章节名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="commentText"
|
||||
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="department"
|
||||
label="提出部门">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="responUserName"
|
||||
label="提出人">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="state"
|
||||
label="处理意见">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ stateText(scope.row.state) }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="审批意见"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
show-back
|
||||
@back="handleSubmitNo"
|
||||
approval
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { inboundLiaisonDetail, processCreateStand } from "api/process";
|
||||
|
||||
export default {
|
||||
name: "bzzqyjStep9",
|
||||
data() {
|
||||
return {
|
||||
histortData: [],
|
||||
oldData: [],
|
||||
data: [],
|
||||
commentText: '',
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
roleRow: {},
|
||||
nodeList: [],
|
||||
type: '',
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'name'
|
||||
},
|
||||
treeData: [], // 人员数据
|
||||
modalshowflag: false, // drawer开关
|
||||
drawerTitle: '', //drawer标题
|
||||
textarea: '', // 意见
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
active: '1', // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
cid: '', // 编号
|
||||
endTime: '', // 结束日期
|
||||
cname: '', // 名称
|
||||
},
|
||||
formRules: {
|
||||
responUserList: [
|
||||
{ required: true, message: '请选择责任人', trigger: 'change' },
|
||||
]
|
||||
},
|
||||
json: {}
|
||||
}
|
||||
export default {
|
||||
name: "bzzqyjStep9",
|
||||
data() {
|
||||
return {
|
||||
histortData: [],
|
||||
oldData: [],
|
||||
data: [],
|
||||
commentText: "",
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
roleRow: {},
|
||||
nodeList: [],
|
||||
type: "",
|
||||
defaultProps: {
|
||||
children: "children",
|
||||
label: "name"
|
||||
},
|
||||
treeData: [], // 人员数据
|
||||
modalshowflag: false, // drawer开关
|
||||
drawerTitle: "", //drawer标题
|
||||
textarea: "", // 意见
|
||||
ListModel: false, // 新增编辑抽屉开关
|
||||
active: "1", // 默认显示
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
form: {
|
||||
cid: "", // 编号
|
||||
endTime: "", // 结束日期
|
||||
cname: "" // 名称
|
||||
},
|
||||
formRules: {
|
||||
responUserList: [
|
||||
{ required: true, message: "请选择责任人", trigger: "change" }
|
||||
]
|
||||
},
|
||||
json: {}
|
||||
};
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
getHistoryData() {
|
||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||
prcNum: this.$route.query.prcNum
|
||||
}, {}, res => {
|
||||
this.histortData = res;
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
upload(row, title) {
|
||||
var params = {
|
||||
columnName: {
|
||||
chapterNumber: "章条编号",
|
||||
chapterName: "章节名称",
|
||||
commentText: "修改意见内容（包括理由或依据）",
|
||||
department: "提出部门",
|
||||
responUserName: "提出人",
|
||||
stateText: "处理意见"
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
getHistoryData () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
}, {}, res => {
|
||||
this.histortData = res
|
||||
}, e => {})
|
||||
},
|
||||
upload (row, title) {
|
||||
var params = {
|
||||
columnName: {
|
||||
chapterNumber : '章条编号',
|
||||
chapterName : '章节名称',
|
||||
commentText: '修改意见内容（包括理由或依据）',
|
||||
department: '提出部门',
|
||||
responUserName: '提出人',
|
||||
stateText: '处理意见'
|
||||
},
|
||||
dataList: []
|
||||
}
|
||||
params.dataList = JSON.parse(JSON.stringify(row))
|
||||
params.dataList.forEach(item => {
|
||||
if (item.state === '1') {
|
||||
item.stateText = '上报'
|
||||
} else if (item.state === '2') {
|
||||
item.stateText = '处理后上报'
|
||||
} else {
|
||||
item.stateText = '不上报'
|
||||
}
|
||||
})
|
||||
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
|
||||
},
|
||||
stateText (row) {
|
||||
if (row === '1') {
|
||||
return '上报'
|
||||
} else if (row === '2') {
|
||||
return '处理后上报'
|
||||
}
|
||||
},
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
handleSave() {},
|
||||
handleSubmit() {
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning('请输入征求意见搞')
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
},
|
||||
handleSubmitNo() {
|
||||
if (this.commentText) {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 1
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskIds: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('驳回成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.cid = data.cid
|
||||
this.form.endTime = data.endTime
|
||||
this.form.cname = data.cname
|
||||
var arr = []
|
||||
data.summaryList.forEach( item => {
|
||||
if (item.state != '3') {
|
||||
arr.push(item)
|
||||
}
|
||||
})
|
||||
this.json = data
|
||||
this.data = arr
|
||||
this.oldData = data.oldinfo
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getHistoryData()
|
||||
this.getData()
|
||||
dataList: []
|
||||
};
|
||||
params.dataList = JSON.parse(JSON.stringify(row));
|
||||
params.dataList.forEach(item => {
|
||||
if (item.state === "1") {
|
||||
item.stateText = "上报";
|
||||
} else if (item.state === "2") {
|
||||
item.stateText = "处理后上报";
|
||||
} else {
|
||||
item.stateText = "不上报";
|
||||
}
|
||||
});
|
||||
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
|
||||
});
|
||||
},
|
||||
stateText(row) {
|
||||
if (row === "1") {
|
||||
return "上报";
|
||||
} else if (row === "2") {
|
||||
return "处理后上报";
|
||||
}
|
||||
},
|
||||
handleTabs(name) {
|
||||
this.active = name;
|
||||
},
|
||||
handleSave() {
|
||||
},
|
||||
handleSubmit() {
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning("请输入征求意见搞");
|
||||
} else {
|
||||
this.isSubmit = true;
|
||||
var json = this.json;
|
||||
json.actionFlag = 0;
|
||||
json.commentText = this.commentText;
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success("提交成功");
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false;
|
||||
});
|
||||
}
|
||||
},
|
||||
handleSubmitNo() {
|
||||
if (this.commentText) {
|
||||
this.isSubmit = true;
|
||||
var json = this.json;
|
||||
json.actionFlag = 1;
|
||||
json.commentText = this.commentText;
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
json: JSON.stringify(json),
|
||||
taskIds: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success("驳回成功");
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false;
|
||||
});
|
||||
} else {
|
||||
this.$message.warning("请输入反馈意见");
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg);
|
||||
if (data.oldinfo === undefined) {
|
||||
this.form.cid = data.cid;
|
||||
this.form.endTime = data.endTime;
|
||||
this.form.cname = data.cname;
|
||||
var arr = [];
|
||||
data.summaryList.forEach(item => {
|
||||
if (item.state != "3") {
|
||||
arr.push(item);
|
||||
}
|
||||
});
|
||||
this.json = data;
|
||||
this.data = arr;
|
||||
this.oldData = data.oldinfo;
|
||||
} else {
|
||||
this.form.cid = data.oldinfo.cid;
|
||||
this.form.endTime = data.oldinfo.endTime;
|
||||
this.form.cname = data.oldinfo.cname;
|
||||
var arr = [];
|
||||
data.oldinfo.data.forEach(item => {
|
||||
if (item.state != "3") {
|
||||
arr.push(item);
|
||||
}
|
||||
});
|
||||
this.json = data;
|
||||
this.data = arr;
|
||||
this.oldData = data.oldinfo;
|
||||
}
|
||||
}).catch(e => {
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData();
|
||||
this.getData();
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
.bzdyStep9 {
|
||||
/deep/.el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
.fileClass {
|
||||
cursor: pointer;
|
||||
}
|
||||
.fileClass:hover{
|
||||
color: #0c91e5;
|
||||
}
|
||||
position: relative;
|
||||
height: 100%;
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@import '~@/assets/styles/style';
|
||||
|
||||
.bzdyStep9 {
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.fileClass {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.fileClass:hover {
|
||||
color: #0c91e5;
|
||||
}
|
||||
|
||||
position: relative;
|
||||
height: 100%;
|
||||
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -42,6 +42,12 @@
|
||||
<process-title>
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<div class="tableTitle">
|
||||
<div class="tableButton">
|
||||
<el-button class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
style="width: 100%; border: 1px solid #cccccc"
|
||||
@@ -237,6 +243,17 @@
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<!-- 以后全选可能用-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="productionCompletionTime"-->
|
||||
<!-- align="center"-->
|
||||
<!-- fixed="right"-->
|
||||
<!-- width="160"-->
|
||||
<!-- label="操作">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
</div>
|
||||
<div>
|
||||
@@ -331,6 +348,73 @@
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
</ProcessFooter>
|
||||
<el-drawer
|
||||
title="批量填写"
|
||||
:visible.sync="modalshowflag"
|
||||
:wrapperClosable="false"
|
||||
size="800px">
|
||||
<div class="demo-drawer-content">
|
||||
<el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
|
||||
<el-divider><span><b>在研产品</b></span></el-divider>
|
||||
<el-formItem label="合规原因" class="add-form-item" >
|
||||
<el-input
|
||||
v-model="batchEditForm.complianceReasons"
|
||||
placeholder="请输入合规原因"
|
||||
></el-input>
|
||||
</el-formItem>
|
||||
<el-form-item label="不合规项目" class="add-form-item" >
|
||||
<el-input
|
||||
v-model="batchEditForm.noCompliance"
|
||||
placeholder="请输入不合规项目"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="不合规应对措施" class="add-form-item" >
|
||||
<el-input
|
||||
v-model="batchEditForm.countermeasures"
|
||||
placeholder="请输入不合规应对措施"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="完成时间" class="add-form-item" >
|
||||
<el-date-picker
|
||||
v-model="batchEditForm.completionTime"
|
||||
type="date"
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<br>
|
||||
<el-divider><span><b>在产产品</b></span></el-divider>
|
||||
<el-formItem label="合规原因" class="add-form-item" >
|
||||
<el-input
|
||||
v-model="batchEditForm.zcComplianceReasons"
|
||||
placeholder="请输入合规原因"
|
||||
></el-input>
|
||||
</el-formItem>
|
||||
<el-form-item label="不合规项目" class="add-form-item" >
|
||||
<el-input
|
||||
v-model="batchEditForm.zcNoCompliance"
|
||||
placeholder="请输入不合规项目"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="不合规应对措施" class="add-form-item" >
|
||||
<el-input
|
||||
v-model="batchEditForm.zcCountermeasures"
|
||||
placeholder="请输入不合规应对措施"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="完成时间" class="add-form-item" >
|
||||
<el-date-picker
|
||||
v-model="batchEditForm.zcCompletionTime"
|
||||
type="date"
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">确定</el-button>
|
||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -349,6 +433,27 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
batchEditForm: {
|
||||
// 在研产品
|
||||
// 合规
|
||||
complianceReasons :'',
|
||||
// 不合规
|
||||
noCompliance :'',
|
||||
// 应对措施
|
||||
countermeasures :'',
|
||||
// 完成时间
|
||||
completionTime :'',
|
||||
|
||||
// 在产产品
|
||||
// 合规
|
||||
zcComplianceReasons :'',
|
||||
// 不合规
|
||||
zcNoCompliance:'',
|
||||
// 应对措施
|
||||
zcCountermeasures:'',
|
||||
// 完成时间
|
||||
zcCompletionTime:''
|
||||
},
|
||||
hasChildren: true,
|
||||
active: "1",
|
||||
loading: false,
|
||||
@@ -398,6 +503,83 @@ export default {
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
//批量编辑确定按钮事件
|
||||
saveBatchEditForm() {
|
||||
|
||||
// console.log(this.selectList)
|
||||
for( let a = 0; a < this.dataList.length; a++) {
|
||||
for ( let b = 0; b < this.selectList.length; b++) {
|
||||
if (this.dataList[a].id === this.selectList[b]) {
|
||||
//合规
|
||||
this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
|
||||
//不合规
|
||||
this.dataList[a].noCompliance = this.batchEditForm.noCompliance
|
||||
//应对措施
|
||||
this.dataList[a].countermeasures = this.batchEditForm.countermeasures
|
||||
//完成时间
|
||||
this.dataList[a].completionTime = this.batchEditForm.completionTime
|
||||
//合规
|
||||
this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
|
||||
//不合规
|
||||
this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
|
||||
//应对措施
|
||||
this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
|
||||
//完成时间
|
||||
this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
|
||||
}else {
|
||||
for (let i=0;i<this.dataList[a].children.length;i++){
|
||||
if (this.dataList[a].children[i].id === this.selectList[b]){
|
||||
//合规
|
||||
this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
|
||||
//不合规
|
||||
this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
|
||||
//应对措施
|
||||
this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
|
||||
//完成时间
|
||||
this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
|
||||
//合规
|
||||
this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
|
||||
//不合规
|
||||
this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
|
||||
//应对措施
|
||||
this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
|
||||
//完成时间
|
||||
this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
this.modalshowflag = false
|
||||
},
|
||||
cancelBatchEditForm() {
|
||||
this.modalshowflag = false
|
||||
},
|
||||
//批量编辑
|
||||
batchEdit() {
|
||||
if (this.selectList.length > 0) {
|
||||
//合规
|
||||
this.batchEditForm.complianceReasons = ''
|
||||
//不合规
|
||||
this.batchEditForm.noCompliance = ''
|
||||
//应对措施
|
||||
this.batchEditForm.countermeasures = ''
|
||||
//完成时间
|
||||
this.batchEditForm.completionTime = ''
|
||||
//合规
|
||||
this.batchEditForm.zcComplianceReasons = ''
|
||||
//不合规
|
||||
this.batchEditForm.zcNoCompliance = ''
|
||||
//应对措施
|
||||
this.batchEditForm.zcCountermeasures = ''
|
||||
//完成时间
|
||||
this.batchEditForm.zcCompletionTime = ''
|
||||
this.modalshowflag = true
|
||||
} else {
|
||||
this.$message.warning('请选择要编辑的数据')
|
||||
}
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
let routeUrl = this.$router.resolve({
|
||||
@@ -525,7 +707,11 @@ export default {
|
||||
},
|
||||
//标准表格选择框改变
|
||||
selectStandChange(data) {
|
||||
this.selectList = data;
|
||||
this.selectList = [];
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
this.selectList.push(data[i].id);
|
||||
}
|
||||
|
||||
},
|
||||
getTree() {
|
||||
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
|
||||
@@ -605,6 +791,25 @@ export default {
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.accessStandardsAndRegulations {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.accessStandardsAndRegulations {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@@ -1686,7 +1686,7 @@ export default {
|
||||
orgTableValName: '',
|
||||
twoOptions: [],
|
||||
threeOptions: [],
|
||||
sarType: 'STAND',
|
||||
sarType: 'INLAND_STAND',
|
||||
productModal: false, // 模态框是否打开
|
||||
modalType: '',
|
||||
productTitle: '', // 模态框标题
|
||||
|
||||
+15
@@ -341,6 +341,20 @@
|
||||
label="文本状态"
|
||||
width="110"
|
||||
>
|
||||
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '被代替' " style="color: #F56C6C">
|
||||
{{scope.row.standStatusShow}}
|
||||
</span>
|
||||
<span v-else-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">
|
||||
{{scope.row.standStatusShow}}
|
||||
</span>
|
||||
<span v-else>
|
||||
{{scope.row.standStatusShow}}
|
||||
</span>
|
||||
</template>
|
||||
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="50" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
@@ -1237,6 +1251,7 @@ export default {
|
||||
children: 'children',
|
||||
label: 'menuName'
|
||||
},
|
||||
|
||||
advancedSearch:[],
|
||||
nodeKey: 'id',
|
||||
nodeKeyCode: 'code',
|
||||
|
||||
@@ -4105,7 +4105,7 @@ export default {
|
||||
queryDisplayLocation () {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.$http.get('lawssBase/utArea/getAreaList', {
|
||||
sarType: 'INLAND_STAND'
|
||||
sarType: 'FOREIGN_STAND'
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
|
||||
@@ -976,8 +976,8 @@
|
||||
:label="$t('m.putTime')"
|
||||
width="130">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== ''">
|
||||
{{ $dateFormat(new Date(scope.row.SSRQ), "yyyy-MM-dd") }}
|
||||
<div v-if="selectIndex === 'INLAND_STAND' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
|
||||
{{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
|
||||
</div>
|
||||
<div v-else></div>
|
||||
</template>
|
||||
@@ -987,7 +987,8 @@
|
||||
width="180"
|
||||
:label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
<div :style="selectIndex === 'BUSINESS_STAND' ? (scope.row.textStatusBussName === '参考' ? 'color: #E6A23C;' :
|
||||
(scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'color: #F56C6C;' : '')) : ''">
|
||||
{{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
|
||||
</div>
|
||||
</template>
|
||||
@@ -2492,6 +2493,14 @@ export default {
|
||||
@import '~@/assets/styles/mixins';
|
||||
@import '~@/assets/styles/style';
|
||||
|
||||
/deep/ .yellowClass{
|
||||
color: #E6A23C !important;
|
||||
}
|
||||
|
||||
/deep/ .redClass{
|
||||
color: #F56C6C !important;
|
||||
}
|
||||
|
||||
#advancedSearch {
|
||||
background: #fff;
|
||||
@borderColor: #BFBFBF;
|
||||
|
||||
@@ -109,6 +109,17 @@
|
||||
<div v-else></div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
:label="$t('m.putTime')"
|
||||
width="130">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="selectIndex === 'stand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
|
||||
{{ $dateFormat(new Date((selectIndex === 'stand') ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
|
||||
</div>
|
||||
<div v-else></div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="selectIndex !== 'msgdyinfo'"
|
||||
align="center"
|
||||
@@ -116,7 +127,9 @@
|
||||
width="200">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>
|
||||
<div v-else>{{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
|
||||
<div v-else :class="selectIndex === 'enterprise' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
|
||||
(scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
|
||||
{{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -2530,6 +2543,13 @@
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/mixins';
|
||||
@import '~@/assets/styles/style';
|
||||
/deep/ .yellowClass{
|
||||
color: #E6A23C;
|
||||
}
|
||||
|
||||
/deep/ .redClass{
|
||||
color: #F56C6C;
|
||||
}
|
||||
/deep/ p{
|
||||
display: inline;
|
||||
}
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
* @date: 2018-09-04 17:47:46
|
||||
*/
|
||||
// 服务器地址
|
||||
// const devIp = '192.168.1.159'
|
||||
const devIp = '10.96.10.171'
|
||||
const devInterfacePORT = '9999'
|
||||
// const devIp = '10.5.103.101'
|
||||
// const devInterfacePORT = '9999'
|
||||
const devIp = '62.234.136.153'
|
||||
const devInterfacePORT = '8038'
|
||||
// 云端端口号
|
||||
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
|
||||
const simpleFilePath = 'att/attFile/upload'
|
||||
@@ -31,7 +31,7 @@ const processPort = '17210'
|
||||
*****************************************************************/
|
||||
// 生产环境配置
|
||||
const prodIp = '62.234.136.153'
|
||||
const prodInterfacePORT = '8038'
|
||||
const prodInterfacePORT = '8033'
|
||||
|
||||
|
||||
// 判断环境
|
||||
|
||||
Reference in New Issue
Block a user