Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -410,7 +410,7 @@
|
||||
var fileSuffix = filename.substring(index1, index2)
|
||||
// const fileSuffix = file.name.split('.')[1] // 后缀名
|
||||
// 判断上传文件格式
|
||||
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
|
||||
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.PPTX' || fileSuffix === '.pptx') {
|
||||
return true
|
||||
} else {
|
||||
this.spinShow = false
|
||||
|
||||
@@ -402,7 +402,7 @@ export default {
|
||||
var fileSuffix = filename.substring(index1, index2)
|
||||
// const fileSuffix = file.name.split('.')[1] // 后缀名
|
||||
// 判断上传文件格式
|
||||
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
|
||||
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.PPTX' || fileSuffix === '.pptx') {
|
||||
return true
|
||||
} else {
|
||||
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
|
||||
|
||||
@@ -68,6 +68,7 @@
|
||||
<el-date-picker
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
:picker-options="pickerOptions"
|
||||
placeholder="请选择截止日期"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
@@ -553,6 +554,11 @@
|
||||
name: "bzjdStep1-1",
|
||||
data() {
|
||||
return {
|
||||
pickerOptions: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
|
||||
}
|
||||
},
|
||||
similarityDegree: '',
|
||||
leftData: [],
|
||||
rightData: [],
|
||||
|
||||
@@ -139,51 +139,51 @@
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
row-key="id"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="70"
|
||||
align="center">
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="70"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
label="条款名称"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
prop="itemsName"
|
||||
label="条款名称"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itermsConditions"
|
||||
label="条款内容"
|
||||
width="200"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
prop="itermsConditions"
|
||||
label="条款内容"
|
||||
width="200"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="technicalRequir"
|
||||
width="200"
|
||||
label="核心技术要求"
|
||||
align="center">
|
||||
show-overflow-tooltip
|
||||
prop="technicalRequir"
|
||||
width="200"
|
||||
v-if="!form.itemsNum1"
|
||||
label="核心技术要求"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
v-if="sarType === 'INLAND' && form.itemsNum1"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="基于上一版本差异"
|
||||
align="center">
|
||||
show-overflow-tooltip
|
||||
v-if="sarType === 'INLAND' && form.itemsNum1"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="基于上一版本差异"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
v-if="sarType === 'FOREIGN'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="相对于国行标差异点"
|
||||
align="center">
|
||||
show-overflow-tooltip
|
||||
v-if="sarType === 'FOREIGN'"
|
||||
prop="changePoint"
|
||||
width="150"
|
||||
label="相对于国行标差异点"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="complianceRequir"
|
||||
@@ -236,9 +236,18 @@
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
prop="zrUserIdName"
|
||||
prop="zrUserName"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
v-if="form.itemsNum1"
|
||||
width="140"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="审批意见">
|
||||
@@ -323,6 +332,16 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
<loading :loading="loading">加载中...</loading>
|
||||
<el-dialog
|
||||
title="查看比对内容"
|
||||
:visible.sync="BDmodel"
|
||||
size="1100px">
|
||||
<div>相似度:{{ similarityDegree }}</div>
|
||||
<div style="height: 600px;overflow: auto;display: flex;">
|
||||
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
|
||||
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -336,6 +355,11 @@ export default {
|
||||
name: "bzjdStep1-6",
|
||||
data() {
|
||||
return {
|
||||
similarityDegree: '',
|
||||
BDmodel: false,
|
||||
oldNumber: '',
|
||||
leftData: '',
|
||||
rightData: '',
|
||||
//折叠的标志，true为折叠，false为不折叠
|
||||
foldFormFlag: false,
|
||||
itermsConditionsFlag: false,
|
||||
@@ -366,6 +390,57 @@ export default {
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
getBDList () {
|
||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||
standHisId: this.oldNumber,
|
||||
leftOrRight: 'LEFT'
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
for (let b = 0; b < res.data.length; b++) {
|
||||
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
||||
this.itemList[a].itemsId = res.data[b].itemsId
|
||||
}
|
||||
}
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||
standHisId: this.oldNumber,
|
||||
leftOrRight: 'RIGHT'
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
for (let b = 0; b < res.data.length; b++) {
|
||||
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
||||
this.itemList[a].itemsId2 = res.data[b].itemsId
|
||||
}
|
||||
}
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
checkBD (id,id2) {
|
||||
let itemsEoPage = {
|
||||
oldItemId: id,
|
||||
newItemId: id2,
|
||||
flag: 1
|
||||
}
|
||||
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.data.leftString === '' && res.data.rightString === '') {
|
||||
this.$message.warning('暂无找到相似的文本')
|
||||
} else {
|
||||
this.leftData = res.data.leftString
|
||||
this.rightData = res.data.rightString
|
||||
this.BDmodel = true
|
||||
this.similarityDegree = res.data.similarityDegree
|
||||
}
|
||||
})
|
||||
},
|
||||
//折叠/展开基础信息方法
|
||||
foldForm() {
|
||||
this.foldFormFlag = !this.foldFormFlag
|
||||
@@ -418,12 +493,18 @@ export default {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||
if (data.form) {
|
||||
this.form.itemsName1 = data.form.itemsName1 || ''
|
||||
this.form.itemsNum1 = data.form.itemsNum1 || ''
|
||||
} else {
|
||||
this.form.itemsName1 = data.itemsName1 || ''
|
||||
this.form.itemsNum1 = data.itemsNum1 || ''
|
||||
}
|
||||
this.sarType = data.standInData || data.sarType
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
this.loading = false
|
||||
this.getBDList()
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
|
||||
@@ -69,6 +69,7 @@
|
||||
<el-date-picker
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
:picker-options="pickerOptions"
|
||||
placeholder="请选择截止日期"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
@@ -95,11 +96,14 @@
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="handleSelectionChange"
|
||||
row-key="id">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
@@ -563,6 +567,11 @@ export default {
|
||||
name: "bzjdStep1",
|
||||
data() {
|
||||
return {
|
||||
pickerOptions: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
|
||||
}
|
||||
},
|
||||
similarityDegree: '',
|
||||
leftData: [],
|
||||
rightData: [],
|
||||
|
||||
@@ -525,6 +525,7 @@
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
this.loading = false
|
||||
this.getBDList()
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
|
||||
@@ -396,21 +396,6 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
itemEdit (row) {
|
||||
this.itemId = row.id
|
||||
this.modalshowflag2 = true
|
||||
this.editForm = {
|
||||
technicalRequir: row.technicalRequir, // 核心技术要求
|
||||
changePoint: row.changePoint, // 国内标准的差异点
|
||||
complianceRequir: row.complianceRequir || '1', // 符合性要求
|
||||
complianceState: row.complianceState, // 合规性分析
|
||||
newData: row.newData, // 新车型实施日期
|
||||
onlineData: row.onlineData, // 在产车实施日期
|
||||
applyArctic: row.applyArctic, // 适用车型
|
||||
itemsId: row.itemsId,
|
||||
itemsId2: row.itemsId2
|
||||
}
|
||||
},
|
||||
handleTransfer() {
|
||||
this.drawerModal = true
|
||||
},
|
||||
@@ -524,6 +509,7 @@
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
this.loading = false
|
||||
this.getBDList()
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
|
||||
@@ -399,10 +399,7 @@ export default {
|
||||
{required: true, message: '请输入标准编号', trigger: 'change'},
|
||||
],
|
||||
endTime: [
|
||||
{required: true, message: '请输入标准结束日期', trigger: 'change'},
|
||||
],
|
||||
cname: [
|
||||
{required: true, message: '请输入标准名称', trigger: 'change'},
|
||||
{required: true, message: '请输入征求意见结束日期', trigger: 'change'},
|
||||
],
|
||||
fjListId: [
|
||||
{required: true, message: '请选择附件', trigger: 'change'},
|
||||
|
||||
@@ -410,7 +410,7 @@ export default {
|
||||
{required: true, message: '请输入标准编号', trigger: 'change'},
|
||||
],
|
||||
endTime: [
|
||||
{required: true, message: '请输入标准结束日期', trigger: 'change'},
|
||||
{required: true, message: '请输入征求意见结束日期', trigger: 'change'},
|
||||
],
|
||||
fjListId: [
|
||||
{required: true, message: '请选择附件', trigger: 'change'},
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
</el-table>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="审批意见">
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
</el-table>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="审批意见">
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
|
||||
@@ -892,13 +892,16 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
let standList = []
|
||||
this.breakdownList.forEach(item => {
|
||||
if (item.implementer) {
|
||||
standList.push(item);
|
||||
}
|
||||
});
|
||||
this.listForm.breakdownList = standList
|
||||
if(this.breakdownList < 1){
|
||||
this.$message.warning('请添加产品线数据')
|
||||
}else{
|
||||
let standList = [];
|
||||
this.breakdownList.forEach(item => {
|
||||
if (item.implementer) {
|
||||
standList.push(item);
|
||||
}
|
||||
});
|
||||
this.listForm.breakdownList = standList;
|
||||
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
|
||||
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
@@ -922,6 +925,7 @@ export default {
|
||||
this.isSubmit = false;
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
},
|
||||
drawerCheck(data) {
|
||||
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
|
||||
|
||||
@@ -774,28 +774,19 @@
|
||||
this.$refs['Form'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.get('lawss/activiti/startProcess', {
|
||||
type: '18'
|
||||
var json = Object.assign(this.rhform, this.roleForm)
|
||||
json.commentText = this.commentText
|
||||
json.data1 = this.data1
|
||||
json.data2 = this.data2
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: res.data,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
var json = Object.assign(this.rhform, this.roleForm)
|
||||
json.commentText = this.commentText
|
||||
json.data1 = this.data1
|
||||
json.data2 = this.data2
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: res.data,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('流程发起成功')
|
||||
this.$router.push('/processCenter')
|
||||
this.isSubmit = false
|
||||
} else {
|
||||
this.$message.warning('流程启动失败')
|
||||
this.isSubmit = false
|
||||
}
|
||||
})
|
||||
if (res.success) {
|
||||
this.$message.success('流程发起成功')
|
||||
this.$router.push('/processCenter')
|
||||
this.isSubmit = false
|
||||
} else {
|
||||
this.$message.warning('流程启动失败')
|
||||
this.isSubmit = false
|
||||
|
||||
@@ -752,28 +752,19 @@
|
||||
this.$refs['Form'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.get('lawss/activiti/startProcess', {
|
||||
type: '17'
|
||||
var json = Object.assign(this.rhform, this.roleForm)
|
||||
json.commentText = this.commentText
|
||||
json.data1 = this.data1
|
||||
json.data2 = this.data2
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: res.data,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
var json = Object.assign(this.rhform, this.roleForm)
|
||||
json.commentText = this.commentText
|
||||
json.data1 = this.data1
|
||||
json.data2 = this.data2
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: res.data,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('流程发起成功')
|
||||
this.$router.push('/processCenter')
|
||||
this.isSubmit = false
|
||||
} else {
|
||||
this.$message.warning('流程启动失败')
|
||||
this.isSubmit = false
|
||||
}
|
||||
})
|
||||
if (res.success) {
|
||||
this.$message.success('流程发起成功')
|
||||
this.$router.push('/processCenter')
|
||||
this.isSubmit = false
|
||||
} else {
|
||||
this.$message.warning('流程启动失败')
|
||||
this.isSubmit = false
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active == '1'">
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto">
|
||||
<process-title>
|
||||
<template slot="title">基础信息</template>
|
||||
|
||||
@@ -0,0 +1,464 @@
|
||||
<template>
|
||||
<div class="xmpg2-step3 phoneBox">
|
||||
<ProcessHeaderPhone toggle>
|
||||
<template slot="proName">项目合规评估流程-项目</template>
|
||||
<template slot="proNode">工程经理进行转办</template>
|
||||
</ProcessHeaderPhone>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto">
|
||||
<process-title>
|
||||
<template slot="title">基础信息</template>
|
||||
</process-title>
|
||||
<el-form
|
||||
:model="listForm"
|
||||
class="label-input-form prc-content-border"
|
||||
label-width="150px"
|
||||
>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.projectNumber"
|
||||
placeholder="请输入项目编号"
|
||||
disabled
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.projectName"
|
||||
disabled
|
||||
placeholder="请输入项目名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="架构经理" prop="jgUser" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.jgUserId"
|
||||
style="display: none"
|
||||
/>
|
||||
<el-input
|
||||
v-model="listForm.jgUser"
|
||||
placeholder="请选择架构经理"
|
||||
clearable
|
||||
@click.native="choiceZRR"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<process-title>
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
border
|
||||
ref="selection"
|
||||
height="70%"
|
||||
style="width: 100%; border:1px solid #ccc"
|
||||
@selection-change="selectStandChange"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standId"
|
||||
align="center"
|
||||
label="标准号"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a v-if="scope.row.standYear" class="table-jump"
|
||||
@click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
|
||||
}}-{{ scope.row.standYear }}</a>
|
||||
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
|
||||
{{ scope.row.standNumber }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
align="center"
|
||||
label="中文名称"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standEnName"
|
||||
label="英文名称"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="ssrq"
|
||||
align="center"
|
||||
label="标准实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="xcxssrq"
|
||||
width="190px"
|
||||
align="center"
|
||||
label="新车型实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="zccssrq"
|
||||
align="center"
|
||||
width="190px"
|
||||
label="在产车实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="zrbm"
|
||||
label="责任部门"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<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>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list" style="height: 100%">
|
||||
<Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
|
||||
</div>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-transfer
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:transfer-loading="isTransfer"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@transfer="handleTransfer"
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
</ProcessFooter>
|
||||
<phone-role
|
||||
:role-title="drawerTitle"
|
||||
:result-list="phoneRoleList"
|
||||
:is-show-phone.sync="modalshowflag"
|
||||
@checkedRole="drawerCheck"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew} from "api/process";
|
||||
|
||||
export default {
|
||||
name: "phoneXmpg2Step3",
|
||||
components: {
|
||||
ProcessHeaderPhone,
|
||||
ProcessTitle,
|
||||
ProcessFooter
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
isTransfer: false,
|
||||
// 调整处理人抽屉状态
|
||||
drawerModal: false,
|
||||
active: "1",
|
||||
loading: false,
|
||||
// 当前流程类型(1待办/2已办)
|
||||
processType: 1,
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
showColumn: true,
|
||||
drawerTitle: "", //drawer标题
|
||||
modalshowflag: false, // drawer开关
|
||||
selectList: [],
|
||||
treeData: [], // 人员数据
|
||||
roleForm: {
|
||||
jgUser: ""
|
||||
},
|
||||
nodeList: [],
|
||||
defaultProps: {
|
||||
children: "children",
|
||||
label: "name"
|
||||
},
|
||||
//表单的数据
|
||||
listForm: {
|
||||
jgUserId: '',
|
||||
projectNumber: "", //项目编号
|
||||
projectName: "", //项目名称
|
||||
jgUser: "", //架构经理
|
||||
dataList: [], //项目下的标准数据
|
||||
breakdownList: [] //标准下的分解单数据
|
||||
|
||||
},
|
||||
dataList: [], //展示的标准数据
|
||||
commentText: "", //审批意见
|
||||
detailData: [], //流程历史数据
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
phoneRoleList: [],
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
// 请求转换流程图
|
||||
processNum (row) {
|
||||
axios.request({
|
||||
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
|
||||
responseType: 'blob',
|
||||
method: 'get',
|
||||
params: {
|
||||
prcNum: this.$route.query.prcNum
|
||||
}
|
||||
}).then(res => {
|
||||
// let blob = new Blob([res.data], {type: 'image/jpg'})
|
||||
// let url = window.URL.createObjectURL(res.data)
|
||||
this.processStep = window.URL.createObjectURL(res.data)
|
||||
})
|
||||
},
|
||||
//转办事件
|
||||
handleTransfer(){
|
||||
this.phoneRoleList = [],
|
||||
this.modalshowflag = true
|
||||
this.drawerTitle = '转办处理人'
|
||||
},
|
||||
// 点击查看
|
||||
//查询项目下的标准
|
||||
getStandData() {
|
||||
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
|
||||
standType: this.standardSearch.standType,
|
||||
standNumber: this.standardSearch.standNumber,
|
||||
page: this.pageNo,
|
||||
pageSize: this.pageSizeNo
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.standardData = res.data.list;
|
||||
this.standardData.forEach(item => {
|
||||
if (item.attrInfoMap === null) {
|
||||
this.$set(item, "ZCCSSRQ", "");
|
||||
this.$set(item, "XCXSSRQ", "");
|
||||
} else {
|
||||
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
|
||||
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
|
||||
}
|
||||
});
|
||||
this.totalNo = res.data.count;
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
//tab改变
|
||||
handleTabs(type) {
|
||||
this.active = type;
|
||||
},
|
||||
//获取数据
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg);
|
||||
this.getFormFieldList(processForm);
|
||||
}
|
||||
}).catch(e => {
|
||||
});
|
||||
});
|
||||
},
|
||||
//动态表单读取
|
||||
getFormFieldList(item) {
|
||||
this.$nextTick(() => {
|
||||
this.listForm = JSON.parse(JSON.stringify(item));
|
||||
if (item.form === undefined) {
|
||||
this.listForm.prcNum = this.prcNum;
|
||||
this.listForm.prcName = this.prcName;
|
||||
this.listForm["id"] = item.id;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.dataList = item.dataList;
|
||||
this.dataList.forEach(item => {
|
||||
if(item.zrbm === "[]"){
|
||||
item.zrbm = ''
|
||||
}
|
||||
})
|
||||
this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
this.listForm.breakdownList = item.breakdownList;
|
||||
} else {
|
||||
this.listForm = item.form
|
||||
this.dataList = item.form.dataList
|
||||
}
|
||||
|
||||
});
|
||||
},
|
||||
//保存事件
|
||||
handleSave() {
|
||||
this.saveLoading = true;
|
||||
let _formData = new FormData();
|
||||
_formData.append("id", this.bpnId || "");
|
||||
_formData.append("prcType", "6");
|
||||
_formData.append("taskIds", this.taskIds);
|
||||
_formData.append("json", JSON.stringify({
|
||||
form: this.listForm,
|
||||
commentText: this.commentText
|
||||
}));
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false;
|
||||
this.$message.success("保存成功");
|
||||
this.bpnId = res.result;
|
||||
}).catch(e => {
|
||||
this.saveLoading = false;
|
||||
});
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
if (!this.listForm.jgUser) {
|
||||
this.$message.warning("请选择架构经理");
|
||||
} else {
|
||||
this.isSubmit = true;
|
||||
this.listForm.commentText = this.commentText;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
json: json
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false;
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
},
|
||||
choiceZRR() {
|
||||
this.drawerTitle = '选择架构经理'
|
||||
if (this.listForm.jgUserId.length > 0 ) {
|
||||
this.phoneRoleList = this.listForm.jgUserId.split(',')
|
||||
}
|
||||
this.modalshowflag = true;
|
||||
},
|
||||
//标准表格选择框改变
|
||||
selectStandChange(data) {
|
||||
this.selectList = data;
|
||||
},
|
||||
|
||||
drawerCheck(data) {
|
||||
if (this.drawerTitle = '选择架构经理') {
|
||||
if (data.length > 0) {
|
||||
this.listForm.jgUserId = data[0].id
|
||||
this.listForm.jgUser = data[0].name
|
||||
}
|
||||
} else {
|
||||
if (data.length > 0) {
|
||||
changeAssigneeNew({
|
||||
taskId: this.$route.query.taskIds, // 任务id
|
||||
assignee: data[0].id, // 被委托人
|
||||
userId: this.$store.getters.userInfo.userId, // 委托人
|
||||
pId: this.$route.query.prcId // 流程实例
|
||||
}).then(res => {
|
||||
this.isTransfer = false
|
||||
if (res.success) {
|
||||
this.$message.success('调整成功')
|
||||
this.$router.push("/processCenter");
|
||||
this.processNum()
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.getData();
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/phone';
|
||||
|
||||
.xmpg2-step3 {
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
|
||||
/deep/.van-dialog__content {
|
||||
min-height: 300px;
|
||||
padding: 10px;
|
||||
}
|
||||
.prc-content-border {
|
||||
overflow: auto;
|
||||
}
|
||||
/deep/.prc-content-border .el-form-item__content {
|
||||
width: 270px;
|
||||
}
|
||||
.choiceBtn {
|
||||
.el-button--primary {
|
||||
width: 150px;
|
||||
}
|
||||
}
|
||||
|
||||
position: relative;
|
||||
height: 100%;
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
overflow: auto;
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.accessStandardsAndRegulations {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -83,7 +83,7 @@
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -91,7 +91,7 @@
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
||||
Reference in New Issue
Block a user