FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
super_liu
2021-07-28 10:28:54 +08:00
parent 567cb4905e 61f227c037
commit 34c23d0337
23 changed files with 1392 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+17 -6
View File
@@ -1066,8 +1066,10 @@ export default {
middle.push(item.name); middle.push(item.name);
files.push(item.response.data.id); files.push(item.response.data.id);
}); });
this.fileListName = middle; this.listForm.fileName = middle.join(',');
this.fileIds = files; this.listForm.fileId = files.join(',');
// this.fileListName = middle;
// this.fileIds = files;
}, },
fileUpload() { fileUpload() {
this.fileMadel = true; this.fileMadel = true;
@@ -1081,12 +1083,17 @@ export default {
}); });
this.fileListName = middle; this.fileListName = middle;
this.fileIds.push(file.response.data.id); this.fileIds.push(file.response.data.id);
if(this.listForm.fileName === null ){ if(this.listForm.fileName === null || this.listForm.fileName === undefined){
this.listForm.fileName = this.fileListName.join(',') this.listForm.fileName = this.fileListName.join(',')
}else { } else {
this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(','); this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
} }
this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',') if(this.listForm.fileId === null || this.listForm.fileId === undefined){
this.listForm.fileId = this.fileIds.join(',')
}else {
this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
}
console.log(this.listForm);
this.$message.success("上传成功"); this.$message.success("上传成功");
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
@@ -1205,7 +1212,11 @@ export default {
exits.push(item.id) exits.push(item.id)
} }
}); });
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',') if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){
this.listForm.inforlist = exits.join(',')
} else {
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
}
this.standardData = []; this.standardData = [];
this.standModel = false; this.standModel = false;
} }
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+5 -24
View File
@@ -78,13 +78,8 @@
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" <p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ <p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -374,14 +369,11 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.zrUserId = this.listForm.zrUserId; this.$message.warning('请填写会签意见')
this.listForm.jlUserId = this.listForm.jlUserId; }
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = ""; this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
this.listForm.signFlag = ""; this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -412,17 +404,6 @@ export default {
}, },
selectThree() { selectThree() {
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
}, },
pageChange(page) { pageChange(page) {
this.page = page; this.page = page;
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
-8
View File
@@ -527,14 +527,6 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
this.listForm.zrUserId = this.listForm.zrUserId;
this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+3 -7
View File
@@ -376,14 +376,10 @@
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; if (this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.zrUserId = this.listForm.zrUserId; this.$message.warning('请填写审批意见')
this.listForm.jlUserId = this.listForm.jlUserId; }
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.signflag = "";
this.listForm.standId = this.listForm.standId;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+1 -1
View File
@@ -407,7 +407,7 @@ export default {
this.modalshowflag = true this.modalshowflag = true
}, },
drawerCheck (data) { drawerCheck (data) {
this.roleForm.dockUserName = data[0].id this.roleForm.dockUser = data[0].id
this.roleForm.dockUserName = data[0].name this.roleForm.dockUserName = data[0].name
this.modalshowflag = false this.modalshowflag = false
}, },
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2 -3
View File
@@ -193,7 +193,6 @@ export default {
}, },
created() { created() {
this.getData() this.getData()
this.getTree()
}, },
methods: { methods: {
getData() { getData() {
@@ -293,8 +292,8 @@ export default {
drawerCheck (data) { drawerCheck (data) {
this.roleForm = data[0] this.roleForm = data[0]
// 选择责任人时input框内值 // 选择责任人时input框内值
this.newDataList.dutyPeople = this.roleRow.name this.newDataList.dutyPeople = this.roleForm.name
this.newDataList.dutyPeopleId = this.roleRow.id this.newDataList.dutyPeopleId = this.roleForm.id
this.lastDataList = this.dataList this.lastDataList = this.dataList
this.modalshowflag = false this.modalshowflag = false
}, },
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+3 -11
View File
@@ -94,7 +94,7 @@
<el-table-column prop="dutyEngineer" label="负责人"/> <el-table-column prop="dutyEngineer" label="负责人"/>
<el-table-column label="佐证材料" show-overflow-tooltip> <el-table-column label="佐证材料" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="download" >{{scope.row.fileText}}</el-button> <el-button type="text" @click="download(scope.row)" >{{scope.row.fileText}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -187,9 +187,7 @@ export default {
}, },
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
console.log(item)
this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
console.log(this.dataList)
}) })
}, },
@@ -266,14 +264,8 @@ export default {
this.getData() this.getData()
}, },
download(row) { download(row) {
// window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath) let attId = row.fileTextId
var name = row.fileText; window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
var url = row.fileTextPath;
const a = document.createElement('a')
a.setAttribute('download', name)
a.setAttribute('target', '_blank')
a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
a.click()
}, },
// 分页事件 // 分页事件
pageChange (page) { pageChange (page) {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+129 -112
View File
@@ -28,16 +28,16 @@
</el-form-item> </el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input <el-input
disabled
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
@@ -93,13 +93,22 @@
<el-table-column <el-table-column
prop="distributePerson" prop="distributePerson"
label="分发责任人"> label="分发责任人">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.distributePerson" v-show="false"></el-input>-->
<!-- <el-input-->
<!-- v-model="dataList.distributePerson"-->
<!-- placeholder="请选择分发责任人"-->
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
<!-- readonly-->
<!-- v-if="dataList[scope.$index].distributePerson==null"-->
<!-- />-->
<!-- </template>-->
<template slot-scope="scope,text" v-if="showColumn"> <template slot-scope="scope,text" v-if="showColumn">
<div> <div>
<div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"> <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
{{listForm.dataList[scope.$index].distributePerson==null?"请选择分发负责人":listForm.dataList[scope.$index].distributePerson}} {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -113,7 +122,7 @@
:model="roleForm" :model="roleForm"
:rules="roleFormRules" :rules="roleFormRules"
class="label-input-form"> class="label-input-form">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>标准法规工程师</h4> <h4>标准法规工程师</h4>
@@ -241,17 +250,26 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="issueTime" prop="putTime"
label="发布日期"> label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrqgj"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrq" prop="zccssrqgj"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -370,20 +388,20 @@ export default {
// 查询相关参数 // 查询相关参数
searching: false, searching: false,
standardSearch: { standardSearch: {
standType:'', standType: "",
standName:'', standName: ""
}, },
standardTypeOptions: [ standardTypeOptions: [
{ {
value: 'INLAND', value: "INLAND",
label: '国内标准法规', label: "国内标准法规",
item:'INLAND', item: "INLAND"
}, },
{ {
value: 'FOREIGN', value: "FOREIGN",
label: '海外标准法规', label: "海外标准法规",
item:'FOREIGN', item: "FOREIGN"
}, }
], ],
nodeList: [], nodeList: [],
defaultProps: { defaultProps: {
@@ -394,14 +412,14 @@ export default {
startUserName: this.$store.getters.userInfo.userName, startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.id, startUser: this.$store.getters.userInfo.id,
qualityEngineer: "", qualityEngineer: "",
certifiedEngineer:"", certifiedEngineer: "",
qualityEngineerName: "", qualityEngineerName: "",
certifiedEngineerName:"", certifiedEngineerName: "",
distributePerson: "", distributePerson: "",
dockUser:'', dockUser: "",
ministerUser:"", ministerUser: "",
dockUserName:'', dockUserName: "",
ministerUserName:"", ministerUserName: ""
}, },
formRules: { formRules: {
standName: [ standName: [
@@ -415,7 +433,7 @@ export default {
], ],
certifiedEngineer: [ certifiedEngineer: [
{ required: true, message: "请选择认证工程师", trigger: "change" } { required: true, message: "请选择认证工程师", trigger: "change" }
], ]
}, },
roleFormRules: { roleFormRules: {
dockUserName: [ dockUserName: [
@@ -423,7 +441,7 @@ export default {
], ],
ministerUserName: [ ministerUserName: [
{ required: true, message: "请选择标准法规部领导", trigger: "change" } { required: true, message: "请选择标准法规部领导", trigger: "change" }
], ]
}, },
ListModel: false, //选择拆分标准抽屉状态 ListModel: false, //选择拆分标准抽屉状态
treeData: [], // 人员数据 treeData: [], // 人员数据
@@ -459,29 +477,29 @@ export default {
dataList: [{ dataList: [{
projectLine: "", //产品线 projectLine: "", //产品线
uname: "",//产品线责任人 uname: "",//产品线责任人
projectManager:"",// 产品线责任人id projectManager: "",// 产品线责任人id
distributePerson: "", //分发责任人 distributePerson: "", //分发责任人
distributePersonId: "", //分发责任人id distributePersonId: "", //分发责任人id
id: "", id: "",
sarStandProjectLibraries: [{ sarStandProjectLibraries: [{
projectManager: '', projectManager: "",
projectLevel: '', projectLevel: "",
projectNumber: '', projectNumber: "",
projectEndDate: '', projectEndDate: "",
currentNode: '', currentNode: "",
projectGroup: '', projectGroup: "",
productLine: '', productLine: "",
projectClassification: '', projectClassification: "",
projectStatus: '', projectStatus: "",
projectStartDate: '', projectStartDate: "",
id: '', id: "",
projectName: '', projectName: "",
projectPlatfor: '' projectPlatfor: ""
}] }]
}] }]
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
showColumn:true showColumn: true
}; };
}, },
methods: { methods: {
@@ -491,25 +509,26 @@ export default {
this.roleForm.dockUserName = data[0].name; this.roleForm.dockUserName = data[0].name;
} else if (this.type === "ministerUser") { } else if (this.type === "ministerUser") {
this.roleForm.ministerUser = data[0].id; this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = data[0].name; this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "qualityEngineer") { } else if (this.type === "qualityEngineer") {
this.roleForm.qualityEngineer = data[0].id; this.roleForm.qualityEngineer = data[0].id;
this.roleForm.qualityEngineerName = data[0].name; this.roleForm.qualityEngineerName = data[0].name;
this.listForm.qualityEngineer = data[0].id; this.listForm.qualityEngineer = data[0].id;
this.listForm.qualityEngineerName = data[0].name; this.listForm.qualityEngineerName = data[0].name;
} else if (this.type === "certifiedEngineer") { } else if (this.type === "certifiedEngineer") {
this.roleForm.certifiedEngineer = data[0].id; this.roleForm.certifiedEngineer = data[0].id;
this.roleForm.certifiedEngineerName = data[0].name; this.roleForm.certifiedEngineerName = data[0].name;
this.listForm.certifiedEngineer = data[0].id; this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name; this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") { } else if (this.type === "distributePerson") {
this.listForm.distributePerson = data[0].name; // this.dataList.distributePerson = data[0].id;
this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id // this.dataList.distributePersonName = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
this.showColumn = false; this.showColumn = false;
this.$nextTick(() => { this.$nextTick(() => {
this.showColumn = true this.showColumn = true;
}) });
} }
this.modalshowflag = false; this.modalshowflag = false;
}, },
@@ -521,7 +540,7 @@ export default {
this.active = name; this.active = name;
}, },
typeChange(type) { typeChange(type) {
this.standardSearch.standType = type this.standardSearch.standType = type;
}, },
choiceShow() { choiceShow() {
this.ListModel = true; this.ListModel = true;
@@ -542,32 +561,32 @@ export default {
//点击添加事件 //点击添加事件
addList() { addList() {
this.standModel = true; this.standModel = true;
this.$refs.projectTable.clearSelection() this.$refs.projectTable.clearSelection();
}, },
// 点击批量删除事件 // 点击批量删除事件
deleteList() { deleteList() {
if(this.selectList.length < 1){ if (this.selectList.length < 1) {
this.$message.warning('请选择一条数据进行删除') this.$message.warning("请选择一条数据进行删除");
}else { } else {
this.$confirm('您确认删除这些数据？', '提示', { this.$confirm("您确认删除这些数据？", "提示", {
confirmButtonText: "确认", confirmButtonText: "确认",
confirmButtonClass: "common-button-primary", confirmButtonClass: "common-button-primary",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}). then(() => { }).then(() => {
this.selectList.map(item => { this.selectList.map(item => {
let index; let index;
index = this.dataList.findIndex(items => { index = this.dataList.findIndex(items => {
return items.productLine = item return items.productLine = item;
})
if (index > -1) {
this.dataList.splice(index, 1);
}
}); });
this.selectList = []; if (index > -1) {
}).catch(() => { this.dataList.splice(index, 1);
}) }
} });
this.selectList = [];
}).catch(() => {
});
}
}, },
//取消添加事件 //取消添加事件
cancelStand() { cancelStand() {
@@ -576,21 +595,21 @@ export default {
//确认添加事件 //确认添加事件
okStand() { okStand() {
let proData = []; let proData = [];
if(this.dataList.length >= 1){ if (this.dataList.length >= 1) {
this.dataList.forEach(item => { this.dataList.forEach(item => {
if(proData.length === 0){ if (proData.length === 0) {
proData.push(item.productLine) proData.push(item.productLine);
}else if(!proData.includes(item.productLine)){ } else if (!proData.includes(item.productLine)) {
proData.push(item.productLine) proData.push(item.productLine);
}
})
this.standList.forEach(items => {
if(!proData.includes(items.productLine)){
this.dataList.push(items)
} }
}) });
this.standList.forEach(items => {
if (!proData.includes(items.productLine)) {
this.dataList.push(items);
}
});
this.standModel = false; this.standModel = false;
}else{ } else {
if (this.standList.length >= 1) { if (this.standList.length >= 1) {
this.dataList = this.standList; this.dataList = this.standList;
this.roleForm.directorUser = this.dataList[0].uname; this.roleForm.directorUser = this.dataList[0].uname;
@@ -607,7 +626,7 @@ export default {
let _formData = new FormData(); let _formData = new FormData();
_formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.uName); _formData.append("createUserName", this.$store.getters.userInfo.uName);
_formData.append("prcType", '5'); _formData.append("prcType", "5");
_formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
prcForm: this.prcForm, prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList, sarAccessInfoList: this.sarAccessInfoList,
@@ -625,19 +644,17 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if (this.dataList.length < 1) {
this.$message.warning("请添加产品线信息");
}
this.dataList.forEach(item => { this.dataList.forEach(item => {
if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){ if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
this.$message.warning('请选择分发责任人') this.$message.warning("请选择分发责任人");
} else { } else {
var json = Object.assign(this.listForm, this.roleForm) var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId; this.$refs["listForm"].validate((valid) => {
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj
json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj
this.$refs['listForm'].validate((valid) => {
if (valid) { if (valid) {
this.$refs['roleForm'].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, { this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this _this: this
@@ -666,7 +683,7 @@ export default {
} }
}); });
} }
}) });
}, },
//选择拆分标准取消事件 //选择拆分标准取消事件
@@ -723,8 +740,8 @@ export default {
selectThree(data) { selectThree(data) {
this.standList = data; this.standList = data;
}, },
choiceZRR(scope,type, title, id) { choiceZRR(scope, type, title, id) {
if(scope!=null){ if (scope != null) {
this.dsadadadsada = scope.$index; this.dsadadadsada = scope.$index;
} }
this.nodeList = []; this.nodeList = [];
@@ -740,19 +757,19 @@ export default {
}, },
pageChange(page) { pageChange(page) {
this.page = page; this.page = page;
this.getStandData() this.getStandData();
}, },
pageSizeChange(pageSize) { pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent; this.pageSize = this.$store.getters.userInfo.configContent;
this.getStandData() this.getStandData();
}, },
pageChangeNo(page) { pageChangeNo(page) {
this.pageNO = page; this.pageNO = page;
this.getProductData() this.getProductData();
}, },
pageSizeChangeNo(pageSize) { pageSizeChangeNo(pageSize) {
this.pageSizeNo = this.$store.getters.userInfo.configContent; this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.getProductData() this.getProductData();
}, },
//获取产品线数据 //获取产品线数据
getProductData() { getProductData() {
@@ -769,27 +786,27 @@ export default {
}); });
}, },
//获取标准数据 //获取标准数据
getStandData(){ getStandData() {
this.$http.post('SarStandItems/sar-stand-items/findStand',{ this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page, page: this.page,
size: this.pageSize, size: this.pageSize,
...this.standardSearch, ...this.standardSearch
},{ }, {
_this: this, _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.records; this.sarAccessListDatas = res.records;
this.total = res.total this.total = res.total;
}, e => { }, e => {
}) });
}, },
clearSearch() { clearSearch() {
this.standardSearch = { this.standardSearch = {
standName: "", standName: "",
standType:"", standType: ""
}; };
this.getStandData(); this.getStandData();
}, }
}, },
computed: {}, computed: {},
mounted() { mounted() {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+128 -121
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', @selection-change="selectStandChange"
fontWeight: 'bold', height: '48px'}"> :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber" prop="standEnName"
align="center" label="标准编号"
width="200" width="180"
label="标准编号"> fixed="left"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
align="center" fixed="left"
width="200" width="180"
label="标准名称"> align="center"
label="标准名称"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productType" prop="productType"
align="center" align="center"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
align="center" align="center"
width="160" width="160"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countermeasures" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
@@ -134,48 +140,41 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
prop="zcComplianceReasons" prop="zcComplianceReasons"
align="center" align="center"
width="160" width="160"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 bzFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.listForm.bzFlag = "2";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
}
}, e => {
});
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.listForm.bzFlag = "1";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
} }
}, e => {
});
}
},
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+129 -121
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', @selection-change="selectStandChange"
fontWeight: 'bold', height: '48px'}"> :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber" prop="standEnName"
align="center" label="标准编号"
width="200" width="180"
label="标准编号"> fixed="left"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
align="center" fixed="left"
width="200" width="180"
label="标准名称"> align="center"
label="标准名称"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productType" prop="productType"
align="center" align="center"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
align="center" align="center"
width="160" width="160"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countermeasures" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
@@ -134,48 +140,41 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
prop="zcComplianceReasons" prop="zcComplianceReasons"
align="center" align="center"
width="160" width="160"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 bzFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
@@ -359,43 +358,52 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); } else {
this.$http.post("lawss/activiti/completeTask", { this.listForm.bzFlag = "2";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
}
}, e => {
});
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); } else {
this.$http.post("lawss/activiti/completeTask", { this.listForm.bzFlag = "1";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
} }
}, e => {
});
}
},
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+129 -122
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', @selection-change="selectStandChange"
fontWeight: 'bold', height: '48px'}"> :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber" prop="standEnName"
align="center" label="标准编号"
width="200" width="180"
label="标准编号"> fixed="left"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
align="center" fixed="left"
width="200" width="180"
label="标准名称"> align="center"
label="标准名称"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productType" prop="productType"
align="center" align="center"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
align="center" align="center"
width="160" width="160"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countermeasures" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
@@ -134,48 +140,41 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
prop="zcComplianceReasons" prop="zcComplianceReasons"
align="center" align="center"
width="160" width="160"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 dlFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.listForm.dlFlag = "2";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
}
}, e => {
});
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.listForm.dlFlag = "1";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
} }
}, e => {
});
}
},
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
@@ -404,7 +411,7 @@ export default {
mounted() { mounted() {
this.processTable(); this.processTable();
this.getData(); this.getData();
} },
}; };
</script> </script>
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+18 -47
View File
@@ -72,7 +72,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
@@ -84,21 +84,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -112,7 +112,7 @@
label="合规"> label="合规">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].complianceReasons" v-model="scope.row.complianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
> >
</el-input> </el-input>
@@ -130,7 +130,7 @@
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].noCompliance" v-model="scope.row.noCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
</el-input> </el-input>
@@ -143,7 +143,7 @@
label="应对措施"> label="应对措施">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].countermeasures" v-model="scope.row.countermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
</el-input> </el-input>
@@ -156,7 +156,7 @@
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
v-model="dataList[scope.$index].completionTime" v-model="scope.row.completionTime"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
@@ -174,7 +174,7 @@
label="合规(具体情况)"> label="合规(具体情况)">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].zcComplianceReasons" v-model="scope.row.zcComplianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
> >
</el-input> </el-input>
@@ -191,7 +191,7 @@
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].zcNoCompliance" v-model="scope.row.zcNoCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
</el-input> </el-input>
@@ -204,7 +204,7 @@
label="应对措施"> label="应对措施">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].zcCountermeasures" v-model="scope.row.zcCountermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
</el-input> </el-input>
@@ -217,7 +217,7 @@
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
v-model="dataList[scope.$index].zcCompletionTime" v-model="scope.row.zcCompletionTime"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
@@ -396,6 +396,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
console.log(res.mesg)
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
} }
@@ -407,37 +408,13 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
console.log(this.listForm)
this.listForm.prcNum = this.prcNum; this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; // this.listForm.dataList = item.dataList;
this.dataList = item.dataList; this.dataList = this.listForm.dataList;
let children = []; console.log(this.dataList)
item.breakdownList.forEach(
item => {
let aa = {
key: item.standId,
id: item.id,
standId: item.itemsNum,
itemsNum: item.itemsNum,
itemsName: item.itemsName,
workPeople: "请选择责任人"
};
children.push(aa);
}
);
this.dataList.forEach(key => {
key["children"] = [];
children.forEach(breakDown => {
if (key.standId === breakDown.key) {
key["children"].push(breakDown);
}
});
if (key["children"].length === 0) {
delete key["children"];
}
});
this.listForm.children = children;
}); });
}, },
//保存事件 //保存事件
@@ -446,8 +423,6 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.dataList.forEach(item => {
if (item.workPeople !== undefined) {
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -463,10 +438,6 @@ export default {
} }
}, e => { }, e => {
}); });
} else {
this.$message.warning("请选择分发负责人");
}
});
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+473 -467
View File
@@ -1,485 +1,491 @@
<template> <template>
<div class="xmpg2-step7"> <div class="xmpg2-step7">
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">项目合规评估流程-项目</template> <template slot="proName">项目合规评估流程-项目</template>
<template slot="proNode">分发责任人审批</template> <template slot="proNode">分发责任人审批</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="flex: auto; overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
<el-form <el-form
:model="listForm" :model="listForm"
class="label-input-form prc-content-border" class="label-input-form prc-content-border"
label-width="150px" label-width="150px"
> >
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled"> <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.projectNumber" v-model="listForm.projectNumber"
placeholder="请输入项目编号" placeholder="请输入项目编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled"> <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.projectName" v-model="listForm.projectName"
placeholder="请输入项目名称" placeholder="请输入项目名称"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<process-title style="margin-top:5px; margin-bottom: 5px"> <process-title style="margin-top:5px; margin-bottom: 5px">
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', @selection-change="selectStandChange"
fontWeight: 'bold', height: '48px'}"> :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
<el-table-column fontWeight: 'bold', height: '48px'}"
type="selection" >
width="55" <el-table-column
align="center"> type="selection"
</el-table-column> width="55"
<el-table-column align="center">
prop="standNumber" </el-table-column>
align="center" <el-table-column
width="200" prop="standEnName"
label="标准编号"> label="标准编号"
</el-table-column> width="180"
<el-table-column fixed="left"
prop="standName" align="center"
align="center" >
width="200" </el-table-column>
label="标准名称"> <el-table-column
</el-table-column> prop="standName"
<el-table-column fixed="left"
prop="itemNum" width="180"
align="center" align="center"
width="200" label="标准名称"
label="条款号"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsNum"
width="200" align="center"
align="center" width="200"
label="条款名称"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="条款名称">
<template slot-scope="scope"> </el-table-column>
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <el-table-column
</template> prop="xcxssrqgj"
</el-table-column> width="200"
<el-table-column align="center"
prop="zCCSSRQ" label="新车型实施日期">
width="200" <template slot-scope="scope">
align="center" <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
label="在产车实施日期"> </template>
<template slot-scope="scope"> </el-table-column>
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <el-table-column
</template> prop="zccssrqgj"
</el-table-column> width="200"
<el-table-column align="center"
prop="productType" label="在产车实施日期">
align="center" <template slot-scope="scope">
label="在研产品"> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<el-table-column </template>
prop="complianceReasons" </el-table-column>
align="center" <el-table-column
width="160" prop="productType"
label="合规"> align="center"
</el-table-column> label="在研产品">
<el-table-column <el-table-column
align="center" prop="complianceReasons"
width="160" align="center"
prop="researchNonCompliance" width="160"
label="不合规"> label="合规">
<el-table-column </el-table-column>
prop="noCompliance" <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规项目"> prop="researchNonCompliance"
</el-table-column> label="不合规">
<el-table-column <el-table-column
prop="countermeasures" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="应对措施">
<template slot-scope="scope"> </el-table-column>
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <el-table-column
</template> prop="completionTime"
</el-table-column> align="center"
</el-table-column> width="160"
</el-table-column> label="完成时间">
<el-table-column <template slot-scope="scope">
align="center" <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
label="在产产品"> </template>
<el-table-column </el-table-column>
prop="zcComplianceReasons" </el-table-column>
align="center" </el-table-column>
width="160" <el-table-column
label="合规(具体情况)"> align="center"
</el-table-column> label="在产产品">
<el-table-column <el-table-column
align="center" prop="zcComplianceReasons"
width="160" align="center"
label="不合规"> width="160"
<el-table-column label="合规(具体情况)">
prop="zcNoCompliance" </el-table-column>
align="center" <el-table-column
width="160" align="center"
label="不合规项目"> width="160"
</el-table-column> label="不合规">
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="应对措施">
<template slot-scope="scope"> </el-table-column>
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <el-table-column
</template> prop="zcCompletionTime"
</el-table-column> align="center"
</el-table-column> width="160"
</el-table-column> label="完成时间">
<el-table-column <template slot-scope="scope">
fixed="right" <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
align="center" </template>
width="150" </el-table-column>
prop="workPeople" </el-table-column>
label="落实人"> </el-table-column>
</el-table-column> </el-table>
</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> </div>
</el-collapse-item> <div>
</el-collapse> <el-collapse accordion>
</div> <el-collapse-item title="意见填写">
</div> <div style="margin: 10px 0;">
<div class="content" v-show="active === '3'"> <el-input
<div class="flow-list" style="height: 100%"> type="textarea"
<el-table :rows="3"
height="100%" resize="none"
ref="selection" placeholder="请输入意见"
:data="detailData" v-model="commentText">
tooltip-effect="dark" </el-input>
style="width: 100%" </div>
border </el-collapse-item>
row-key="id" </el-collapse>
:no-data-text="listNoDataText" </div>
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" </div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<ProcessFooter
show-back
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@back="beforeBack"
@submit="handleSubmit"
> >
<el-table-column </ProcessFooter>
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div> </div>
<ProcessFooter
show-back
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
</div>
</template> </template>
<script> <script>
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process"; import {inboundLiaisonDetail, queryDetail} from "api/process";
export default { export default {
name: "xmpg2Step7", name: "xmpg2Step7",
components: { components: {
ProcessTitle, ProcessTitle,
ProcessHeader, ProcessHeader,
ProcessFooter ProcessFooter
}, },
data() { data() {
return { return {
active: "1", active: "1",
loading: false, loading: false,
// 当前流程类型(1待办/2已办) // 当前流程类型(1待办/2已办)
processType: 1, processType: 1,
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 ffFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
breakdownList: [] //标准下的分解单数据 breakdownList: [] //标准下的分解单数据
}, },
dataList: [], //展示的标准数据 dataList: [], //展示的标准数据
commentText: "", //审批意见 commentText: "", //审批意见
detailData: [],//流程历史数据 detailData: [],//流程历史数据
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId pId: this.$route.query.prcId
};
},
methods: {
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res;
}, 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));
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.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
beforeBack() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "2";
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");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "1";
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");
}
});
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
},
}; };
},
methods: {
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res;
}, 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));
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.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
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");
}
}, e => {
});
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
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");
}
}, e => {
});
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
}
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.xmpg2-step7 { .xmpg2-step7 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
.choiceBtn { .choiceBtn {
.el-button--primary { .el-button--primary {
width: 150px; width: 150px;
} }
} }
position: relative; position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
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%; height: 100%;
}
}
}
.demo-drawer-content { .headerTabs {
margin-top: 10px; height: 52px;
} display: flex;
} align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
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> </style>
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+128 -121
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', @selection-change="selectStandChange"
fontWeight: 'bold', height: '48px'}"> :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber" prop="standEnName"
align="center" label="标准编号"
width="200" width="180"
label="标准编号"> fixed="left"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
align="center" fixed="left"
width="200" width="180"
label="标准名称"> align="center"
label="标准名称"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productType" prop="productType"
align="center" align="center"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
align="center" align="center"
width="160" width="160"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countermeasures" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
@@ -134,48 +140,41 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
prop="zcComplianceReasons" prop="zcComplianceReasons"
align="center" align="center"
width="160" width="160"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 jgFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.listForm.jgFlag = "2";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
}
}, e => {
});
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.listForm.jgFlag = "1";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
} }
}, e => {
});
}
},
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+127 -120
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', @selection-change="selectStandChange"
fontWeight: 'bold', height: '48px'}"> :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber" prop="standEnName"
align="center" label="标准编号"
width="200" width="180"
label="标准编号"> fixed="left"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
align="center" fixed="left"
width="200" width="180"
label="标准名称"> align="center"
label="标准名称"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productType" prop="productType"
align="center" align="center"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
align="center" align="center"
width="160" width="160"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countermeasures" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
@@ -134,48 +140,41 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
prop="zcComplianceReasons" prop="zcComplianceReasons"
align="center" align="center"
width="160" width="160"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -359,42 +358,50 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.listForm.gcFlag = "2";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
}
}, e => {
});
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.listForm.gcFlag = "1";
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message);
}); this.$router.push("/processCenter");
} }
}, e => {
});
}
},
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+44 -26
View File
@@ -25,33 +25,39 @@
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input v-model="historySearch.responseUnitShow" v-show="false" /> <el-select v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
<el-popover <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
placement="bottom" {{ opt.label}}</el-option>
popper-class="user-dept-popper" </el-select>
trigger="click"
:value="false"
>
<el-input
slot="reference"
v-model="historySearch.responseUnitShow"
placeholder="根据责任部门查找"
readonly
clearable
id="searchResp"
/>
<div class="api">
<laws-tree
:zNodes="zNodesSItem"
treeDivId="zNodesSItemSearch"
deptSelect
showRMenu
@treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
class="ztree" style="width: 200px;height: 400px;overflow: auto">
</laws-tree>
</div>
</el-popover>
</el-form-item> </el-form-item>
<!-- <el-form-item label="责任部门" class="search-item">-->
<!-- <el-input v-model="historySearch.responseUnitShow" v-show="false" />-->
<!-- <el-popover-->
<!-- placement="bottom"-->
<!-- popper-class="user-dept-popper"-->
<!-- trigger="click"-->
<!-- :value="false"-->
<!-- >-->
<!-- <el-input-->
<!-- slot="reference"-->
<!-- v-model="historySearch.responseUnitShow"-->
<!-- placeholder="根据责任部门查找"-->
<!-- readonly-->
<!-- clearable-->
<!-- id="searchResp"-->
<!-- />-->
<!-- <div class="api">-->
<!-- <laws-tree-->
<!-- :zNodes="zNodesSItem"-->
<!-- treeDivId="zNodesSItemSearch"-->
<!-- deptSelect-->
<!-- showRMenu-->
<!-- @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
<!-- class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
<!-- </laws-tree>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </el-form-item>-->
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -374,6 +380,7 @@ export default {
total: 0, total: 0,
// 当前页数 // 当前页数
pageNo: 1, pageNo: 1,
zrbmOptions:[],
// 单页数量 // 单页数量
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
// 历史数据查看 // 历史数据查看
@@ -652,6 +659,17 @@ export default {
} }
}, },
mounted () { mounted () {
// 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.allSelectOptions = res.data || {}
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.getGzzOption()
this.setMap(this.standStateOptions)
}, e => {
})
this.getTableBtn() this.getTableBtn()
this.getOrgTreeSource() this.getOrgTreeSource()
} }
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+44 -26
View File
@@ -17,33 +17,39 @@
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" /> <el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
<el-popover <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
placement="bottom" {{ opt.label}}</el-option>
popper-class="user-dept-popper" </el-select>
trigger="click"
:value="false"
>
<el-input
slot="reference"
v-model="nonConformitySearch.responsibleUnitShow"
placeholder="根据责任部门查找"
readonly
clearable
id="searchResp"
/>
<div class="api">
<laws-tree
:zNodes="zNodesSItem"
treeDivId="zNodesSItemSearch"
deptSelect
showRMenu
@treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
class="ztree" style="width: 200px;height: 400px;overflow: auto">
</laws-tree>
</div>
</el-popover>
</el-form-item> </el-form-item>
<!-- <el-form-item label="责任部门" class="search-item">-->
<!-- <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />-->
<!-- <el-popover-->
<!-- placement="bottom"-->
<!-- popper-class="user-dept-popper"-->
<!-- trigger="click"-->
<!-- :value="false"-->
<!-- >-->
<!-- <el-input-->
<!-- slot="reference"-->
<!-- v-model="nonConformitySearch.responsibleUnitShow"-->
<!-- placeholder="根据责任部门查找"-->
<!-- readonly-->
<!-- clearable-->
<!-- id="searchResp"-->
<!-- />-->
<!-- <div class="api">-->
<!-- <laws-tree-->
<!-- :zNodes="zNodesSItem"-->
<!-- treeDivId="zNodesSItemSearch"-->
<!-- deptSelect-->
<!-- showRMenu-->
<!-- @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
<!-- class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
<!-- </laws-tree>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </el-form-item>-->
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -427,6 +433,7 @@ export default {
productName: '', // 项目名称 productName: '', // 项目名称
responsibleUnit: '' // 责任部门 responsibleUnit: '' // 责任部门
}, },
zrbmOptions: [], // 责任部门下拉框
// 责任部门 // 责任部门
zNodesSItem: [], zNodesSItem: [],
myLoading: { myLoading: {
@@ -654,6 +661,17 @@ export default {
}, },
}, },
mounted () { mounted () {
// 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.allSelectOptions = res.data || {}
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.getGzzOption()
this.setMap(this.standStateOptions)
}, e => {
})
this.getTableByPage() this.getTableByPage()
// 加载所有的部门 // 加载所有的部门
this.getOrgTreeSource() this.getOrgTreeSource()