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

This commit is contained in:
yanyizhou
2021-12-23 16:00:35 +08:00
41 changed files with 273 additions and 1917 deletions
@@ -155,11 +155,6 @@
:no-data-text="listNoDataText" :no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
> >
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="任务步骤" label="任务步骤"
@@ -152,11 +152,6 @@
:no-data-text="listNoDataText" :no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
> >
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="任务步骤" label="任务步骤"
@@ -1287,35 +1287,66 @@ export default {
this.fileInfoList = [] this.fileInfoList = []
} }
this.ListModel = false; this.ListModel = false;
//如果是国家地区清单传入types字段对日期进行区分
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", if(this.listType === 'country'){
{ id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
_this: this { id: this.selectedList[0].id, types: '1', page: this.page, Size: this.pageSize }, {
}, res => { _this: this
if (res.data === null) { }, res => {
this.dataList = []; if (res.data === null) {
} this.dataList = [];
this.dataList = res.data.records; }
this.dataList.forEach(item => { this.dataList = res.data.records;
if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){ this.dataList.forEach(item => {
item.xcxssrqgj = '' if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){
}else{ item.xcxssrqgj = ''
this.$set(item, "XCXSSRQ", item.xcxssrqgj) }else{
} this.$set(item, "XCXSSRQ", item.xcxssrqgj)
if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){ }
item.zccssrqgj = '' if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
}else{ item.zccssrqgj = ''
this.$set(item, "ZCCSSRQ", item.zccssrqgj) }else{
} this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}) }
this.listForm.dataList = this.dataList; })
let formId = []; this.listForm.dataList = this.dataList;
this.dataList.map(item => { let formId = [];
formId.push(item.id); this.dataList.map(item => {
formId.push(item.id);
});
this.listForm.inforlist = formId.join(",");
}, e => {
}); });
this.listForm.inforlist = formId.join(","); }else{
}, e => { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
}); { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
_this: this
}, res => {
if (res.data === null) {
this.dataList = [];
}
this.dataList = res.data.records;
this.dataList.forEach(item => {
if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){
item.xcxssrqgj = ''
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}
if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
item.zccssrqgj = ''
}else{
this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}
})
this.listForm.dataList = this.dataList;
let formId = [];
this.dataList.map(item => {
formId.push(item.id);
});
this.listForm.inforlist = formId.join(",");
}, e => {
});
}
this.$refs.detailedSelection.clearSelection() this.$refs.detailedSelection.clearSelection()
} else { } else {
this.$message.warning("请选择一条数据进行带入"); this.$message.warning("请选择一条数据进行带入");
@@ -40,7 +40,7 @@
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
:key="item.id"> {{ item.name }} :key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }}
<i <i
title="下载" title="下载"
@click="downloadFile(item.id)" @click="downloadFile(item.id)"
@@ -151,11 +151,6 @@
:no-data-text="listNoDataText" :no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
> >
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="任务步骤" label="任务步骤"
@@ -372,6 +367,10 @@ export default {
}, e => { }, e => {
}); });
}, },
clickButtonToUpload2(file) {
const attId = file
this.$preview(attId)
},
/** /**
* @Description: 点击下载 * @Description: 点击下载
*/ */
@@ -170,11 +170,6 @@
:no-data-text="listNoDataText" :no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
> >
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="任务步骤" label="任务步骤"
@@ -779,7 +774,6 @@ export default {
this.listForm.jlUserId = item.jlUserId this.listForm.jlUserId = item.jlUserId
this.listForm.zrUserId = item.zrUserId this.listForm.zrUserId = item.zrUserId
this.fileInfoList = item.fileName this.fileInfoList = item.fileName
this.commentText = item.commentText
} else { } else {
this.listForm = item.form this.listForm = item.form
this.dataList = item.form.dataList this.dataList = item.form.dataList
@@ -40,7 +40,7 @@
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
:key="item.id"> {{ item.name }} :key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }}
<i <i
title="下载" title="下载"
@click="downloadFile(item.id)" @click="downloadFile(item.id)"
@@ -152,11 +152,6 @@
:no-data-text="listNoDataText" :no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
> >
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="任务步骤" label="任务步骤"
@@ -441,6 +436,11 @@ export default {
}, e => { }, e => {
}); });
}, },
//点击预览
clickButtonToUpload2(file) {
const attId = file
this.$preview(attId)
},
/** /**
* @Description: 点击下载 * @Description: 点击下载
*/ */
@@ -44,7 +44,6 @@
<el-table-column label="佐证材料" align="center" width="150"> <el-table-column label="佐证材料" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-upload <el-upload
:disabled="acceptShow"
multiple multiple
ref="uploadFile" ref="uploadFile"
:action="uploadPath" :action="uploadPath"
@@ -58,7 +57,6 @@
:on-success="handleOnsuccess" :on-success="handleOnsuccess"
> >
<el-button <el-button
:disabled="acceptShow"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@click="uploadFile(scope.row)" @click="uploadFile(scope.row)"
@@ -6,7 +6,6 @@
<template slot="proNode">标准法规部领导审批</template> <template slot="proNode">标准法规部领导审批</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
@@ -40,7 +40,8 @@
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
:key="item.id"> {{ item.name }} :key="item.id" @click="clickButtonToUpload2(item.id)">
{{ item.name }}
<i <i
title="下载" title="下载"
@click="downloadFile(item.id)" @click="downloadFile(item.id)"
@@ -382,6 +383,11 @@ export default {
}, e => { }, e => {
}); });
}, },
//点击预览
clickButtonToUpload2(file) {
const attId = file
this.$preview(attId)
},
/** /**
* @Description: 点击下载 * @Description: 点击下载
*/ */
@@ -110,65 +110,7 @@
</div> </div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-back show-back
@@ -246,65 +246,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -246,65 +246,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -246,65 +246,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -170,65 +170,7 @@
</div> </div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-back show-back
@@ -170,65 +170,7 @@
</div> </div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-back show-back
@@ -170,65 +170,7 @@
</div> </div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -170,65 +170,7 @@
</div> </div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -74,65 +74,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -74,65 +74,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -74,65 +74,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -178,65 +178,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -260,65 +260,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -260,65 +260,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -260,65 +260,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -190,65 +190,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-back show-back
@@ -190,65 +190,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
@@ -190,65 +190,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-back show-back
@@ -159,65 +159,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-back show-back
@@ -190,65 +190,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-back show-back
@@ -190,65 +190,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-back show-back
@@ -190,65 +190,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
height="100%"
ref="selection"
:data="detailData"
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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-back show-back
@@ -190,65 +190,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
width="130"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
width="130"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="130"
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="完成时间"
width="130"
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="流程信息"
width="130"
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> </div>
<ProcessFooter <ProcessFooter
show-transfer show-transfer
@@ -128,67 +128,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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="任务步骤"
min-width="130"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
min-width="130"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
min-width="130"
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"
min-width="130"
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>
</div> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
@@ -202,67 +202,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
min-width="130"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
min-width="130"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
min-width="130"
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="完成时间"
min-width="130"
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>
</div> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
@@ -136,67 +136,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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="任务步骤"
min-width="130"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
min-width="130"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
min-width="130"
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"
min-width="130"
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>
</div> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
@@ -136,67 +136,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
min-width="130"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
min-width="130"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
min-width="130"
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="完成时间"
min-width="130"
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>
</div> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
@@ -136,67 +136,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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="任务步骤"
min-width="130"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
min-width="130"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
min-width="130"
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="完成时间"
min-width="130"
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>
</div> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
@@ -136,67 +136,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-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"
min-width="130"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
min-width="130"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
min-width="130"
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="完成时间"
min-width="130"
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>
</div> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
@@ -197,7 +197,7 @@
label="标准名称" label="标准名称"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</span> <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName|| scope.row.standEnName || scope.row.lawsName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -334,14 +334,14 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrq" prop="zccssrqgj"
sortable sortable
width="210px" width="210px"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrqgj"
sortable sortable
align="center" align="center"
width="210px" width="210px"
@@ -457,17 +457,17 @@
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="在产车实施日期" prop="zccssrq"> <el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker <el-date-picker
v-model.trim="editRowData.zccssrq" v-model.trim="editRowData.zccssrqgj"
type="dates" type="dates"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期" prop="xcxssrq"> <el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker <el-date-picker
v-model.trim="editRowData.xcxssrq" v-model.trim="editRowData.xcxssrqgj"
type="dates" type="dates"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期"> placeholder="选择日期">
@@ -503,31 +503,30 @@
</div> </div>
</template> </template>
<script> <script>
import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandards' import CustomInputForStandards from "@/components/CustomFormComponents/InputForStandards";
import CustomInputForStandardsForeign from '@/components/CustomFormComponents/InputForStandardsForForeign' import CustomInputForStandardsForeign from "@/components/CustomFormComponents/InputForStandardsForForeign";
import CustomInput from '@/components/CustomFormComponents/Input' import CustomInput from "@/components/CustomFormComponents/Input";
import CustomTextarea from '@/components/CustomFormComponents/Textarea' import CustomTextarea from "@/components/CustomFormComponents/Textarea";
import CustomSearchSelect from '@/components/CustomFormComponents/SearchSelect' import CustomSearchSelect from "@/components/CustomFormComponents/SearchSelect";
import CustomSelect from '@/components/CustomFormComponents/Select' import CustomSelect from "@/components/CustomFormComponents/Select";
import CustomDatePick from '@/components/CustomFormComponents/DatePicker' import CustomDatePick from "@/components/CustomFormComponents/DatePicker";
import CustomFile from '@/components/CustomFormComponents/File' import CustomFile from "@/components/CustomFormComponents/File";
import CustomInputNum from '@/components/CustomFormComponents/InputNum' import CustomInputNum from "@/components/CustomFormComponents/InputNum";
import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup' import CustomDatePickGroup from "@/components/CustomFormComponents/DatePickerGroup";
import CustomSelectArray from '@/components/CustomFormComponents/SelectArray' import CustomSelectArray from "@/components/CustomFormComponents/SelectArray";
import TreePopover from '@/components/CustomFormComponents/TreePopover' import TreePopover from "@/components/CustomFormComponents/TreePopover";
import CustomOrg from '@/components/CustomFormComponents/OrgTree' import CustomOrg from "@/components/CustomFormComponents/OrgTree";
import CustomEopDatePick from '@/components/CustomFormComponents/DatePickerWithText' import CustomEopDatePick from "@/components/CustomFormComponents/DatePickerWithText";
import CustomDatePickWithText, {formatText} from '@/components/CustomFormComponents/DatePickerGroupWithText' import CustomDatePickWithText, { formatText } from "@/components/CustomFormComponents/DatePickerGroupWithText";
import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import CustomSVPPS from "@/components/CustomFormComponents/SVPPS";
import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy' import CustomInputForPolicy from "@/components/CustomFormComponents/InputForPolicy";
import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import CustomRoleTree from "@/components/CustomFormComponents/roleTree";
import stand from "../../../config/pages/attributeCustom/components/stand"; import { mapGetters } from "vuex";
import {mapGetters} from 'vuex' import { dicTypeData, StandardsInfoPage } from "@/api/unqualProcess";
import {dicTypeData, StandardsInfoPage} from '@/api/unqualProcess' import { interfaceUrl } from "@/sysConfig";
import {interfaceUrl} from "@/sysConfig";
export default { export default {
name: 'ListOfStandardsAndRegulationsDetails', name: "ListOfStandardsAndRegulationsDetails",
components: { components: {
CustomFile, CustomFile,
CustomInput, CustomInput,
@@ -1170,19 +1169,19 @@ export default {
// //
for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
// //
if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){ if (this.selectedAccInfoSearchList[i].typeApplicable === "[]"){
this.selectedAccInfoSearchList[i].typeApplicable = null this.selectedAccInfoSearchList[i].typeApplicable = null
} }
// //
if (this.selectedAccInfoSearchList[i].nylx === '[]'){ if (this.selectedAccInfoSearchList[i].nylx === "[]"){
this.selectedAccInfoSearchList[i].nylx = null this.selectedAccInfoSearchList[i].nylx = null
} }
// //
if (this.selectedAccInfoSearchList[i].zrbm === '[]'){ if (this.selectedAccInfoSearchList[i].zrbm === "[]"){
this.selectedAccInfoSearchList[i].zrbm = null this.selectedAccInfoSearchList[i].zrbm = null
} }
//线 //线
if (this.selectedAccInfoSearchList[i].sycpx === '[]'){ if (this.selectedAccInfoSearchList[i].sycpx === "[]"){
this.selectedAccInfoSearchList[i].sycpx = null this.selectedAccInfoSearchList[i].sycpx = null
} }
} }
@@ -1200,6 +1199,38 @@ export default {
this.$message.warning('请勿添加重复数据') this.$message.warning('请勿添加重复数据')
} else { } else {
this.sarAccessInfoList.push(item) this.sarAccessInfoList.push(item)
this.sarAccessInfoList.forEach(item => {
this.$set(item, 'xcxssrqgj', item.xcxssrq)
this.$set(item, 'zccssrqgj', item.zccssrq)
if(item.attrInfoCaseMap !== undefined){
this.$set(item, 'typeApplicable', item.attrInfoCaseMap.cllx)
this.$set(item, 'nylx', item.attrInfoCaseMap.nylx)
}
//
if (item.nylx !== null) {
let k = (item.nylx || "").split(",");
for (let i in this.applyArcticOptions) {
for (let m = 0; m < k.length; m++) {
if (this.applyArcticOptions[i].value === k[m]) {
k[m] = this.applyArcticOptions[i].label;
}
item.nylx = k.join(",");
}
}
}
//
if (item.typeApplicable !== null) {
let k = (item.typeApplicable || "").split(",");
for (let i in this.energyKindOptions) {
for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label;
}
item.typeApplicable = k.join(",");
}
}
}
})
// this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection() this.$refs.searchTable.clearSelection()
@@ -1236,40 +1267,48 @@ export default {
}, },
// //
editTghisRow(row) { editTghisRow(row) {
console.log(row);
// //
localStorage.setItem('obj', JSON.stringify(row)) localStorage.setItem("obj", JSON.stringify(row));
this.rowList = row this.rowList = row;
this.editRowData = this.rowList this.editRowData = this.rowList;
if (this.editRowData.ssrq !== null) { if (this.editRowData.ssrq === "-") {
this.editRowData.ssrq = this.editRowData.ssrq.split(',') this.editRowData.ssrq = "";
} else if (this.editRowData.ssrq !== null && this.editRowData.ssrq !== "-" && this.editRowData.ssrq !== "") {
this.editRowData.ssrq = this.editRowData.ssrq.split(",");
} }
if (this.editRowData.zccssrq !== null) { if (this.editRowData.zccssrqgj === "-") {
this.editRowData.zccssrq = this.editRowData.zccssrq.split(',') this.editRowData.zccssrqgj = "";
} else if (this.editRowData.zccssrqgj !== null && this.editRowData.zccssrqgj !== "-" && this.editRowData.zccssrqgj !== "") {
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(",");
} }
if (this.editRowData.xcxssrq !== null) { if (this.editRowData.xcxssrqgj === "-") {
this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',') this.editRowData.xcxssrqgj = "";
} else if (this.editRowData.xcxssrqgj !== null && this.editRowData.xcxssrqgj !== "-" && this.editRowData.xcxssrqgj !== " ") {
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(",");
} }
this.drawerEdit = true this.drawerEdit = true;
}, },
// //
cancelInfo() { cancelInfo() {
let Item = JSON.parse(localStorage.getItem('obj')) let Item = JSON.parse(localStorage.getItem('obj'))
this.editRowData.ssrq = Item.ssrq this.editRowData.ssrq = Item.ssrq
this.editRowData.xcxssrq = Item.xcxssrq this.editRowData.xcxssrqgj = Item.xcxssrqgj
this.editRowData.zccssrq = Item.zccssrq this.editRowData.zccssrqgj = Item.zccssrqgj
this.drawerEdit = false this.drawerEdit = false
}, },
// //
saveInfo() { saveInfo() {
if (this.editRowData.ssrq !== null) { console.log(this.editRowData);
if (this.editRowData.ssrq !== '') {
this.editRowData.ssrq = this.editRowData.ssrq.join(',') this.editRowData.ssrq = this.editRowData.ssrq.join(',')
} }
if (this.editRowData.xcxssrq !== null){ if (this.editRowData.xcxssrqgj !== ''){
this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',') this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
} }
if (this.editRowData.zccssrq !== null){ if (this.editRowData.zccssrqgj !== ''){
this.editRowData.zccssrq = this.editRowData.zccssrq.join(',') this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
} }
this.drawerEdit = false this.drawerEdit = false
}, },
@@ -1344,15 +1383,15 @@ export default {
} else { } else {
rowlist1.push(this.sarAccessInfoList[i].ssrq) rowlist1.push(this.sarAccessInfoList[i].ssrq)
} }
if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) { if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-') rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
} else { } else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrq) rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
} }
if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) { if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-') rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
} else { } else {
rowlist2.push(this.sarAccessInfoList[i].zccssrq) rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
} }
} }
console.log(rowlist1) console.log(rowlist1)
@@ -2024,6 +2063,7 @@ export default {
getData() { getData() {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', { this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
id: this.zqaId, id: this.zqaId,
types: '1',
page: this.page, page: this.page,
Size: this.Size Size: this.Size
}, { }, {
@@ -2032,12 +2072,23 @@ export default {
if (res.ok) { if (res.ok) {
this.sarAccessInfoList = res.data.records this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.map(item => { this.sarAccessInfoList.map(item => {
if (item.nylx === "[]") {
item.nylx = "";
}
if (item.zrbm === "[]") {
item.zrbm = "";
}
if (item.sycpx === "[]") {
item.sycpx = "";
}
if (item.typeApplicable === "[]") {
item.typeApplicable = "";
}
if (item.standYear === null) { if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber item.standNumber = item.standSortShow + " " + item.standNumber;
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
} }
console.log(item.standNumber)
}) })
} }
}) })
@@ -2076,10 +2127,12 @@ export default {
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
}, res => { }, res => {
console.log('能源类型',res.data.NYLXCLASS);
console.log('适用车型',res.data.ENERGYTYPES);
this.allSelectOptions = res.data || {} this.allSelectOptions = res.data || {}
this.regionOptions = res.data.REGION // list this.regionOptions = res.data.REGION // list
this.applyArcticOptions = res.data.PRODUCTTYPE // list this.applyArcticOptions = res.data.NYLXCLASS //
this.energyKindOptions = res.data.ENERGYTYPES // list this.energyKindOptions = res.data.ENERGYTYPES //
this.CycxOptions = res.data.CLLX this.CycxOptions = res.data.CLLX
this.drawerCountryOptions = res.data.COUNTRY // list this.drawerCountryOptions = res.data.COUNTRY // list
this.applyOptions = res.data.COUNTRY //list this.applyOptions = res.data.COUNTRY //list
@@ -184,29 +184,19 @@
align="center" align="center"
sortable sortable
label="发布日期"> label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
sortable sortable
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrqgj" prop="zccssrq"
align="center" align="center"
sortable sortable
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -314,14 +304,14 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrqgj" prop="zccssrq"
sortable sortable
width="210px" width="210px"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
sortable sortable
align="center" align="center"
width="210px" width="210px"
@@ -457,17 +447,17 @@
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="在产车实施日期" prop="zccssrqgj"> <el-form-item label="在产车实施日期" prop="zccssrq">
<el-date-picker <el-date-picker
v-model.trim="editRowData.zccssrqgj" v-model.trim="editRowData.zccssrq"
type="dates" type="dates"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期" prop="xcxssrqgj"> <el-form-item label="新车型实施日期" prop="xcxssrq">
<el-date-picker <el-date-picker
v-model.trim="editRowData.xcxssrqgj" v-model.trim="editRowData.xcxssrq"
type="dates" type="dates"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期"> placeholder="选择日期">
@@ -576,8 +566,8 @@ export default {
typeApplicable: '', typeApplicable: '',
nylx: '', nylx: '',
ssrq: '', ssrq: '',
zccssrqgj: '', zccssrq: '',
xcxssrqgj: '', xcxssrq: '',
zrbm: '', zrbm: '',
sycpx: '', sycpx: '',
cycvppsbm: '', cycvppsbm: '',
@@ -1237,11 +1227,11 @@ export default {
if (this.editRowData.ssrq !== null) { if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.split(',') this.editRowData.ssrq = this.editRowData.ssrq.split(',')
} }
if (this.editRowData.zccssrqgj !== null) { if (this.editRowData.zccssrq !== null) {
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',') this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
} }
if (this.editRowData.xcxssrqgj !== null) { if (this.editRowData.xcxssrq !== null) {
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',') this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
} }
this.drawerEdit = true this.drawerEdit = true
}, },
@@ -1249,8 +1239,8 @@ export default {
cancelInfo() { cancelInfo() {
let Item = JSON.parse(localStorage.getItem('obj')) let Item = JSON.parse(localStorage.getItem('obj'))
this.editRowData.ssrq = Item.ssrq this.editRowData.ssrq = Item.ssrq
this.editRowData.xcxssrqgj = Item.xcxssrqgj this.editRowData.xcxssrq = Item.xcxssrq
this.editRowData.zccssrqgj = Item.zccssrqgj this.editRowData.zccssrq = Item.zccssrq
this.drawerEdit = false this.drawerEdit = false
}, },
// //
@@ -1258,11 +1248,11 @@ export default {
if (this.editRowData.ssrq !== null) { if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.join(',') this.editRowData.ssrq = this.editRowData.ssrq.join(',')
} }
if (this.editRowData.xcxssrqgj !== null){ if (this.editRowData.xcxssrq !== null){
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',') this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
} }
if (this.editRowData.zccssrqgj !== null){ if (this.editRowData.zccssrq !== null){
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',') this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
} }
this.drawerEdit = false this.drawerEdit = false
}, },
@@ -1336,15 +1326,15 @@ export default {
} else { } else {
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString()) rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
} }
if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) { if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-') rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-')
} else { } else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) rowlist3.push(this.sarAccessInfoList[i].xcxssrq.toString())
} }
if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) { if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-') rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-')
} else { } else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) rowlist2.push(this.sarAccessInfoList[i].zccssrq.toString())
} }
} }
rowlist = rowlist.join(',') rowlist = rowlist.join(',')
@@ -241,29 +241,19 @@
sortable sortable
align="center" align="center"
label="发布日期"> label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
sortable sortable
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrqgj" prop="zccssrq"
sortable sortable
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -372,14 +362,14 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrqgj" prop="zccssrq"
sortable sortable
width="210px" width="210px"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
sortable sortable
align="center" align="center"
width="210px" width="210px"
@@ -494,17 +484,17 @@
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="在产车实施日期" prop="zccssrqgj"> <el-form-item label="在产车实施日期" prop="zccssrq">
<el-date-picker <el-date-picker
v-model.trim="editRowData.zccssrqgj" v-model.trim="editRowData.zccssrq"
type="dates" type="dates"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期" prop="xcxssrqgj"> <el-form-item label="新车型实施日期" prop="xcxssrq">
<el-date-picker <el-date-picker
v-model.trim="editRowData.xcxssrqgj" v-model.trim="editRowData.xcxssrq"
type="dates" type="dates"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期"> placeholder="选择日期">
@@ -631,8 +621,8 @@ export default {
syrz: '', syrz: '',
nylx: '', nylx: '',
ssrq: '', ssrq: '',
zccssrqgj: '', zccssrq: '',
xcxssrqgj: '', xcxssrq: '',
zrbm: '', zrbm: '',
sycpx: '', sycpx: '',
cycvppsbm: '', cycvppsbm: '',
@@ -1207,11 +1197,11 @@ export default {
if (this.editRowData.ssrq !== null) { if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.split(',') this.editRowData.ssrq = this.editRowData.ssrq.split(',')
} }
if (this.editRowData.zccssrqgj !== null) { if (this.editRowData.zccssrq !== null) {
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',') this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
} }
if (this.editRowData.xcxssrqgj !== null) { if (this.editRowData.xcxssrq !== null) {
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',') this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
} }
this.drawerEdit = true this.drawerEdit = true
}, },
@@ -1219,8 +1209,8 @@ export default {
cancelInfo() { cancelInfo() {
let Item = JSON.parse(localStorage.getItem('obj')) let Item = JSON.parse(localStorage.getItem('obj'))
this.editRowData.ssrq = Item.ssrq this.editRowData.ssrq = Item.ssrq
this.editRowData.xcxssrqgj = Item.xcxssrqgj this.editRowData.xcxssrq = Item.xcxssrq
this.editRowData.zccssrqgj = Item.zccssrqgj this.editRowData.zccssrq = Item.zccssrq
this.drawerEdit = false this.drawerEdit = false
}, },
// //
@@ -1228,11 +1218,11 @@ export default {
if (this.editRowData.ssrq !== null) { if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.join(',') this.editRowData.ssrq = this.editRowData.ssrq.join(',')
} }
if (this.editRowData.xcxssrqgj !== null){ if (this.editRowData.xcxssrq !== null){
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',') this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
} }
if (this.editRowData.zccssrqgj !== null){ if (this.editRowData.zccssrq !== null){
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',') this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
} }
this.drawerEdit = false this.drawerEdit = false
}, },
@@ -1307,15 +1297,15 @@ export default {
} else { } else {
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString()) rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
} }
if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) { if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-') rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-')
} else { } else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) rowlist3.push(this.sarAccessInfoList[i].xcxssrq.toString())
} }
if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) { if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-') rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-')
} else { } else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) rowlist2.push(this.sarAccessInfoList[i].zccssrq.toString())
} }
} }
rowlist = rowlist.join(',') rowlist = rowlist.join(',')