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-21 15:46:24 +08:00
parent 3673d37a8d
commit e220e9c1f4
9 changed files with 153 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+7 -2
View File
@@ -1064,6 +1064,7 @@ export default {
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
let json = this.listForm; let json = this.listForm;
console.log(this.fileInfoList.join(','));
this.listForm.fileId = this.fileInfoList.join(',') this.listForm.fileId = this.fileInfoList.join(',')
this.listForm.fileName = this.fileListName.join(',') this.listForm.fileName = this.fileListName.join(',')
// let json = Object.assign(this.listForm, this.roleForm) // let json = Object.assign(this.listForm, this.roleForm)
@@ -1110,9 +1111,11 @@ export default {
// 删除上传的文件 // 删除上传的文件
delFileInfo(file, fileList) { delFileInfo(file, fileList) {
this.fileInfoList = fileList this.fileInfoList = fileList
let middle = []
fileList.forEach(item => { fileList.forEach(item => {
this.fileListName = item.name middle.push(item.name)
}) })
this.fileListName = middle
}, },
fileUpload () { fileUpload () {
this.fileMadel = true this.fileMadel = true
@@ -1120,9 +1123,11 @@ export default {
// 上传文件成功回调 // 上传文件成功回调
uploadBackSuccess (res, file, fileList) { uploadBackSuccess (res, file, fileList) {
if (res.ok) { if (res.ok) {
let middle = []
fileList.forEach(item => { fileList.forEach(item => {
this.fileListName = item.name middle.push(item.name)
}) })
this.fileListName = middle
this.fileInfoList = fileList this.fileInfoList = fileList
this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
this.$message.success('上传成功') this.$message.success('上传成功')
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+1 -1
View File
@@ -111,7 +111,7 @@
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+103 -29
View File
@@ -120,22 +120,56 @@
label="落实人"> label="落实人">
<template slot-scope="scope,text" v-if="showColumn"> <template slot-scope="scope,text" v-if="showColumn">
<div> <div>
<div @click="choiceZRR(scope,'implementer', '选择落实人', roleForm.implementer)"> <div @click="choiceZRRS(scope)">
{{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer
}} }}
</div> </div>
<!-- <div @click="choiceZRR(scope,'implementer', '选择落实人', roleForm.implementer)">-->
<!-- {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer-->
<!-- }}-->
<!-- </div>-->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 选择责任人--> <!-- 选择责任人-->
<!-- <el-drawer-->
<!-- :title="drawerTitle"-->
<!-- :visible.sync="modalshowflag"-->
<!-- :wrapperClosable="false"-->
<!-- size="800px">-->
<!-- <el-tree-->
<!-- v-if="modalshowflag"-->
<!-- style="height: 100%; overflow: auto;"-->
<!-- node-key="id"-->
<!-- class="filter-tree"-->
<!-- :data="treeData"-->
<!-- :props="defaultProps"-->
<!-- :default-checked-keys="nodeList"-->
<!-- highlight-current-->
<!-- check-strictly-->
<!-- @check="drawerCheck"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- show-checkbox-->
<!-- ref="tree">-->
<!-- </el-tree>-->
<!-- <div id="roleFormButton" class="demo-drawer-footer">-->
<!-- <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"-->
<!-- @click="saveUserInfo">-->
<!-- 确定-->
<!-- </el-button>-->
<!-- <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消-->
<!-- </el-button>-->
<!-- </div>-->
<!-- </el-drawer>-->
<el-drawer <el-drawer
:title="drawerTitle" title="选择责任部门对接人"
:visible.sync="modalshowflag" :visible.sync="modalshowflag2"
:wrapperClosable="false" :wrapperClosable="false"
size="800px"> size="800px">
<el-tree <el-tree
v-if="modalshowflag" v-if="modalshowflag2"
style="height: 100%; overflow: auto;" style="height: 100%; overflow: auto;"
node-key="id" node-key="id"
class="filter-tree" class="filter-tree"
@@ -144,26 +178,25 @@
:default-checked-keys="nodeList" :default-checked-keys="nodeList"
highlight-current highlight-current
check-strictly check-strictly
@check="drawerCheck"
default-expand-all default-expand-all
:expand-on-click-node="false" :expand-on-click-node="false"
show-checkbox show-checkbox
ref="tree"> ref="tree2">
</el-tree> </el-tree>
<div id="roleFormButton" class="demo-drawer-footer"> <div id="roleFormButton2" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
@click="saveUserInfo"> @click="saveUserInfo2">确定
确定
</el-button> </el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消
</el-button> </el-button>
</div> </div>
</el-drawer> </el-drawer>
</div> </div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
@@ -260,6 +293,7 @@ export default {
showColumn: true, showColumn: true,
drawerTitle: "", //drawer标题 drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
modalshowflag2: false,
treeData: [], // 人员数据 treeData: [], // 人员数据
nodeList: [], nodeList: [],
defaultProps: { defaultProps: {
@@ -296,6 +330,7 @@ export default {
qualityEngineer: "", //质量工程师 qualityEngineer: "", //质量工程师
breakdownList: [{ //分解单数据 breakdownList: [{ //分解单数据
implementer: "", implementer: "",
implementerId:'',
applyArctic: "", applyArctic: "",
busStandCover: "", busStandCover: "",
claimType: "", claimType: "",
@@ -308,6 +343,7 @@ export default {
}], }],
dataList: [{ dataList: [{
implementer: "", implementer: "",
implementerId:'',
projectLine: "", //产品线 projectLine: "", //产品线
uname: "",//产品线责任人 uname: "",//产品线责任人
distributePerson: "", //分发责任人 distributePerson: "", //分发责任人
@@ -331,7 +367,8 @@ export default {
}] }]
}, },
roleForm: { roleForm: {
implementer: "" implementer: "",
implementerId: "",
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
user1: "", user1: "",
@@ -374,6 +411,11 @@ export default {
}); });
}); });
}, },
createItemId() {
return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36);
},
/** /**
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
@@ -387,7 +429,7 @@ export default {
for (let i = 0; i < item.pepdtos.length; i++) { for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
this.listForm.breakdownList.push({ this.listForm.breakdownList.push({
itemId: new Date().getTime(), itemId: this.createItemId(),
itemsName: item.pepdtos[i].breakdownList[j].itemsName, itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum, itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
@@ -410,38 +452,70 @@ export default {
} }
} }
}, },
saveUserInfo() { // saveUserInfo() {
if (this.type === "implementer") { // if (this.type === "implementer") {
// // 如果有勾选的项
// if (this.selectList.length) {
// this.listForm.breakdownList.forEach((item, index) => {
// if (this.selectList.includes(item.itemId)) {
// this.listForm.breakdownList[index].implementerId = this.roleRow.id;
// this.listForm.breakdownList[index].implementer = this.roleRow.name;
// }
// });
// } else {
// this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
// this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
// }
// this.listForm.implementer = this.roleRow.name;
// this.showColumn = false;
// this.$nextTick(() => {
// this.showColumn = true;
// });
// }
// this.modalshowflag = false;
// },
saveUserInfo2 () {
var idList = "";
var nameList = "";
this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
// 如果有勾选的项 // 如果有勾选的项
if (this.selectList.length) { if (this.selectList.length) {
this.listForm.breakdownList.forEach((item, index) => { this.listForm.breakdownList.forEach((item, index) => {
console.log(item.itemId);
console.log(index);
if (this.selectList.includes(item.itemId)) { if (this.selectList.includes(item.itemId)) {
this.listForm.breakdownList[index].implementerId = this.roleRow.id; this.listForm.breakdownList[index].implementerId = idList;
this.listForm.breakdownList[index].implementer = this.roleRow.name; this.listForm.breakdownList[index].implementer = nameList;
} }
}); });
} else { } else {
this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id; this.listForm.breakdownList[this.dsadadadsada].implementerId = idList;
this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name; this.listForm.breakdownList[this.dsadadadsada].implementer = nameList;
} }
this.listForm.implementer = this.roleRow.name; this.listForm.implementer = nameList;
this.showColumn = false; this.showColumn = false;
this.$nextTick(() => { this.$nextTick(() => {
this.showColumn = true; this.showColumn = true;
}); });
} this.modalshowflag2 = false;
this.modalshowflag = false;
}, },
cancleUserInfo() { cancleUserInfo2() {
this.modalshowflag = false; this.modalshowflag2 = false;
}, },
choiceZRR(scope, type, title, id) { choiceZRRS(scope) {
if (scope != null) this.dsadadadsada = scope.$index; if (scope != null) this.dsadadadsada = scope.$index;
this.nodeList = []; this.nodeList = [];
this.nodeList.push(id); if (this.roleForm.implementer.length > 0) {
this.type = type; this.nodeList = this.roleForm.implementer.split(",");
this.drawerTitle = title; }
this.modalshowflag = true; this.modalshowflag2 = true;
}, },
getTree() { getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+2 -2
View File
@@ -271,9 +271,9 @@
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height:100%">
<el-table <el-table
height="800px" height="100%"
ref="selection" ref="selection"
:data="detailData" :data="detailData"
tooltip-effect="dark" tooltip-effect="dark"
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+1 -1
View File
@@ -228,7 +228,7 @@
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+1 -1
View File
@@ -228,7 +228,7 @@
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+1 -1
View File
@@ -228,7 +228,7 @@
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+20 -4
View File
@@ -92,6 +92,7 @@
<el-table-column <el-table-column
prop="standId" prop="standId"
width="180px" width="180px"
align="center"
label="标准编号"> label="标准编号">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a> <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>
@@ -100,6 +101,7 @@
<el-table-column <el-table-column
prop="standName" prop="standName"
width="180px" width="180px"
align="center"
label="标准名称"> label="标准名称">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a> <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -107,42 +109,56 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
width="150"
align="center"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="150"
align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productLine" prop="productLine"
width="150"
align="center"
label="产品线"> label="产品线">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productName" prop="productName"
width="150"
align="center"
label="项目名称"> label="项目名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="responsibleUnit" prop="responsibleUnit"
width="150"
align="center"
label="责任部门"> label="责任部门">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dutyEngineer" prop="dutyEngineer"
width="150px" width="150"
align="center"
label="责任工程师"> label="责任工程师">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="authEngineer" prop="authEngineer"
width="150px" width="150"
align="center"
label="认证工程师"> label="认证工程师">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="qaEngineer" prop="qaEngineer"
width="150px" width="150"
align="center"
label="质量工程师"> label="质量工程师">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="actualCloseTime" prop="actualCloseTime"
width="150px" width="150"
align="center"
sortable sortable
label="实际关闭时间"> label="实际关闭时间">
<template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template> <template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+17 -2
View File
@@ -117,9 +117,12 @@
fixed="left" fixed="left"
width="180" width="180"
label="标准编号"> label="标准编号">
<!-- <template slot-scope="scope">-->
<!-- <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
<!--&lt;!&ndash; {{ scope.row.standId }}&ndash;&gt;-->
<!-- </template>-->
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
<!-- {{ scope.row.standId }}-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -568,6 +571,18 @@ export default {
openEditModal(item) { openEditModal(item) {
console.log(item) console.log(item)
}, },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
//gslh3tgg7kot97ay5oz0
id: item.id,
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
detailsStandard (item) { detailsStandard (item) {
this.$http.post('lawss/sarTestItem/validateStandNumber', { this.$http.post('lawss/sarTestItem/validateStandNumber', {
standnumber: item.standNum standnumber: item.standNum