Merge branch 'develop' into 'FOTON'
Develop See merge request LAWS/laws-system-front-FOTON!266
This commit is contained in:
王夏晖
@@ -150,7 +150,7 @@
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.applyArctic.toString() }}
|
||||
{{ JSON.parse(scope.row.applyArctic).join(',') }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.applyArctic.toString() }}
|
||||
{{ JSON.parse(scope.row.applyArctic).join(',') }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.applyArctic.toString() }}
|
||||
{{ JSON.parse(scope.row.applyArctic).join(',') }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.applyArctic.toString() }}
|
||||
{{ JSON.parse(scope.row.applyArctic).join(',') }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.applyArctic.toString() }}
|
||||
{{ JSON.parse(scope.row.applyArctic).join(',') }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
||||
@@ -43,6 +43,16 @@
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
|
||||
<el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="(item, index) in textTypeList"
|
||||
:key="index"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
|
||||
<div class="addButton" style="padding-left: 10px">
|
||||
<el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
|
||||
@@ -51,7 +61,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div style="">
|
||||
<div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
|
||||
<span @click="fileLook(item)" >{{ item.fileName }}</span>
|
||||
<el-button
|
||||
@@ -366,6 +376,7 @@ export default {
|
||||
name: "bzzqyjStep1-1",
|
||||
data() {
|
||||
return {
|
||||
textTypeList: [],
|
||||
pickerOptions: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
|
||||
@@ -397,7 +408,6 @@ export default {
|
||||
standId: '',
|
||||
fjList: [],
|
||||
fjListId: '',
|
||||
fjListId: '',
|
||||
textType: '',
|
||||
modelList: [],
|
||||
modelNameList: ''
|
||||
@@ -411,6 +421,9 @@ export default {
|
||||
],
|
||||
fjListId: [
|
||||
{required: true, message: '请选择附件', trigger: 'change'},
|
||||
],
|
||||
textType: [
|
||||
{required: true, message: '请选择文本状态', trigger: 'change'},
|
||||
]
|
||||
},
|
||||
// 标准征求意见数据可库
|
||||
@@ -418,6 +431,7 @@ export default {
|
||||
standSort: '',
|
||||
standNumber: '',
|
||||
standType: '',
|
||||
standId: '',
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent
|
||||
},
|
||||
@@ -598,19 +612,9 @@ export default {
|
||||
}
|
||||
}
|
||||
})
|
||||
// this.$http.get('lawss/sarStandFile/queryFileInfo', {
|
||||
// standId: this.form.standId
|
||||
// }, {}, res => {
|
||||
// this.fjList = res.data
|
||||
// this.fzlistModel = true
|
||||
// })
|
||||
},
|
||||
handleSelection2(data) {
|
||||
if (data.length > 1) {
|
||||
this.$message.warning('最多选择1条附件')
|
||||
} else {
|
||||
this.addFjList = data
|
||||
}
|
||||
this.addFjList = data
|
||||
},
|
||||
closeDrawer2() {
|
||||
this.fzlistModel = false
|
||||
@@ -619,16 +623,18 @@ export default {
|
||||
enterDrawer2() {
|
||||
this.fzlistModel = false
|
||||
this.form.fjList = this.addFjList
|
||||
this.form.textType = this.setWBType(this.addFjList[0].standFileClassify)
|
||||
this.form.textValue = this.addFjList[0].standFileClassify
|
||||
let idList = []
|
||||
let nameList = []
|
||||
this.addFjList.forEach(item => {
|
||||
idList.push(item.id)
|
||||
nameList.push(item.fileName)
|
||||
if (nameList.length > 0) {
|
||||
nameList += ','
|
||||
idList += ','
|
||||
}
|
||||
idList += item.id
|
||||
nameList += item.fileName
|
||||
})
|
||||
this.form.fjListName = nameList.join(',')
|
||||
this.form.fjListId = idList.join(',')
|
||||
this.form.fjListName = nameList
|
||||
this.form.fjListId = idList
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
@@ -681,7 +687,7 @@ export default {
|
||||
sarStandCompareHis() {
|
||||
this.spinShow = true
|
||||
var formData = this.standCommonlySearch
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', formData, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.standInfoList = res.data.list
|
||||
@@ -725,7 +731,14 @@ export default {
|
||||
} else {
|
||||
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
|
||||
}
|
||||
this.form.standType = bringData[0].standType
|
||||
this.form.standId = bringData[0].id
|
||||
this.listModel = false;
|
||||
this.$http.get('SarStandItems/sar-stand-items/getFileType', {
|
||||
standId: bringData[0].id
|
||||
}, {}, res => {
|
||||
this.textTypeList = res.data
|
||||
})
|
||||
} else if (this.selectedList.length > 1) {
|
||||
this.$message.warning("只能选择一条数据进行带入");
|
||||
} else {
|
||||
@@ -747,7 +760,7 @@ export default {
|
||||
})
|
||||
if (this.type2 === '1') {
|
||||
this.roleForm.dockUserList = idList
|
||||
this.roleForm.dockUserName = nameList
|
||||
this.roleForm.dockUserListName = nameList
|
||||
} else {
|
||||
this.roleForm.directorUser = idList
|
||||
this.roleForm.directorUserName = nameList
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
@@ -43,6 +43,16 @@
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
|
||||
<el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="(item, index) in textTypeList"
|
||||
:key="index"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
|
||||
<div class="addButton" style="padding-left: 10px">
|
||||
<el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
|
||||
@@ -51,7 +61,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div style="">
|
||||
<div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
|
||||
<span @click="fileLook(item)" >{{ item.fileName }}</span>
|
||||
<el-button
|
||||
@@ -374,6 +384,7 @@ export default {
|
||||
name: "bzzqyjStep1",
|
||||
data() {
|
||||
return {
|
||||
textTypeList: [],
|
||||
drawerTitle2: '',
|
||||
type2: '',
|
||||
pickerOptions: {
|
||||
@@ -407,7 +418,6 @@ export default {
|
||||
fjList: [],
|
||||
fjListName: '',
|
||||
fjListId: '',
|
||||
textValue: '',
|
||||
textType: '',
|
||||
modelList: [],
|
||||
modelNameList: ''
|
||||
@@ -421,6 +431,9 @@ export default {
|
||||
],
|
||||
fjListId: [
|
||||
{required: true, message: '请选择附件', trigger: 'change'},
|
||||
],
|
||||
textType: [
|
||||
{required: true, message: '请选择文本状态', trigger: 'change'},
|
||||
]
|
||||
},
|
||||
// 标准征求意见数据可库
|
||||
@@ -608,19 +621,9 @@ export default {
|
||||
}
|
||||
}
|
||||
})
|
||||
// this.$http.get('lawss/sarStandFile/queryFileInfo', {
|
||||
// standId: this.form.standId
|
||||
// }, {}, res => {
|
||||
// this.fjList = res.data
|
||||
// this.fzlistModel = true
|
||||
// })
|
||||
},
|
||||
handleSelection2(data) {
|
||||
if (data.length > 1) {
|
||||
this.$message.warning('最多选择1条附件')
|
||||
} else {
|
||||
this.addFjList = data
|
||||
}
|
||||
this.addFjList = data
|
||||
},
|
||||
closeDrawer2() {
|
||||
this.fzlistModel = false
|
||||
@@ -629,16 +632,18 @@ export default {
|
||||
enterDrawer2() {
|
||||
this.fzlistModel = false
|
||||
this.form.fjList = this.addFjList
|
||||
this.form.textType = this.setWBType(this.addFjList[0].standFileClassify)
|
||||
this.form.textValue = this.addFjList[0].standFileClassify
|
||||
let idList = []
|
||||
let nameList = []
|
||||
this.addFjList.forEach(item => {
|
||||
idList.push(item.id)
|
||||
nameList.push(item.fileName)
|
||||
if (nameList.length > 0) {
|
||||
nameList += ','
|
||||
idList += ','
|
||||
}
|
||||
idList += item.id
|
||||
nameList += item.fileName
|
||||
})
|
||||
this.form.fjListName = nameList.join(',')
|
||||
this.form.fjListId = idList.join(',')
|
||||
this.form.fjListName = nameList
|
||||
this.form.fjListId = idList
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
@@ -729,9 +734,8 @@ export default {
|
||||
this.listModel = false;
|
||||
this.$http.get('SarStandItems/sar-stand-items/getFileType', {
|
||||
standId: bringData[0].id
|
||||
}, res => {
|
||||
console.log(data);
|
||||
console.log(res.data);
|
||||
}, {}, res => {
|
||||
this.textTypeList = res.data
|
||||
})
|
||||
} else if (this.selectedList.length > 1) {
|
||||
this.$message.warning("只能选择一条数据进行带入");
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div style="">
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
@@ -659,6 +659,7 @@
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
this.options = res.data.list
|
||||
console.log(res);
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
@@ -691,7 +692,7 @@
|
||||
this.form.endTime = data.endTime || data.form.endTime
|
||||
this.todoId = res.id
|
||||
this.json = data
|
||||
this.getItemList(data.standId,this.form.textValue)
|
||||
this.getItemList(data.standId,data.textType)
|
||||
this.data = data.info || data.data || data.form.data || []
|
||||
}).catch(e => {
|
||||
})
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
@@ -664,7 +664,7 @@ export default {
|
||||
this.form.spId = data.spId || ''
|
||||
this.form.spName = data.spName || ''
|
||||
this.json = data
|
||||
this.getItemList(data.standId,this.form.textValue)
|
||||
this.getItemList(data.standId,data.textType)
|
||||
this.data = data.info || data.data
|
||||
}).catch(e => {
|
||||
})
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
v-model="form.fjListId"
|
||||
style="display: none;"
|
||||
></el-input>
|
||||
<div style="display: flex;">
|
||||
<div>
|
||||
<div class="fileClass"
|
||||
style="margin-right: 15px;padding-left: 10px"
|
||||
v-for="(item, index) in form.fjList"
|
||||
|
||||
@@ -208,12 +208,15 @@
|
||||
<!-- 保存||提交-->
|
||||
<ProcessFooter
|
||||
v-show="verifySarStandard"
|
||||
show-save
|
||||
show-submit
|
||||
:saveLoading="saveLoading"
|
||||
:show-save="false"
|
||||
show-over2
|
||||
show-submit2
|
||||
show-transfer
|
||||
:submitLoading="isSubmit"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@transfer="handleTransfer"
|
||||
@submit2="handle2"
|
||||
@over2="handle1"
|
||||
>
|
||||
</ProcessFooter>
|
||||
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
|
||||
@@ -352,6 +355,13 @@
|
||||
@checkedRole="checkedRole"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<Role-tree
|
||||
check-box
|
||||
:is-title="drawerTitle"
|
||||
:is-visible.sync="drawerModal"
|
||||
@checkedRole="checkedRoleTransfer"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<!-- <el-drawer-->
|
||||
<!-- :title="drawerTitle"-->
|
||||
<!-- :visible.sync="modalShowFlag"-->
|
||||
@@ -560,7 +570,7 @@
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
|
||||
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
|
||||
import {getEvaluationIndex} from "api/businessApi";
|
||||
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
||||
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
|
||||
@@ -2310,6 +2320,37 @@
|
||||
this.rules.commentText[0].required = true;
|
||||
}
|
||||
},
|
||||
checkedRoleTransfer (data) {
|
||||
this.assigneeNewLoading = true
|
||||
changeAssigneeNew({
|
||||
taskId: this.$route.query.taskIds, // 任务id
|
||||
userId:this.$store.getters.userInfo.userId, // 委托人
|
||||
assignee: data[0].id, // 被委托人
|
||||
pId: this.$route.query.prcId, // 流程实例
|
||||
}).then(res => {
|
||||
this.assigneeNewLoading = false
|
||||
if (res.success) {
|
||||
this.drawerModal = false
|
||||
this.$message.success('调整成功')
|
||||
this.processNum()
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
handleTransfer() {
|
||||
this.drawerModal = true
|
||||
this.drawerTitle = '转办处理人'
|
||||
},
|
||||
handle1(){
|
||||
this.formTongGuo.approvalOpinion = 1
|
||||
this.handleSubmit()
|
||||
},
|
||||
handle2(){
|
||||
this.formTongGuo.approvalOpinion = 0
|
||||
this.handleSubmit()
|
||||
},
|
||||
handleSubmit() {
|
||||
this.getRule()
|
||||
// const val= this.form.country;
|
||||
|
||||
@@ -314,13 +314,18 @@
|
||||
<ProcessFooter
|
||||
v-show="verifySarStandard"
|
||||
show-save
|
||||
show-submit
|
||||
:saveLoading="saveLoading"
|
||||
show-over2
|
||||
show-submit2
|
||||
show-transfer
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@submit="handleSubmit"
|
||||
@transfer="handleTransfer"
|
||||
@submit2="handle2"
|
||||
@over2="handle1"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</ProcessFooter>
|
||||
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
|
||||
<el-upload
|
||||
multiple
|
||||
@@ -457,6 +462,14 @@
|
||||
@checkedRole="checkedRole"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<!-- 福田全公司选人解决方案 -->
|
||||
<Role-tree
|
||||
check-box
|
||||
:is-title="drawerTitle"
|
||||
:is-visible.sync="drawerModal"
|
||||
@checkedRole="checkedRoleTransfer"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<!-- <el-drawer-->
|
||||
<!-- :title="drawerTitle"-->
|
||||
<!-- :visible.sync="modalShowFlag"-->
|
||||
@@ -665,7 +678,7 @@
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
|
||||
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
|
||||
import {getEvaluationIndex} from "api/businessApi";
|
||||
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
||||
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
|
||||
@@ -1383,6 +1396,25 @@
|
||||
this.roleForm.hqUserName=nameList;
|
||||
}
|
||||
},
|
||||
checkedRoleTransfer (data) {
|
||||
this.assigneeNewLoading = true
|
||||
changeAssigneeNew({
|
||||
taskId: this.$route.query.taskIds, // 任务id
|
||||
userId:this.$store.getters.userInfo.userId, // 委托人
|
||||
assignee: data[0].id, // 被委托人
|
||||
pId: this.$route.query.prcId, // 流程实例
|
||||
}).then(res => {
|
||||
this.assigneeNewLoading = false
|
||||
if (res.success) {
|
||||
this.drawerModal = false
|
||||
this.$message.success('调整成功')
|
||||
this.processNum()
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
checkedRole (data) {
|
||||
if (this.type === 0) {
|
||||
this.roleForm.deptUserId = data[0].id
|
||||
@@ -2234,6 +2266,22 @@
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
handleTransfer() {
|
||||
this.drawerModal = true
|
||||
this.drawerTitle = '转办处理人'
|
||||
},
|
||||
handle1(){
|
||||
this.formTongGuo.approvalOpinion = 1
|
||||
this.handleSubmit()
|
||||
},
|
||||
handle2(){
|
||||
this.formTongGuo.approvalOpinion = 0
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.handleSubmit()
|
||||
}
|
||||
})
|
||||
},
|
||||
//保存
|
||||
handleSave() {
|
||||
this.form.country=this.countryArr;
|
||||
|
||||
@@ -443,32 +443,34 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table
|
||||
:data="productData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
ref="projectTable"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
<div style="height: calc(100% - 65px); overflow: auto;">
|
||||
<el-table
|
||||
:data="productData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
ref="projectTable"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="selectThree"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productLine"
|
||||
label="产品线">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="uname"
|
||||
label="产品线责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@selection-change="selectThree"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productLine"
|
||||
label="产品线">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="uname"
|
||||
label="产品线责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<pagination
|
||||
:page="pageNo"
|
||||
|
||||
@@ -446,32 +446,34 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table
|
||||
:data="productData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
ref="projectTable"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
<div style="height: calc(100% - 65px); overflow: auto">
|
||||
<el-table
|
||||
:data="productData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
ref="projectTable"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="selectThree"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productLine"
|
||||
label="产品线">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="uname"
|
||||
label="产品线责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@selection-change="selectThree"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productLine"
|
||||
label="产品线">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="uname"
|
||||
label="产品线责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<pagination
|
||||
:page="pageNo"
|
||||
|
||||
@@ -759,6 +759,7 @@ export default {
|
||||
}
|
||||
}
|
||||
});
|
||||
this.$refs.table.clearSelection()
|
||||
this.projectModel = false;
|
||||
}
|
||||
|
||||
@@ -778,7 +779,7 @@ export default {
|
||||
this.selectList.map(item => {
|
||||
let index;
|
||||
index = this.breakdownList.findIndex(items => {
|
||||
return items.itemsName === item.itemsName;
|
||||
return items.itemsName === item.itemsName && items.projectName === item.projectName;
|
||||
});
|
||||
if (index > -1) {
|
||||
this.breakdownList.splice(index, 1);
|
||||
@@ -874,6 +875,7 @@ export default {
|
||||
//保存事件
|
||||
handleSave() {
|
||||
this.saveLoading = true;
|
||||
this.listForm.breakdownList = this.breakdownList;
|
||||
let _formData = new FormData();
|
||||
_formData.append("id", this.bpnId || "");
|
||||
_formData.append("prcType", "5");
|
||||
|
||||
@@ -731,6 +731,7 @@ export default {
|
||||
item.implementerId = this.$store.getters.userInfo.userId;
|
||||
item.implementer = this.$store.getters.userInfo.userName;
|
||||
});
|
||||
// this.commentText = ''
|
||||
this.dataList = item.step3DTOS;
|
||||
this.dataList.forEach(item => {
|
||||
this.$set(item,'complianceReasons', '')
|
||||
@@ -740,6 +741,7 @@ export default {
|
||||
})
|
||||
} else {
|
||||
this.dataList = item.dataList;
|
||||
// this.commentText = ''
|
||||
this.dataList.forEach(item => {
|
||||
item.implementerId = this.$store.getters.userInfo.userId;
|
||||
item.implementer = this.$store.getters.userInfo.userName;
|
||||
@@ -870,7 +872,7 @@ export default {
|
||||
saveBatchEditForm() {
|
||||
this.dataList.forEach(item => {
|
||||
this.selectList.forEach(items => {
|
||||
if (item.itemNum === items.itemNum) {
|
||||
if (item.itemNum === items.itemNum && item.projectName === items.projectName) {
|
||||
item.complianceReasons = this.batchEditForm.complianceReasons;
|
||||
//不合规
|
||||
item.noCompliance = this.batchEditForm.noCompliance;
|
||||
@@ -881,6 +883,7 @@ export default {
|
||||
}
|
||||
});
|
||||
});
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.modalShowFlag = false;
|
||||
},
|
||||
cancelBatchEditForm() {
|
||||
|
||||
@@ -568,6 +568,7 @@ export default {
|
||||
if(!this.commentText){
|
||||
this.$message.warning('请填写审批意见')
|
||||
}else{
|
||||
this.isSubmit = true
|
||||
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
|
||||
this.listForm.commentText = this.commentText;
|
||||
this.listForm.dataList = this.dataList
|
||||
@@ -584,6 +585,7 @@ export default {
|
||||
this.$message.success(res.message)
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
|
||||
@@ -553,6 +553,7 @@ export default {
|
||||
this.listForm.prcNum = this.prcNum
|
||||
this.listForm.prcName = this.prcName
|
||||
this.listForm.id = item.id
|
||||
// this.commentText = ''
|
||||
this.dataList = item.dataList
|
||||
})
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user