Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -11,38 +11,40 @@
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
min-width="100"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
min-width="100"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
min-width="100"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
min-width="100"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
min-width="100"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
|
||||
@@ -2295,7 +2295,7 @@ export default {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.sarStandardsInfoEO = res.data || {}
|
||||
if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
|
||||
if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/QCBFC') !== -1) {
|
||||
this.QFTP = true
|
||||
}
|
||||
// this.textOptions.forEach(item => {
|
||||
|
||||
@@ -1256,6 +1256,7 @@ export default {
|
||||
},
|
||||
standSelectChange (data) {
|
||||
this.selectedList = []
|
||||
this.selectedList1 = []
|
||||
this.selectedAllList = data
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
this.selectedList.push(data[i].id)
|
||||
@@ -1431,6 +1432,7 @@ export default {
|
||||
this.parentNode = cur[i]
|
||||
}
|
||||
this.zNodes = str
|
||||
console.log(this.zNodes);
|
||||
}
|
||||
// 查完左侧目录后，如果没有选中的，设置最外层选中
|
||||
if (JSON.stringify(this.selectSarMenu) === '{}') {
|
||||
|
||||
@@ -575,7 +575,6 @@
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.post('lawss/activiti/startProcessRollBack', {
|
||||
id: '',
|
||||
createUser: this.$store.getters.userInfo.userId,
|
||||
createUserName: this.$store.getters.userInfo.userName,
|
||||
type: '2',
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
@@ -568,14 +569,17 @@
|
||||
itemsName1: '',
|
||||
oldNumber: ''
|
||||
},
|
||||
formRules: {
|
||||
itemsNum: [
|
||||
{ required: true, message: '请输入标准号/政策号', trigger: 'change' },
|
||||
],
|
||||
itemsName: [
|
||||
{ required: true, message: '请输入标准名称/政策名称', trigger: 'change' },
|
||||
],
|
||||
},
|
||||
formRules: {
|
||||
itemsNum: [
|
||||
{required: true, message: '请输入标准号/政策号', trigger: 'change'},
|
||||
],
|
||||
itemsName: [
|
||||
{required: true, message: '请输入标准名称/政策名称', trigger: 'change'},
|
||||
],
|
||||
endTime: [
|
||||
{required: true, message: '请输入截止时间', trigger: 'change'},
|
||||
],
|
||||
},
|
||||
// 标准征求意见数据可库
|
||||
standCommonlySearch: {
|
||||
numOrName: '',
|
||||
|
||||
@@ -910,6 +910,7 @@ export default {
|
||||
this.saveLoading = true;
|
||||
this.listForm.dataList = this.dataList
|
||||
let _formData = new FormData();
|
||||
_formData.append("id", this.bpnId || "");
|
||||
_formData.append("createUser", this.$store.getters.userInfo.userId);
|
||||
_formData.append("createUserName", this.$store.getters.userInfo.uName);
|
||||
_formData.append("prcType", "5");
|
||||
|
||||
@@ -807,13 +807,22 @@ export default {
|
||||
this.isSubmit = false
|
||||
})
|
||||
},
|
||||
handlePrice(){
|
||||
for (let i = 0; i < this.dataList.length; i++) {
|
||||
if (this.dataList[i].complianceReasons|| (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
|
||||
}else {
|
||||
this.comFlag ++
|
||||
handlePrice() {
|
||||
this.dataList.forEach(item =>{
|
||||
if(item.complianceReasons){
|
||||
this.comFlag = 0;
|
||||
return
|
||||
}else{
|
||||
for (let i = 0; i < this.dataList.length; i++) {
|
||||
if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
|
||||
this.comFlag = 0;
|
||||
return;
|
||||
} else {
|
||||
this.comFlag++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
@@ -842,8 +851,6 @@ export default {
|
||||
this.listForm.dataList = this.dataList;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.isSubmit = true
|
||||
console.log('可以提交');
|
||||
return
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
|
||||
@@ -39,7 +39,6 @@
|
||||
<el-date-picker
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
:picker-options="pickerOptions"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
|
||||
@@ -38,9 +38,7 @@
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
v-model="form.endTime"
|
||||
:picker-options="pickerOptions"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
disabled
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
value-format="yyyy-MM-dd"
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
placeholder="请选择结束日期">
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
value-format="yyyy-MM-dd"
|
||||
disabled
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
@@ -407,7 +406,8 @@
|
||||
this.$refs['bzzqyjForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
let json = this.json
|
||||
json.info = this.data
|
||||
json.commentText = this.commentText41
|
||||
json.bzfgId = this.form.bzfgId
|
||||
json.bzfgName = this.form.bzfgName
|
||||
@@ -463,8 +463,8 @@
|
||||
this.form.textType = data.textType || data.form.textType
|
||||
this.form.modelList = data.modelList || data.form.modelList
|
||||
this.commentText41 = data.commentText41 || ''
|
||||
this.form.bzfgId = data.startUser
|
||||
this.form.bzfgName = data.startUserName
|
||||
this.form.bzfgId = data.startUser || data.form.startUser
|
||||
this.form.bzfgName = data.startUserName || data.form.startUserName
|
||||
this.json = data
|
||||
this.data = data.info || data.data
|
||||
}).catch(e => {
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
disabled
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
@@ -397,7 +396,8 @@
|
||||
},
|
||||
handleSubmit() {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
let json = this.json
|
||||
json.info = this.data
|
||||
json.commentText = this.commentText42
|
||||
json.bzFlag = '0'
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
value-format="yyyy-MM-dd"
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
placeholder="请选择结束日期">
|
||||
@@ -645,10 +644,11 @@ export default {
|
||||
this.$refs['bzzqyjForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
let json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText4
|
||||
json.spId = this.form.spId
|
||||
json.info = this.data
|
||||
json.spName = this.form.spName
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
|
||||
@@ -626,6 +626,16 @@
|
||||
this.form.textType = data.form ? data.form.textType : data.textType
|
||||
this.form.cid = data.form ? data.form.cid : data.cid
|
||||
this.form.endTime = data.form ? data.form.endTime : data.endTime
|
||||
this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
|
||||
endTime: this.form.endTime
|
||||
}, {}, res => {
|
||||
//返回0 流程未到截止日期 不能进行操作
|
||||
if (res.message === '0') {
|
||||
this.clickFlag = false
|
||||
} else {
|
||||
this.clickFlag = true
|
||||
}
|
||||
})
|
||||
let newArr = data.info ? data.info : data.form.data
|
||||
newArr.forEach(item => {
|
||||
if (!item.source) {
|
||||
@@ -639,16 +649,6 @@
|
||||
this.json = data;
|
||||
this.getItemList(data.standId,this.form.textValue)
|
||||
this.data = newArr
|
||||
this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
|
||||
endTime: this.form.endTime
|
||||
}, {}, res => {
|
||||
//返回0 流程未到截止日期 不能进行操作
|
||||
if (res.message === '0') {
|
||||
this.clickFlag = false
|
||||
} else {
|
||||
this.clickFlag = true
|
||||
}
|
||||
})
|
||||
if (data.introduce) {
|
||||
} else {
|
||||
this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
|
||||
|
||||
@@ -49,19 +49,6 @@
|
||||
</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 === '3'">
|
||||
<div class="flow-list">
|
||||
|
||||
@@ -860,7 +860,7 @@ export default {
|
||||
return
|
||||
}else{
|
||||
for (let i = 0; i < this.dataList.length; i++) {
|
||||
if (this.dataList[i].complianceReasons || this.dataList[i].remarks || (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
|
||||
if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
|
||||
this.comFlag = 0;
|
||||
return;
|
||||
} else {
|
||||
|
||||
@@ -126,22 +126,6 @@
|
||||
label="在产车实施日期">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
:disabled="this.$route.query.unShowReceipt"
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list" style="height: 100%">
|
||||
|
||||
@@ -512,7 +512,7 @@
|
||||
width="150"
|
||||
label="新车型实施日期">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
|
||||
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
|
||||
<span v-else>{{ scope.row.xcxssrq }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -521,7 +521,7 @@
|
||||
width="150"
|
||||
label="在产车实施日期">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
|
||||
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
|
||||
<span v-else>{{ scope.row.zccssrq }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -1262,8 +1262,8 @@ export default {
|
||||
if(item.zrbm === '[]'){
|
||||
item.zrbm = ''
|
||||
}
|
||||
this.$set(item, 'zccssrq', item.zccssrqgj)
|
||||
this.$set(item, 'xcxssrq', item.xcxssrqgj)
|
||||
this.$set(item, 'zccssrq', item.zccssrqgj || item.zccssrq)
|
||||
this.$set(item, 'xcxssrq', item.xcxssrqgj || item.xcxssrq)
|
||||
})
|
||||
});
|
||||
},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="phoneXmpgStep6 phoneBox">
|
||||
<ProcessHeaderPhone toggle>
|
||||
<template slot="proName">标准合规评估流程</template>
|
||||
<template slot="proNode">产品线责任人审批</template>
|
||||
<template slot="proNode">审核2</template>
|
||||
</ProcessHeaderPhone>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<div class="phoneBzqdfbStep4 phoneBox">
|
||||
<ProcessHeaderPhone toggle>
|
||||
<template slot="proName">标准清单发布/更新流程</template>
|
||||
<template slot="proNode">业务经理审批</template>
|
||||
<template slot="proNode">批准</template>
|
||||
</ProcessHeaderPhone>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
@@ -447,8 +447,8 @@ export default {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
window.history.back()
|
||||
this.$message.success(res.message)
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
|
||||
@@ -74,63 +74,7 @@
|
||||
</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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
|
||||
<Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
|
||||
@@ -143,63 +143,7 @@
|
||||
</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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
|
||||
<Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -418,34 +362,29 @@
|
||||
}
|
||||
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.fjList = data.fjList || data.form.fjList
|
||||
if (data.fjListId === '') {
|
||||
this.form.fjListId = ''
|
||||
} else {
|
||||
this.form.fjListId = data.form.fjListId || data.fjListId
|
||||
}
|
||||
this.commentText41 = data.commentText41 || ''
|
||||
this.form.bzfgId = data.startUser
|
||||
this.form.bzfgName = data.startUserName
|
||||
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.form.textType = data.textType || data.form.textType
|
||||
this.form.modelList = data.modelList || data.form.modelList
|
||||
this.form.modelNameList = data.modelNameList || data.form.modelNameList
|
||||
this.json = data
|
||||
this.data = data.info || data.data
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
|
||||
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
|
||||
this.form.fjList = data.fjList || data.form.fjList
|
||||
this.form.cid = data.cid || data.form.cid
|
||||
this.form.endTime = data.endTime || data.form.endTime
|
||||
this.form.textType = data.textType || data.form.textType
|
||||
this.form.modelList = data.modelList || data.form.modelList
|
||||
this.commentText41 = data.commentText41 || ''
|
||||
this.form.bzfgId = data.startUser || data.form.startUser
|
||||
this.form.bzfgName = data.startUserName || data.form.startUserName
|
||||
this.json = data
|
||||
this.data = data.info || data.data
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData()
|
||||
|
||||
@@ -130,63 +130,7 @@
|
||||
</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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
|
||||
<Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeaderPhone toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">责任人会签</template>
|
||||
<template slot="proNode">会签</template>
|
||||
</ProcessHeaderPhone>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeaderPhone toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">部长及对接人审核</template>
|
||||
<template slot="proNode">审核</template>
|
||||
</ProcessHeaderPhone>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="phoneXmpg2Step12 phoneBox">
|
||||
<ProcessHeaderPhone toggle>
|
||||
<template slot="proName">项目合规评估流程</template>
|
||||
<template slot="proNode">产品工程经理审核</template>
|
||||
<template slot="proNode">审核</template>
|
||||
</ProcessHeaderPhone>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
|
||||
Reference in New Issue
Block a user