Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -363,7 +363,7 @@
|
||||
this.sarType = data.standInData
|
||||
this.json = data
|
||||
this.itemList = data.itemList
|
||||
this.loading = true
|
||||
this.loading = false
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1057,6 +1057,7 @@ export default {
|
||||
if (valid) {
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
|
||||
_this: this
|
||||
}, res => {
|
||||
@@ -1072,6 +1073,7 @@ export default {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -208,7 +208,7 @@
|
||||
<!-- </el-card>-->
|
||||
<!-- </el-timeline-item>-->
|
||||
<el-timeline-item timestamp="根据会签意见修订" placement="top"
|
||||
:color="roleForm.ministerUser ? '#66b1ff' : ''">
|
||||
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
|
||||
<el-card>
|
||||
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
|
||||
<h4>标准/政策法规工程师</h4>
|
||||
@@ -1025,11 +1025,11 @@ export default {
|
||||
this.$message.warning("标准不能为空");
|
||||
} else {
|
||||
var json = Object.assign(this.listForm, this.roleForm);
|
||||
console.log(json)
|
||||
this.$refs["qdfbForm"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
|
||||
_this: this
|
||||
}, res => {
|
||||
@@ -1045,6 +1045,7 @@ export default {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -390,6 +390,7 @@ export default {
|
||||
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
|
||||
this.$message.warning("请填写会签意见");
|
||||
}else{
|
||||
this.isSubmit = true
|
||||
this.listForm.commentText = this.commentText;
|
||||
this.listForm.approvalOpinion = "";
|
||||
this.listForm.signFlag = "";
|
||||
@@ -405,6 +406,7 @@ export default {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
}, e => {
|
||||
|
||||
});
|
||||
|
||||
@@ -712,6 +712,7 @@ export default {
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.isSubmit = true
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
@@ -723,6 +724,7 @@ export default {
|
||||
this.$message.success(res.message)
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
},
|
||||
//标准表格选择框改变
|
||||
|
||||
@@ -404,6 +404,7 @@ export default {
|
||||
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
|
||||
this.$message.warning("请填写审批意见");
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
this.listForm.commentText = this.commentText;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
@@ -417,6 +418,7 @@ export default {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
@@ -234,7 +234,7 @@ import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import { roleTreeData } from "@/api/unqualProcess.js"
|
||||
import {completeTask, inboundLiaisonDetail, saveinboundTask} from "@/api/process.js"
|
||||
import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js"
|
||||
|
||||
export default {
|
||||
name: "wfhxzgStep2",
|
||||
@@ -373,10 +373,10 @@ export default {
|
||||
_formData.append('taskIds', this.taskIds)
|
||||
_formData.append('json', JSON.stringify({
|
||||
// roleForm: this.roleForm,
|
||||
itemsList: this.dataList,
|
||||
standardInfoList: this.dataList,
|
||||
commentText: this.commentText
|
||||
}))
|
||||
saveinboundTask(_formData).then(res => {
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
this.$message.success('保存成功')
|
||||
this.bpnId = res.result
|
||||
@@ -388,7 +388,7 @@ export default {
|
||||
handleSubmit() {
|
||||
this.isSubmit = true
|
||||
let zqa = new Map();
|
||||
for (let lastDataListElement of this.lastDataList) {
|
||||
for (let lastDataListElement of this.dataList) {
|
||||
let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
|
||||
if( a == null){
|
||||
a = {
|
||||
|
||||
@@ -241,7 +241,7 @@
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {completeTask, inboundLiaisonDetail} from "@/api/process.js";
|
||||
import {completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js";
|
||||
|
||||
export default {
|
||||
name: "wfhxzgStep3",
|
||||
@@ -405,7 +405,41 @@ export default {
|
||||
window.open(routeUrl.href, '_blank')
|
||||
},
|
||||
// 保存按钮
|
||||
handleSave() {},
|
||||
handleSave() {
|
||||
this.isSubmit = true
|
||||
let zqa = new Map();
|
||||
for (let lastDataListElement of this.dataList) {
|
||||
let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
|
||||
if( a == null){
|
||||
a = {
|
||||
id: lastDataListElement.dutyPeopleInfoId,
|
||||
name: lastDataListElement.dutyPeopleInfo,
|
||||
standardInfoList: []
|
||||
}
|
||||
}
|
||||
a.standardInfoList.push(lastDataListElement);
|
||||
zqa.set(a.id, a);
|
||||
}
|
||||
let list = [];
|
||||
for(let item of zqa) {
|
||||
list.push(item[1])
|
||||
}
|
||||
this.saveLoading = true
|
||||
let _formData = new FormData()
|
||||
_formData.append('taskIds', this.taskIds)
|
||||
_formData.append('json', JSON.stringify({
|
||||
// roleForm: this.roleForm,
|
||||
dockUserList: list,
|
||||
commentText: this.commentText
|
||||
}))
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
this.$message.success('保存成功')
|
||||
this.bpnId = res.result
|
||||
}).catch(e => {
|
||||
this.saveLoading = false
|
||||
})
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
this.isSubmit = true
|
||||
@@ -418,7 +452,7 @@ export default {
|
||||
})
|
||||
if(flag)return this.$message.warning('请选择负责人填入')
|
||||
let zqa = new Map();
|
||||
for (let lastDataListElement of this.lastDataList) {
|
||||
for (let lastDataListElement of this.dataList) {
|
||||
let a = zqa.get(lastDataListElement.dutyPeopleId)
|
||||
if( a == null){
|
||||
a = {
|
||||
|
||||
@@ -230,7 +230,7 @@ import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {uploadFile} from '@/api/unqualProcess.js';
|
||||
import {inboundLiaisonDetail, completeTask} from "@/api/process"
|
||||
import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process"
|
||||
|
||||
export default {
|
||||
name: "wfhxzgStep4",
|
||||
@@ -306,11 +306,13 @@ export default {
|
||||
},
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
|
||||
this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))]
|
||||
this.newDataList = []
|
||||
console.log(this.dataList)
|
||||
this.dataList.forEach(item => {
|
||||
let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info))
|
||||
if (listJSON.length !== undefined) {
|
||||
this.dataList = listJSON
|
||||
} else {
|
||||
this.dataList = [listJSON]
|
||||
}
|
||||
this.dataList.forEach(item => {
|
||||
if (item.fileText.length !== 0) {
|
||||
item.fileText.forEach(item1 => {
|
||||
this.fileTextList.push({
|
||||
@@ -337,12 +339,7 @@ export default {
|
||||
id: res.data.attId,
|
||||
name: res.data.standName
|
||||
})
|
||||
this.newDataList.forEach(item =>{
|
||||
this.fileListData.fileText.push({
|
||||
id: item.id,
|
||||
name: item.name
|
||||
})
|
||||
})
|
||||
this.fileListData.fileText = this.newDataList
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.message,
|
||||
@@ -402,7 +399,40 @@ export default {
|
||||
window.open(routeUrl.href, '_blank')
|
||||
},
|
||||
// 保存按钮
|
||||
handleSave() {},
|
||||
handleSave() {
|
||||
let zqa = new Map();
|
||||
for (let lastDataListElement of this.dataList) {
|
||||
let a = zqa.get(lastDataListElement.dutyPeopleId)
|
||||
if( a == null){
|
||||
a = {
|
||||
standardInfoList: []
|
||||
}
|
||||
}
|
||||
a.standardInfoList.push(lastDataListElement);
|
||||
zqa.set(a.id, a);
|
||||
}
|
||||
let list = []
|
||||
for(let item of zqa) {
|
||||
list.push(item[1].standardInfoList)
|
||||
}
|
||||
this.saveLoading = true
|
||||
let _formData = new FormData()
|
||||
_formData.append('taskIds', this.taskIds)
|
||||
_formData.append('json', JSON.stringify({
|
||||
// roleForm: this.roleForm,
|
||||
responUserInfo: {
|
||||
info: this.dataList.splice(-1, 1)
|
||||
},
|
||||
commentText: this.commentText
|
||||
}))
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
this.$message.success('保存成功')
|
||||
this.bpnId = res.result
|
||||
}).catch(e => {
|
||||
this.saveLoading = false
|
||||
})
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
this.isSubmit = true
|
||||
|
||||
@@ -107,15 +107,9 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
|
||||
<el-table-column prop="dutyPeople" label="负责人" align="center"/>
|
||||
<el-table-column prop="fileText" label="佐证材料" align="center" show-overflow-tooltip>
|
||||
<el-table-column prop="fileText" label="佐证材料" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-upload
|
||||
:action="''"
|
||||
name="file"
|
||||
:file-list="fileTextList"
|
||||
:on-preview="handleOnPreview"
|
||||
>
|
||||
</el-upload>
|
||||
<el-button type="primary" size="small" @click="queryFile(scope.row)">查看</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -212,6 +206,15 @@
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
|
||||
<el-upload
|
||||
:action="''"
|
||||
name="file"
|
||||
:file-list="fileTextList"
|
||||
:on-preview="handleOnPreview"
|
||||
>
|
||||
</el-upload>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -226,6 +229,7 @@ export default {
|
||||
name: "wfhxzgStep5",
|
||||
data() {
|
||||
return {
|
||||
fileMadel: false,
|
||||
detailData: [],
|
||||
loading: false,
|
||||
commentText: '',
|
||||
@@ -271,6 +275,10 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
queryFile(row) {
|
||||
this.fileTextList = row.fileText
|
||||
this.fileMadel = true
|
||||
},
|
||||
processTable() {
|
||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
@@ -297,14 +305,14 @@ export default {
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
|
||||
this.dataList.forEach(item => {
|
||||
/*this.dataList.forEach(item => {
|
||||
item.fileText.forEach(item1 => {
|
||||
this.fileTextList.push({
|
||||
id: item1.id,
|
||||
name: item1.name
|
||||
})
|
||||
})
|
||||
})
|
||||
})*/
|
||||
})
|
||||
},
|
||||
|
||||
@@ -351,6 +359,9 @@ export default {
|
||||
handleSubmitNo() {
|
||||
if (this.commentText) {
|
||||
var json = {
|
||||
responUserInfo: {
|
||||
info: this.dataList
|
||||
},
|
||||
actionFlag: 1,
|
||||
commentText: this.commentText
|
||||
}
|
||||
@@ -361,6 +372,7 @@ export default {
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('驳回成功')
|
||||
this.fileTextList = []
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
})
|
||||
@@ -452,6 +464,13 @@ export default {
|
||||
/deep/.el-upload{
|
||||
display: block;
|
||||
}
|
||||
// 上传信息回显多余隐藏
|
||||
/deep/.el-upload-list__item .el-icon-close {
|
||||
font-size: 0;
|
||||
}
|
||||
/deep/.el-upload-list__item .el-icon-close-tip {
|
||||
font-size: 0;
|
||||
}
|
||||
.content-center {
|
||||
padding: 10px 0px 10px 10px;
|
||||
}
|
||||
|
||||
@@ -681,7 +681,7 @@ export default {
|
||||
this.$message.warning("请选择分发责任人");
|
||||
} else {
|
||||
var json = Object.assign(this.listForm, this.roleForm);
|
||||
console.log(json);
|
||||
this.isSubmit = true
|
||||
this.$refs["listForm"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs["roleForm"].validate((valid) => {
|
||||
@@ -701,6 +701,7 @@ export default {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -451,6 +451,8 @@ export default {
|
||||
listForm: {
|
||||
standNumber: "", //标准编号
|
||||
standName: "",//标准名称
|
||||
XCXSSRQ: "", //新车型实施日期
|
||||
ZCCSSRQ: "", //在产车实施日期
|
||||
certifiedEngineer: "", //认证工程师
|
||||
qualityEngineer: "", //质量工程师
|
||||
breakdownList: [{
|
||||
@@ -655,6 +657,7 @@ export default {
|
||||
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
|
||||
this.$message.warning("请选择分发责任人");
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
var json = Object.assign(this.listForm, this.roleForm);
|
||||
this.$refs["listForm"].validate((valid) => {
|
||||
if (valid) {
|
||||
@@ -675,6 +678,7 @@ export default {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -708,9 +712,11 @@ export default {
|
||||
|
||||
//选择拆分标准确定事件
|
||||
OkDrawer() {
|
||||
if (this.selectedList.length == 1) {
|
||||
if (this.selectedList.length === 1) {
|
||||
this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
|
||||
this.listForm.standName = this.selectedList[0].standName;
|
||||
this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj
|
||||
this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj
|
||||
this.listForm.id = this.selectedList[0].id;
|
||||
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
|
||||
ids: this.listForm.id,
|
||||
|
||||
@@ -341,6 +341,7 @@ export default {
|
||||
}else{
|
||||
this.listForm.commentText = this.commentText
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.isSubmit = true
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
@@ -352,6 +353,7 @@ export default {
|
||||
this.$message.success(res.message)
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
</process-title>
|
||||
<div class="tableTitle">
|
||||
<div class="tableButton">
|
||||
<el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发落实人</el-button>
|
||||
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发落实人</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<el-table
|
||||
@@ -116,14 +116,13 @@
|
||||
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="落实人" prop="implementer" align="center">
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.implementer == undefined">
|
||||
{{ "请选择落实人" }}
|
||||
</div>
|
||||
<div v-else class="fileClass">
|
||||
{{ scope.row.implementer || "-" }}
|
||||
</div>
|
||||
<el-input v-model="scope.row.implementerId" style="display: none;"/>
|
||||
<el-input v-model="scope.row.implementer" placeholder="请选择落实人" @click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -260,6 +259,8 @@ export default {
|
||||
tabValue: "listOfCountries",
|
||||
selectedList: [], //选择清单的选择框
|
||||
selectList: [], //选择标准的选择框
|
||||
lsIndex: '',
|
||||
lsType: '',
|
||||
bringData: [],
|
||||
commentText: "", //填写会签意见
|
||||
page: 1,
|
||||
@@ -346,7 +347,7 @@ export default {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
console.log(res);
|
||||
console.log(res.mesg)
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg);
|
||||
this.getFormFieldList(processForm);
|
||||
@@ -355,11 +356,6 @@ export default {
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
createItemId() {
|
||||
return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36);
|
||||
},
|
||||
|
||||
/**
|
||||
* @description: 动态表单读取
|
||||
*/
|
||||
@@ -373,7 +369,6 @@ export default {
|
||||
for (let i = 0; i < item.pepdtos.length; i++) {
|
||||
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
|
||||
this.listForm.breakdownList.push({
|
||||
itemId: this.createItemId(),
|
||||
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
|
||||
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
|
||||
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
|
||||
@@ -395,46 +390,47 @@ export default {
|
||||
});
|
||||
}
|
||||
}
|
||||
console.log(this.listForm.breakdownList);
|
||||
},
|
||||
//批量操作按钮
|
||||
batchOperation(id) {
|
||||
if (this.selectList.length === 0) {
|
||||
this.$message.warning("请至少选择一条数据进行批量分发");
|
||||
} else {
|
||||
this.nodeList = [];
|
||||
this.nodeList.push(id);
|
||||
this.modalshowflag = true;
|
||||
checkedRole (data) {
|
||||
if (this.type === 1) {
|
||||
this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id
|
||||
this.listForm.breakdownList[this.lsIndex].implementer = data[0].name
|
||||
} else if(this.type === 2) {
|
||||
this.listForm.breakdownList.forEach( item => {
|
||||
this.selectList.forEach( items => {
|
||||
if (item === items) {
|
||||
item.implementerId = data[0].id
|
||||
item.implementer = data[0].name
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
},
|
||||
checkedRole(data) {
|
||||
// 选取负责人时的操作
|
||||
let mis = [];
|
||||
let miss = [];
|
||||
this.selectList.forEach(item => {
|
||||
item.implementer = data[0].name;
|
||||
item.implementerId = data[0].id;
|
||||
mis.push(item.projectNumber);
|
||||
miss.push(item.itemNum)
|
||||
});
|
||||
this.listForm.breakdownList.forEach(item => {
|
||||
if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) {
|
||||
this.selectList.push(item);
|
||||
}
|
||||
});
|
||||
this.listForm.breakdownList = this.selectList;
|
||||
this.$refs.selection.clearSelection();
|
||||
this.modalshowflag = false;
|
||||
this.modalshowflag = false
|
||||
},
|
||||
cancleUserInfo() {
|
||||
this.modalshowflag = false;
|
||||
},
|
||||
choiceZRRS(scope) {
|
||||
if (scope != null) this.dsadadadsada = scope.$index;
|
||||
this.nodeList = [];
|
||||
if (this.roleForm.implementer.length > 0) {
|
||||
this.nodeList = this.roleForm.implementer.split(",");
|
||||
choiceZRRS (row, type, index) {
|
||||
this.type = type
|
||||
if (type === 1) {
|
||||
this.drawerTitle = '选择责任人'
|
||||
this.nodeList = []
|
||||
this.lsIndex = index
|
||||
this.lsType = type
|
||||
this.nodeList.push(row)
|
||||
this.modalshowflag = true
|
||||
} else if (type === 2) {
|
||||
// 批量
|
||||
if (this.selectList.length > 0) {
|
||||
this.lsType = type
|
||||
this.nodeList = []
|
||||
this.modalshowflag = true
|
||||
this.drawerTitle = '批量选择责任人'
|
||||
} else {
|
||||
this.$message.warning('请选择要分发的数据')
|
||||
}
|
||||
}
|
||||
this.modalshowflag2 = true;
|
||||
},
|
||||
getTree() {
|
||||
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
|
||||
@@ -463,6 +459,7 @@ export default {
|
||||
this.listForm.approvalOpinion = "";
|
||||
this.listForm.signFlag = "";
|
||||
const json = JSON.stringify(this.listForm.breakdownList);
|
||||
this.isSubmit = true
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
@@ -474,6 +471,7 @@ export default {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
}, e => {
|
||||
});
|
||||
} else {
|
||||
|
||||
@@ -493,6 +493,7 @@ export default {
|
||||
this.listForm.signFlag = "";
|
||||
this.listForm.dataList = this.dataList;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.isSubmit = true
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
@@ -504,6 +505,7 @@ export default {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
}, e => {
|
||||
|
||||
});
|
||||
|
||||
@@ -480,6 +480,7 @@ export default {
|
||||
this.listForm.dataList = this.dataList
|
||||
this.listForm.fenFlag = '2'
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.isSubmit = true
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
@@ -491,6 +492,7 @@ export default {
|
||||
this.$message.success(res.message)
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
|
||||
@@ -455,6 +455,7 @@ export default {
|
||||
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
|
||||
this.$message.warning('请填写审批意见')
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
|
||||
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
@@ -475,6 +476,7 @@ export default {
|
||||
this.$message.success(res.message)
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
}, e => {
|
||||
|
||||
});
|
||||
|
||||
@@ -463,6 +463,7 @@ export default {
|
||||
this.listForm.fenFlag = "1";
|
||||
this.listForm.dataList = this.dataList
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.isSubmit = true
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
@@ -474,6 +475,7 @@ export default {
|
||||
this.$message.success(res.message)
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
}, e => {
|
||||
|
||||
});
|
||||
|
||||
@@ -178,6 +178,7 @@ export default {
|
||||
let row = {...this.detailData[index]}
|
||||
row.taskIds = row.id
|
||||
row.taskInfo = row.name
|
||||
console.log(row.name)
|
||||
row.tabsName = this.$route.query.tabsName
|
||||
let prcType = this.detailData[index].prcType // 流程类型
|
||||
// 判断当前流程是否已全部办理完成
|
||||
@@ -205,7 +206,7 @@ export default {
|
||||
this.toProcessDetail('bzqdfbStep4',row)
|
||||
}else if (prcType === '5'){
|
||||
//标准项目合规评估 标准维度
|
||||
if(row.taskInfo === '标准法规部部长审批'){
|
||||
if(row.taskInfo === '标准法规部领导审核'){
|
||||
this.toProcessDetail('xmpgStep7',row)
|
||||
}else{
|
||||
this.toProcessDetail('xmpgStep2',row)
|
||||
|
||||
@@ -4,22 +4,22 @@
|
||||
<div class="search-area">
|
||||
<el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form">
|
||||
<div class="search-area-item">
|
||||
<el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
|
||||
<el-input
|
||||
v-model.trim="searchForm.prcName"
|
||||
placeholder="按流程名称查找"
|
||||
:maxlength="100"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
|
||||
<el-input
|
||||
v-model.trim="searchForm.prcNum"
|
||||
placeholder="按流程编号查找"
|
||||
:maxlength="100"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model.trim="searchForm.prcName"-->
|
||||
<!-- placeholder="按流程名称查找"-->
|
||||
<!-- :maxlength="100"-->
|
||||
<!-- clearable-->
|
||||
<!-- ></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model.trim="searchForm.prcNum"-->
|
||||
<!-- placeholder="按流程编号查找"-->
|
||||
<!-- :maxlength="100"-->
|
||||
<!-- clearable-->
|
||||
<!-- ></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
|
||||
<el-select
|
||||
v-model="searchForm.prcType"
|
||||
|
||||
@@ -54,13 +54,15 @@
|
||||
<el-form :model="standForm" ref="standForm" label-position="right" label-width="150px">
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标准类别" prop="country">
|
||||
<el-select
|
||||
v-model="standForm.country"
|
||||
placeholder="根据标准类别查找"
|
||||
@change="getAddStand()"
|
||||
>
|
||||
<el-option v-for="opt in countryOptions" :label="opt.label" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :title="opt.label">{{ opt.label }}</el-option>
|
||||
<el-form-item label="标准类别" prop="standSort">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.standSort" placeholder="请选择标准类别">
|
||||
<el-option
|
||||
v-for="item in standSortOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -83,41 +85,60 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标准名称" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据标准名称查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="标准中文名称" prop="standName">
|
||||
<el-input
|
||||
v-model="standForm.standName"
|
||||
placeholder="请输入标准中文名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标准英文名称" prop="nameShow">
|
||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据标准英文名称查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="标准英文名称" prop="standEnName">
|
||||
<el-input
|
||||
v-model="standForm.standEnName"
|
||||
placeholder="请输入标准英文名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标准性质" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据标准性质查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.standNature" placeholder="请选择标准性质">
|
||||
<el-option
|
||||
v-for="item in standNatureOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="文本状态" prop="nameShow">
|
||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据文本状态查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="文本状态" prop="textStatus">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.textStatus" placeholder="请选择文本状态">
|
||||
<el-option
|
||||
v-for="item in standStateOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标准发布日期" prop="isSueTime">
|
||||
<el-form-item label="标准发布日期" prop="issueTime">
|
||||
<el-date-picker
|
||||
v-model="standForm.isSueTime"
|
||||
type="date"
|
||||
placeholder="根据标准发布日期查找">
|
||||
v-model="standForm.issueTime"
|
||||
type="date"
|
||||
placeholder="请选择标准发布日期"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -125,115 +146,181 @@
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否纳入标准清单" prop="bringIntoList">
|
||||
<el-select v-model="standForm.bringIntoList" class="advanced-one" placeholder="根据是否纳入标准清单查找">
|
||||
<el-option value="yes" label="是"></el-option>
|
||||
<el-option value="no" label="否"></el-option>
|
||||
<!-- <el-option value="NOT" label="NOT"></el-option>-->
|
||||
<el-select v-model="standForm.isRelateAccess" class="advanced-one" placeholder="请选择是否纳入标准清单">
|
||||
<el-option value="1" label="是"></el-option>
|
||||
<el-option value="2" label="否"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="实施日期" prop="IMPLTime">
|
||||
<el-form-item label="实施日期" prop="ssrq">
|
||||
<el-date-picker
|
||||
v-model="standForm.IMPLTime"
|
||||
type="date"
|
||||
placeholder="根据实施日期查找">
|
||||
v-model="standForm.ssrq"
|
||||
type="date"
|
||||
placeholder="请选择标准实施日期(标准文本)"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="新车型实施日期" prop="XCXTime">
|
||||
<el-form-item label="新车型实施日期" prop="xcxssrq">
|
||||
<el-date-picker
|
||||
v-model="standForm.XCXTime"
|
||||
type="date"
|
||||
placeholder="根据新车型实施日期查找">
|
||||
v-model="standForm.xcxssrq"
|
||||
type="date"
|
||||
placeholder="请选择新车型实施日期(标准文本"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="在产车实施日期" prop="ZCCTime">
|
||||
<el-form-item label="在产车实施日期" prop="zccssrq">
|
||||
<el-date-picker
|
||||
v-model="standForm.ZCCTime"
|
||||
type="date"
|
||||
placeholder="根据在产车实施日期查找">
|
||||
v-model="standForm.zccssrq"
|
||||
type="date"
|
||||
placeholder="请选择在产车实施日期(标准文本)"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="归口管理部门" prop="nameShow">
|
||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据归口管理部门查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="归口管理部门" prop="gkdw">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.gkdw" placeholder="请选择归口管理部门">
|
||||
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="起草单位" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据起草单位查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="起草单位" prop="qcdw">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.qcdw" placeholder="请选择起草单位" multiple>
|
||||
<el-option
|
||||
v-for="item in qcdwOption"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="我司参与深度" prop="nameShow">
|
||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据我司参与深度查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="我司参与深度" prop="cysd">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.cysd" placeholder="请选择我司参与深度">
|
||||
<el-option
|
||||
v-for="item in cysdOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="适用车型" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据适用车型查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="适用车型" prop="cllx">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.cllx" placeholder="请选择适用车型" multiple>
|
||||
<el-option
|
||||
v-for="item in applyArcticOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="能源类型" prop="nameShow">
|
||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据能源类型查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="能源类型" prop="nylx">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.nylx" placeholder="请选择能源类型" multiple>
|
||||
<el-option
|
||||
v-for="item in categoryOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="适用产品线" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据适用产品线查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="适用产品线" prop="sycpx">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.sycpx" placeholder="请选择适用产品线" multiple>
|
||||
<el-option
|
||||
v-for="item in sycpxOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="适用认证" prop="nameShow">
|
||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据适用认证查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="适用认证" prop="syrz">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.syrz" placeholder="请选择适用认证" multiple>
|
||||
<el-option
|
||||
v-for="item in applyAuthOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="责任部门" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据责任部门查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="责任部门" prop="zrbm">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.zrbm" placeholder="请选择责任部门" multiple>
|
||||
<el-option
|
||||
v-for="item in zrbmOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="责任工程师" prop="nameShow">
|
||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据责任工程师查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="责任工程师" prop="zrgcs">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.zrgcs" placeholder="请选择责任工程师" multiple>
|
||||
<el-option
|
||||
v-for="item in zrgcsOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="关联模块-VPPS编码" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据关联模块-VPPS编码查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="standForm.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', standForm.cycvppsbm)"></el-input>
|
||||
<tree-select-new
|
||||
width = "800"
|
||||
:key="key1"
|
||||
:lazy=true
|
||||
:multiple=true
|
||||
:check-strictly= true
|
||||
:modalShowFlag="modalShowFlag2"
|
||||
:drawerTitle="drawerTitle"
|
||||
:show-checkBox="showCheckBox"
|
||||
:url="url"
|
||||
:urlChild="urlChild"
|
||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
|
||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -245,40 +332,68 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="关联模块-中文名称" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据关联模块-中文名称"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
|
||||
<el-input v-model="standForm.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', standForm.kccvppsbm)"></el-input>
|
||||
<tree-select-new
|
||||
width = "800"
|
||||
:key="key2"
|
||||
:lazy=true
|
||||
:multiple=true
|
||||
:check-strictly= true
|
||||
:modalShowFlag="modalShowFlag3"
|
||||
:drawerTitle="drawerTitle"
|
||||
:show-checkBox="showCheckBox"
|
||||
:url="url"
|
||||
:urlChild="urlChild"
|
||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
|
||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="采标编号" prop="nameShow">
|
||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据采标编号查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-input
|
||||
v-model="standForm.cbbh"
|
||||
placeholder="请输入采标编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="采标程度" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据采标程度查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="standForm.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', standForm.dybxh)"></el-input>
|
||||
<tree-select-new
|
||||
width = "800"
|
||||
:key="key3"
|
||||
:lazy=true
|
||||
:multiple=true
|
||||
:check-strictly= true
|
||||
:modalShowFlag="modalShowFlag4"
|
||||
:drawerTitle="drawerTitle"
|
||||
:url="url"
|
||||
:show-checkBox="showCheckBox"
|
||||
:urlChild="urlChild"
|
||||
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
|
||||
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="引用标准" prop="nameShow">
|
||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据引用标准查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="采标程度" prop="standNumber">
|
||||
<el-select :popper-append-to-body="false" v-model="standForm.cbcd" placeholder="请选择采标程度">
|
||||
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="被引用标准" prop="standNumber">
|
||||
<el-input v-model="standForm.standNumber" clearable
|
||||
placeholder="根据被引用标准查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
<el-form-item label="引用标准" prop="nameShow">
|
||||
<el-input
|
||||
v-model="standForm.yybj"
|
||||
placeholder="请输入引用标准"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -939,9 +1054,13 @@
|
||||
import "../../../assets/zTree/js/jquery.ztree.core.js";
|
||||
import "../../../assets/zTree/js/jquery.ztree.excheck.js";
|
||||
import "../../../assets/zTree/js/jquery.ztree.exedit.js";
|
||||
// import deptTree from '../../processCenter/pages/components/deptTree'
|
||||
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
|
||||
|
||||
export default {
|
||||
name: "advancedSearch",
|
||||
components: {
|
||||
TreeSelectNew
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
tableLoading: false,
|
||||
@@ -949,6 +1068,42 @@ export default {
|
||||
saveRoleBuss: [],
|
||||
bussRoleFlag: false,
|
||||
drawerModal: false,
|
||||
modalShowFlag1: false, // drawer开关
|
||||
modalShowFlag2: false, // drawer开关
|
||||
modalShowFlag3: false, // drawer开关
|
||||
modalShowFlag4: false, // drawer开关
|
||||
url:'',
|
||||
urlChild:'',
|
||||
drawerTitle: '', //drawer标题
|
||||
showCheckBox: true, // 树形控件是否展示多选框
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'menuName'
|
||||
},
|
||||
defaultCodeProps: {
|
||||
children: 'children',
|
||||
label: 'code'
|
||||
},
|
||||
defaultModelProps: {
|
||||
children: 'children',
|
||||
label: 'model'
|
||||
},
|
||||
type: '',
|
||||
defaultUserProps: {
|
||||
children: 'children',
|
||||
label: 'name'
|
||||
},
|
||||
key:1,
|
||||
key1:2,
|
||||
key2:3,
|
||||
key3:4,
|
||||
nodeKey: 'id',
|
||||
defaultCheckedKeys: [],
|
||||
nodeKeyCode: 'code',
|
||||
nodeKeyModel: 'model',
|
||||
defaultCheckedKeys1: [],
|
||||
defaultCheckedKeys2: [],
|
||||
defaultCheckedKeys3: [],
|
||||
drawerModalstyles: {
|
||||
height: "calc(100% - 55px)",
|
||||
overflow: "auto",
|
||||
@@ -975,11 +1130,7 @@ export default {
|
||||
selectIndex: "stand",
|
||||
nature: "", // 标准性质
|
||||
country: "", // 国家
|
||||
standSort: "", // 标准类别
|
||||
applyArctic: "", // 适用车型
|
||||
standNumber: "", // 标准编号
|
||||
standYear: "", // 标准年份
|
||||
standEnName: "", // 标准英文名称
|
||||
standState: "", // 标准状态
|
||||
replaceStandNum: "", // 代替标准号
|
||||
replacedStandNum: "", // 被代替标准号
|
||||
@@ -987,7 +1138,6 @@ export default {
|
||||
adoptExtent: "", // 采标程度
|
||||
energyKind: "", // 能源种类
|
||||
applyAuth: "", // 适用认证
|
||||
issueTime: "", // 发布日期
|
||||
issueTimeSt: "", // 发布日期(开始)
|
||||
issueTimeEd: "", // 发布日期(结束)
|
||||
putTime: "", // 实施日期
|
||||
@@ -1023,12 +1173,100 @@ export default {
|
||||
registerPutTime: "", // 注册登记车实施日期
|
||||
itemsNum: "", // 条款号
|
||||
itemsName: "", // 条款名称
|
||||
parts: "" // 关联零部件
|
||||
parts: "", // 关联零部件
|
||||
// 基础信息
|
||||
textStatus: '', // 文本状态
|
||||
standYear: '', // 标准年份
|
||||
standInData: '0', // 标准类型
|
||||
standSort: '', // 标准类别
|
||||
standNumber: '', // 标准编号
|
||||
standNature: '', // 标准性质
|
||||
standEnName: '', // 英文名称
|
||||
standName: '', // 中文名称
|
||||
signFlag: '1', // 是否需要会签
|
||||
issueTime: '', // 发布时间
|
||||
isRelateAccess: '', // 是否纳入认证清单
|
||||
standSystem: '',// 标准体系
|
||||
standSystemName: '',// 标准体系
|
||||
gxhbq: '', // 标签
|
||||
// 实施日期
|
||||
ssrq: '', // 实施日期(标准文本)
|
||||
xcxssrq: '', // 新车型实施日期(标准文本)
|
||||
zccssrq: '', // 在产车实施日期(标准文本)
|
||||
ssrqgj: '', // 实施日期(国际)
|
||||
xcxssrqgj: '', // 新车型实施日期(国际)
|
||||
zccssrqgj: '', // 在产车实施日期(国际)
|
||||
// 文本信息
|
||||
ca: '', // 草案
|
||||
fbgbjbd: '', // 发布稿
|
||||
xgd: '', // 修改单
|
||||
bpg: '', // 报批稿
|
||||
ssg: '', // 送审稿
|
||||
zqyjg: '', // 征求意见稿
|
||||
jdwj: '', // 解读文件
|
||||
zbjbd: '', // 增补件
|
||||
bfbdtbzh: '', // 增补件
|
||||
kwj: '', // 勘误件
|
||||
caName: '', // 草案
|
||||
fbgbjbdName: '', // 发布稿
|
||||
xgdName: '', // 修改单
|
||||
bpgName: '', // 报批稿
|
||||
ssgName: '', // 送审稿
|
||||
zqyjgName: '', // 征求意见稿
|
||||
jdwjName: '', // 解读文件
|
||||
zbjbdName: '', // 增补件
|
||||
kwjName: '', // 勘误件
|
||||
glwjName: '', // 关联文件
|
||||
// 适用范围
|
||||
txlb: '', // 体系类别
|
||||
gkdw: '', // 归口管理部门
|
||||
qcdw: '', // 起草单位
|
||||
wssmr: '', // 我司署名人
|
||||
cysd: '', // 我司参与深度
|
||||
cllx: '', // 适用车型
|
||||
nylx: '',// 能源类型
|
||||
sycpx: '',// 适用产品线
|
||||
syrz: '', // 适用认证
|
||||
zrbm: '', // 责任部门
|
||||
zrgcs: '', // 责任工程师
|
||||
cycvppsbm: '', // 关联模块--乘用车VPPS编码
|
||||
cycvppscn: '', // 关联模块--乘用车vpps中文名称
|
||||
kccvppsbm: '', // 关联模块--卡车VPPS编码
|
||||
kccvppscn: '', // 关联模块--卡车vpps中文名称
|
||||
dybxh: '', // 模块结构单元变型号
|
||||
dymc: '', // 模块结构单元名称
|
||||
// 关联信息
|
||||
dtbjh: '', // 代替标准号
|
||||
cbbh: '', // 采标编号
|
||||
cbcd: '', // 采标程度
|
||||
yybj: '', // 引用标准
|
||||
byybj: '', // 被引用标准
|
||||
glwj: '', // 关联文件
|
||||
xglc: '', // 相关流程
|
||||
chjl: '', // 参会记录
|
||||
},
|
||||
// 国家/地区
|
||||
countryOptions: [],
|
||||
standSystemOptions: [], // 标准体系
|
||||
busVppsOptions: [], // 车系体系架构
|
||||
busVppsChildOptions: [], // 车系体系架构子集合
|
||||
modelOptions: [], // 模块体系架构
|
||||
modelChildOptions: [], // 模块体系架构子集合
|
||||
cysdOptions: [], // 我司参与深度
|
||||
sycpxOptions: [], // 适用产品线
|
||||
zrbmOptions: [], // 责任部门
|
||||
zrgcsOptions: [], // 责任工程师
|
||||
txlbOptions: [], // 体系类别
|
||||
// 标准类别
|
||||
standSortOptions: [],
|
||||
// 我司署名人
|
||||
wssmrOptions: [],
|
||||
// 体系类别
|
||||
qcdwOption: [],
|
||||
// 归口管理部门
|
||||
gkglbmOptions: [],
|
||||
// 采标程度
|
||||
cbcdOptions: [],
|
||||
// 标准性质
|
||||
standNatureOptions: [],
|
||||
// 标准、文件状态
|
||||
@@ -1081,6 +1319,74 @@ export default {
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
choiceZRR1 (type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag1 = true
|
||||
this.key++
|
||||
},
|
||||
choiceZRR2 (type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag2 = true
|
||||
this.url = ''
|
||||
this.urlChild = ''
|
||||
this.url="sarVppsTree/list"
|
||||
this.urlChild="sarVppsTree/childByList"
|
||||
this.key1++
|
||||
},
|
||||
choiceZRR3 (type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag3 = true
|
||||
this.url = ''
|
||||
this.urlChild = ''
|
||||
this.url="sarVppsTree/list"
|
||||
this.urlChild="sarVppsTree/childByList"
|
||||
this.key2++
|
||||
},
|
||||
choiceZRR4 (type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag4 = true
|
||||
this.url = ''
|
||||
this.urlChild = ''
|
||||
this.url="sarModelTree/list"
|
||||
this.urlChild="sarModelTree/childByList"
|
||||
this.key3++
|
||||
},
|
||||
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
|
||||
if(checkedData) {
|
||||
if(checkedData.length > 0){
|
||||
this.standForm.dybxh = checkedData.map(item => item.model).join(",")
|
||||
this.standForm.dymc = checkedData.map(item => item.name).join(",")
|
||||
}else {
|
||||
this.standForm.dybxh = checkedData.model
|
||||
this.standForm.dymc = checkedData.name
|
||||
}
|
||||
}
|
||||
this.modalShowFlag4 = false
|
||||
},
|
||||
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
|
||||
if(checkedData) {
|
||||
if(checkedData.length > 0){
|
||||
this.standForm.kccvppsbm = checkedData.map(item => item.code).join(",")
|
||||
this.standForm.kccvppscn = checkedData.map(item => item.chineseName).join(",")
|
||||
}else {
|
||||
this.standForm.kccvppsbm = checkedData.code
|
||||
this.standForm.kccvppscn = checkedData.chineseName
|
||||
}
|
||||
}
|
||||
this.modalShowFlag3 = false
|
||||
},
|
||||
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
|
||||
if(checkedData) {
|
||||
if(checkedData.length > 0){
|
||||
this.standForm.cycvppsbm = checkedData.map(item => item.code).join(",")
|
||||
this.standForm.cycvppscn = checkedData.map(item => item.chineseName).join(",")
|
||||
}else {
|
||||
this.standForm.cycvppsbm = checkedData.code
|
||||
this.standForm.cycvppscn = checkedData.chineseName
|
||||
}
|
||||
}
|
||||
this.modalShowFlag2 = false
|
||||
},
|
||||
// 关联零部件
|
||||
getRelationParts() {
|
||||
this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => {
|
||||
@@ -1473,6 +1779,7 @@ export default {
|
||||
nowStandForm.putYear = this.$dateFormat(this.standForm.putYear, "yyyy");
|
||||
}
|
||||
this.exportSearchInfo = nowStandForm;
|
||||
nowStandForm['sarStandAttrEOStr'] = JSON.stringify(nowStandForm).replace(/"/g, "'")
|
||||
this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, {
|
||||
_this: this,
|
||||
loading: "resultLoading"
|
||||
@@ -2038,9 +2345,6 @@ export default {
|
||||
window.open("/api/search/searchCenter/exportSearchCenterDatas?exportDatas=" + searchInfoEO + "&searchType=" + this.selectIndex);
|
||||
}
|
||||
},
|
||||
components: {
|
||||
// deptTree
|
||||
},
|
||||
props: {},
|
||||
computed: {
|
||||
// 条件按钮提示
|
||||
@@ -2069,7 +2373,6 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getRelationParts();
|
||||
// 查询检索历史
|
||||
this.getSearchHistoty();
|
||||
// 切换标签
|
||||
@@ -2077,29 +2380,26 @@ export default {
|
||||
_this: this
|
||||
}, res => {
|
||||
// 设置高级搜索下拉框
|
||||
this.standNatureOptions = res.data.SARPROPERTY; // 标准性质
|
||||
// this.standNatureOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
|
||||
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
|
||||
this.standStateOptions = res.data.WBZTCLASS // 文本状态
|
||||
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
|
||||
this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档,产品类别对应标准属性中的“适用车型”
|
||||
this.categoryOptions = res.data.NYLXCLASS // 能源类型
|
||||
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
|
||||
this.cysdOptions = res.data.WSCYSD // 我司参与深度
|
||||
this.wssmrOptions = res.data.WSSMR // 我司署名人
|
||||
this.qcdwOption = res.data.QCDW // 体系类别
|
||||
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
|
||||
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
|
||||
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
|
||||
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
||||
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
|
||||
this.countryOptions = res.data.COUNTRY;
|
||||
// this.countryOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
// this.standSortOptions = res.data.STANDCLASSIFY
|
||||
// this.standSortOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
this.applyArcticOptions = res.data.PRODUCTTYPE; // 根据需求文档,产品类别对应标准属性中的“适用车型”
|
||||
// this.applyArcticOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
this.applyAuthOptions = res.data.PROVETYPE; // 适用认证下拉框
|
||||
// this.applyAuthOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
this.categoryOptions = res.data.CATEGORY;
|
||||
// this.categoryOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
this.standStateOptions = res.data.STANDSTATE;
|
||||
// this.standStateOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
this.adoptExtentOptions = res.data.DEGREESTANDARD;
|
||||
// this.adoptExtentOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
this.energyKindOptions = res.data.ENERGYTYPES;
|
||||
// this.energyKindOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
this.bussBigClassOptions = res.data.BUSSBIGCLASS;
|
||||
// this.bussBigClassOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
this.bussStandClassOptions = res.data.BUSSSTANDCLASS;
|
||||
// this.bussStandClassOptions.splice(0, 0, {'label': '全部', 'value': 'all'})
|
||||
// 区域前台新加----没测试噢噢噢噢哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦
|
||||
this.regionOptions = res.data.REGION; // 区域
|
||||
}, e => {
|
||||
});
|
||||
@@ -2110,7 +2410,7 @@ export default {
|
||||
this.showBuyRole();
|
||||
// 组织结构
|
||||
this.getOrgTreeSource();
|
||||
this.selectBussRoleMsg();
|
||||
// this.selectBussRoleMsg();
|
||||
// 滚动事件绑定
|
||||
window.addEventListener("scroll", this.handleScrollHeader);
|
||||
// 检索中心特殊处理
|
||||
|
||||
Reference in New Issue
Block a user