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-14 17:15:50 +08:00
parent 9b02ed06a5
commit 8b4e61300d
9 changed files with 60 additions and 49 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
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show ="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+7 -9
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -17,7 +17,7 @@
<el-form
:model="listForm"
:rules="formRules"
ref="xmpgForm"
ref="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
@@ -109,7 +109,7 @@
<div class="block" style="padding-top: 20px;">
<el-timeline>
<el-form
ref="Form"
ref="roleForm"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
@@ -536,16 +536,15 @@ export default {
},
//提交事件
handleSubmit() {
console.log(this.roleForm)
console.log(this.listForm);
// var json = this.listForm
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.account;
json.standId = this.listForm.standId;
this.$refs["xmpgForm"].validate((valid) => {
json.XCXSSRQ = this.sarAccessListDatas[0].attrInfoMap.XCXSSRQ
json.ZCCSSRQ = this.sarAccessListDatas[0].attrInfoMap.ZCCSSRQ
this.$refs['listForm'].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
@@ -652,7 +651,6 @@ export default {
}, {
_this: this
}, res => {
console.log(res.data);
this.productData = res.data;
this.totalNo = res.data.total;
}, e => {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2 -2
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -110,7 +110,7 @@
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+6 -4
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -98,12 +98,12 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="newTime"
prop="xCXSSRQ"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="oldTime"
prop="zCCSSRQ"
align="center"
label="在产车实施日期">
</el-table-column>
@@ -155,7 +155,7 @@
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
@@ -397,6 +397,8 @@ export default {
qualityEngineer: item.pepdtos[i].qualityEngineer,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
xCXSSRQ: item.pepdtos[i].xCXSSRQ,
zCCSSRQ: item.pepdtos[i].zCCSSRQ,
});
}
}
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+8 -8
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -103,13 +103,13 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="newTime"
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="oldTime"
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
@@ -264,7 +264,7 @@
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
@@ -492,10 +492,10 @@ export default {
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.step3DTOS
this.listForm.standName = item.step3DTOS[0].standName
this.listForm.standNumber = item.step3DTOS[0].standNumber
this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
// this.listForm.standName = item.step3DTOS[0].standName
// this.listForm.standNumber = item.step3DTOS[0].standNumber
// this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
// this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
})
},
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+14 -2
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
@@ -102,6 +102,18 @@
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="XCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="productType"
align="center"
@@ -203,7 +215,7 @@
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+10 -10
View File
@@ -295,19 +295,18 @@ export default {
},
// 批量删除
deleteSarAccess(flag, id) {
if (flag === "delOne") {
if (flag === 'delOne') {
this.selectedList = [];
this.selectedList[0] = id;
}
if (!this.selectedList.length) {
this.$message.warning("请选择要删除的数据");
if (this.selectedList.length === 0) {
this.$message.warning('请选择要删除的数据')
} else {
this.$confirm("确认删除选中数据？", "确认删除", {
confirmButtonText: "确定",
cancelButtonText: "取消",
confirmButtonClass: "common-button-primary",
roundButton: false,
type: "warning"
this.$confirm('确定删除这些数据？', '提示', {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
this.$http.postDelete(URL, {}, res => {
@@ -317,7 +316,8 @@ export default {
}, e => {
});
}).catch(() => {
});
})
}
},
// 表格选择框
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+11 -11
View File
@@ -300,31 +300,31 @@ export default {
name: "OtherAddEit"
});
},
// 删除
//批量删除
deleteSarAccess(flag, id) {
if (flag === "delOne") {
if (flag === 'delOne') {
this.selectedList = [];
this.selectedList[0] = id;
}
if (this.selectedList.length === 0) {
this.$message.warning("请选择要删除的数据");
this.$message.warning('请选择要删除的数据')
} else {
this.$confirm("确认删除这些数据？", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
this.$confirm('确定删除这些数据？', '提示', {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(",")}`;
const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
this.$http.postDelete(URL, {}, res => {
this.searchSarAccess();
this.selectedList = [];
this.$message.success("删除成功");
this.$message.success('删除成功')
}, e => {
});
}).catch(() => {
});
})
}
},
// 表格选择框
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+1 -2
View File
@@ -309,7 +309,7 @@ export default {
this.selectedList = [];
this.selectedList[0] = id;
}
if (this.selectedList === 0) {
if (this.selectedList.length === 0) {
this.$message.warning('请选择要删除的数据')
} else {
this.$confirm('确定删除这些数据？', '提示', {
@@ -329,7 +329,6 @@ export default {
})
}
},
// 表格选择框
selectOne(data) {