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

修复bug

Browse Source
This commit is contained in:
宋伟佳
2021-07-27 21:14:32 +08:00
parent 51e37b012a
commit 50ee88f7c2
11 changed files with 148 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+1 -1
View File
@@ -1083,7 +1083,7 @@ export default {
});
this.fileListName = middle;
this.fileIds.push(file.response.data.id);
if(this.listForm.fileName === null || this.listForm.fileName == undefined){
if(this.listForm.fileName === null || this.listForm.fileName === undefined){
this.listForm.fileName = this.fileListName.join(',')
} else {
this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+3 -6
View File
@@ -369,14 +369,11 @@ export default {
},
//提交事件
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;
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写会签意见')
}
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
-8
View File
@@ -527,14 +527,6 @@ export default {
},
//提交事件
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);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+3 -7
View File
@@ -376,14 +376,10 @@
},
//提交事件
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;
if (this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}
this.listForm.commentText = this.commentText;
this.listForm.signflag = "";
this.listForm.standId = this.listForm.standId;
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+129 -112
View File
@@ -28,16 +28,16 @@
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
@@ -93,13 +93,22 @@
<el-table-column
prop="distributePerson"
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">
<div>
<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>
</template>
</el-table-column>
</el-table>
@@ -113,7 +122,7 @@
:model="roleForm"
:rules="roleFormRules"
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-form-item prop="startUserName" style="margin-bottom: 0">
<h4>标准法规工程师</h4>
@@ -241,17 +250,26 @@
>
</el-table-column>
<el-table-column
prop="issueTime"
prop="putTime"
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
prop="xcxssrq"
prop="xcxssrqgj"
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
show-overflow-tooltip
prop="zccssrq"
prop="zccssrqgj"
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
show-overflow-tooltip
@@ -370,20 +388,20 @@ export default {
// 查询相关参数
searching: false,
standardSearch: {
standType:'',
standName:'',
standType: "",
standName: ""
},
standardTypeOptions: [
{
value: 'INLAND',
label: '国内标准法规',
item:'INLAND',
value: "INLAND",
label: "国内标准法规",
item: "INLAND"
},
{
value: 'FOREIGN',
label: '海外标准法规',
item:'FOREIGN',
},
value: "FOREIGN",
label: "海外标准法规",
item: "FOREIGN"
}
],
nodeList: [],
defaultProps: {
@@ -394,14 +412,14 @@ export default {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.id,
qualityEngineer: "",
certifiedEngineer:"",
certifiedEngineer: "",
qualityEngineerName: "",
certifiedEngineerName:"",
certifiedEngineerName: "",
distributePerson: "",
dockUser:'',
ministerUser:"",
dockUserName:'',
ministerUserName:"",
dockUser: "",
ministerUser: "",
dockUserName: "",
ministerUserName: ""
},
formRules: {
standName: [
@@ -415,7 +433,7 @@ export default {
],
certifiedEngineer: [
{ required: true, message: "请选择认证工程师", trigger: "change" }
],
]
},
roleFormRules: {
dockUserName: [
@@ -423,7 +441,7 @@ export default {
],
ministerUserName: [
{ required: true, message: "请选择标准法规部领导", trigger: "change" }
],
]
},
ListModel: false, //选择拆分标准抽屉状态
treeData: [], // 人员数据
@@ -459,29 +477,29 @@ export default {
dataList: [{
projectLine: "", //产品线
uname: "",//产品线责任人
projectManager:"",// 产品线责任人id
projectManager: "",// 产品线责任人id
distributePerson: "", //分发责任人
distributePersonId: "", //分发责任人id
id: "",
sarStandProjectLibraries: [{
projectManager: '',
projectLevel: '',
projectNumber: '',
projectEndDate: '',
currentNode: '',
projectGroup: '',
productLine: '',
projectClassification: '',
projectStatus: '',
projectStartDate: '',
id: '',
projectName: '',
projectPlatfor: ''
projectManager: "",
projectLevel: "",
projectNumber: "",
projectEndDate: "",
currentNode: "",
projectGroup: "",
productLine: "",
projectClassification: "",
projectStatus: "",
projectStartDate: "",
id: "",
projectName: "",
projectPlatfor: ""
}]
}]
},
choiceForm: {}, //选择标准清单列表
showColumn:true
showColumn: true
};
},
methods: {
@@ -491,25 +509,26 @@ export default {
this.roleForm.dockUserName = data[0].name;
} else if (this.type === "ministerUser") {
this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = data[0].name;
this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "qualityEngineer") {
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.qualityEngineerName = data[0].name;
} else if (this.type === "certifiedEngineer") {
this.roleForm.certifiedEngineer = data[0].id;
this.roleForm.certifiedEngineerName = data[0].name;
this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name;
this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") {
this.listForm.distributePerson = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id
this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name
// this.dataList.distributePerson = data[0].id;
// this.dataList.distributePersonName = 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.$nextTick(() => {
this.showColumn = true
})
this.showColumn = true;
});
}
this.modalshowflag = false;
},
@@ -521,7 +540,7 @@ export default {
this.active = name;
},
typeChange(type) {
this.standardSearch.standType = type
this.standardSearch.standType = type;
},
choiceShow() {
this.ListModel = true;
@@ -542,32 +561,32 @@ export default {
//点击添加事件
addList() {
this.standModel = true;
this.$refs.projectTable.clearSelection()
this.$refs.projectTable.clearSelection();
},
// 点击批量删除事件
deleteList() {
if(this.selectList.length < 1){
this.$message.warning('请选择一条数据进行删除')
}else {
this.$confirm('您确认删除这些数据？', '提示', {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}). then(() => {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.productLine = item
})
if (index > -1) {
this.dataList.splice(index, 1);
}
if (this.selectList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据？", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.productLine = item;
});
this.selectList = [];
}).catch(() => {
})
}
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.selectList = [];
}).catch(() => {
});
}
},
//取消添加事件
cancelStand() {
@@ -576,21 +595,21 @@ export default {
//确认添加事件
okStand() {
let proData = [];
if(this.dataList.length >= 1){
this.dataList.forEach(item => {
if(proData.length === 0){
proData.push(item.productLine)
}else if(!proData.includes(item.productLine)){
proData.push(item.productLine)
}
})
this.standList.forEach(items => {
if(!proData.includes(items.productLine)){
this.dataList.push(items)
if (this.dataList.length >= 1) {
this.dataList.forEach(item => {
if (proData.length === 0) {
proData.push(item.productLine);
} else if (!proData.includes(item.productLine)) {
proData.push(item.productLine);
}
})
});
this.standList.forEach(items => {
if (!proData.includes(items.productLine)) {
this.dataList.push(items);
}
});
this.standModel = false;
}else{
} else {
if (this.standList.length >= 1) {
this.dataList = this.standList;
this.roleForm.directorUser = this.dataList[0].uname;
@@ -607,7 +626,7 @@ export default {
let _formData = new FormData();
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.uName);
_formData.append("prcType", '5');
_formData.append("prcType", "5");
_formData.append("json", JSON.stringify({
prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList,
@@ -625,19 +644,17 @@ export default {
},
//提交事件
handleSubmit() {
if (this.dataList.length < 1) {
this.$message.warning("请添加产品线信息");
}
this.dataList.forEach(item => {
if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){
this.$message.warning('请选择分发责任人')
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
this.$message.warning("请选择分发责任人");
} else {
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
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) => {
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
@@ -666,7 +683,7 @@ export default {
}
});
}
})
});
},
//选择拆分标准取消事件
@@ -723,8 +740,8 @@ export default {
selectThree(data) {
this.standList = data;
},
choiceZRR(scope,type, title, id) {
if(scope!=null){
choiceZRR(scope, type, title, id) {
if (scope != null) {
this.dsadadadsada = scope.$index;
}
this.nodeList = [];
@@ -740,19 +757,19 @@ export default {
},
pageChange(page) {
this.page = page;
this.getStandData()
this.getStandData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.getStandData()
this.getStandData();
},
pageChangeNo(page) {
this.pageNO = page;
this.getProductData()
this.getProductData();
},
pageSizeChangeNo(pageSize) {
this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.getProductData()
this.getProductData();
},
//获取产品线数据
getProductData() {
@@ -769,27 +786,27 @@ export default {
});
},
//获取标准数据
getStandData(){
this.$http.post('SarStandItems/sar-stand-items/findStand',{
getStandData() {
this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page,
size: this.pageSize,
...this.standardSearch,
},{
_this: this,
...this.standardSearch
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.records;
this.total = res.total
this.total = res.total;
}, e => {
})
});
},
clearSearch() {
this.standardSearch = {
standName: "",
standType:"",
standType: ""
};
this.getStandData();
},
}
},
computed: {},
mounted() {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<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
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<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
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<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
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<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
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<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
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">