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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
zyd
2022-09-22 00:45:36 +08:00
parent 481721e16c 3d8b35a115
commit 2f8294b0d2
248 changed files with 63338 additions and 111215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+33 -1
View File
@@ -458,6 +458,16 @@ export default {
dutyPeopleId: '',
dutyPeople: '',
firstDraftTime: '',
draftTime: '',
releaseTime: '',
bussSort: '',
drafter: '',
drafterName: '',
resPerson: '',
resPersonName: '',
wgLeader: '',
wgLeaderName: '',
reviseStatus: '',
planTime: '',
endTime: '',
},
@@ -845,7 +855,17 @@ export default {
dutyPeople: '',
firstDraftTime: '',
planTime: '',
endTime : ''
endTime : '',
draftTime: '',
releaseTime: '',
bussSort: '',
drafter: '',
drafterName: '',
resPerson: '',
resPersonName: '',
wgLeader: '',
wgLeaderName: '',
reviseStatus: '',
}
}
})
@@ -854,6 +874,7 @@ export default {
closeDrawer() {
if (this.btnType === 'edit') {
let Items = JSON.parse(localStorage.getItem('obj'))
console.log(Items)
this.addQblxData.esName = Items.esName
this.addQblxData.unit = Items.unit
this.addQblxData.unitName = Items.unitName
@@ -862,7 +883,18 @@ export default {
this.addQblxData.dutyPeople = Items.dutyPeople
this.addQblxData.firstDraftTime = Items.firstDraftTime
this.addQblxData.planTime = Items.planTime
this.addQblxData.draftTime = Items.draftTime
this.addQblxData.releaseTime = Items.releaseTime
this.addQblxData.bussSort = Items.bussSort
this.addQblxData.drafter = Items.drafter
this.addQblxData.resPerson = Items.resPerson
this.addQblxData.resPersonName = Items.resPersonName
this.addQblxData.endTime = Items.endTime
this.addQblxData.drafterName = Items.drafterName
this.addQblxData.wgLeader = Items.wgLeader
this.addQblxData.wgLeaderName = Items.wgLeaderName
this.addQblxData.reviseStatus = Items.reviseStatus
console.log(this.qblx_pageData.qblxData,'表格数据')
} else {
this.addQblxData = {}
}
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+36 -36
View File
@@ -96,42 +96,42 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="合规排查(上传合规举证材料)" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>责任工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.dutyUser" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.dutyUserName" disabled placeholder="责任工程师">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>产品工程经理/项目经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.uploadUser" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.uploadUserName" disabled placeholder="产品工程经理/项目经理">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.checkUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>标准法规部高级经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.checkUser" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.checkUserName" disabled placeholder="标准法规部高级经理">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<!-- <el-timeline-item timestamp="合规排查(上传合规举证材料)" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="dockUserName" style="margin-bottom: 0">-->
<!-- <h4>责任工程师</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.dutyUser" style="display: none;"></el-input>-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.dutyUserName" disabled placeholder="责任工程师">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<!-- <el-timeline-item timestamp="审定" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="dockUserName" style="margin-bottom: 0">-->
<!-- <h4>产品工程经理/项目经理</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.uploadUser" style="display: none;"></el-input>-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.uploadUserName" disabled placeholder="产品工程经理/项目经理">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<!-- <el-timeline-item timestamp="批准" placement="top" :color="roleForm.checkUser ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="dockUserName" style="margin-bottom: 0">-->
<!-- <h4>标准法规部高级经理</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.checkUser" style="display: none;"></el-input>-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.checkUserName" disabled placeholder="标准法规部高级经理">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
</el-form>
</el-timeline>
</div>
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+12
View File
@@ -261,6 +261,12 @@ export default {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
this.dataList = fileData[0].standardInfoList
fileData.forEach( filedata => {
// console.log(filedata)
if (filedata.id === this.userId){
this.dataList = filedata.standardInfoList
}
})
this.standardInfoList = this.dataList
this.textarea = JSON.parse(JSON.stringify(item)).textarea
/* 注释掉的代码 是因为后端已经分配过数据 前端不需要再做处理*/
@@ -274,6 +280,12 @@ export default {
} else {
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
this.dataList = fileData[0].standardInfoList
fileData.forEach( filedata => {
// console.log(filedata)
if (filedata.id === this.userId){
this.dataList = filedata.standardInfoList
}
})
this.standardInfoList = this.dataList
// for (let i = 0; i<fileData.length; i++) {
// if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
src/pages/regulatoryRepository/nonConfomity/index.vue
+4 -4
View File
@@ -52,10 +52,10 @@
const menuList = this.$store.getters.getMenuList;
let menuData = [];
let menuID = ["ff7bc984c8115204bba04090f350b19c", "e02897e9ab6b1a72f49c47c07b5be9a5"];
this.menuName.forEach(item => {
// this.menuName.forEach(item => {
for (let i = 0; i < menuList.length; i++) {
let entity = menuList[i];
if (item !== entity.menuName) continue;
// if (item !== entity.menuName) continue;
if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) === -1) {
menuData.push(entity.id);
if (entity.id === "ff7bc984c8115204bba04090f350b19c") {
@@ -64,8 +64,8 @@
this.keynote = true
}
}
}
});
};
// });
this.tabValue = this.database ? 'database' : (this.keynote ? 'keynote' : (this.tracking ? 'listTracking' : (this.other ? 'listOther' : (this.library ? 'localProductsOrProjectLibrary' : ''))))
},
watch: {},
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+1 -1
View File
@@ -457,7 +457,7 @@
</el-form-item>
<el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-select v-model="addForm.productName" filterable @change="handleChange" placeholder="请选择项目名称">
<el-select v-model="addForm.productName" :disabled = "drawerTitle === '编辑'" filterable @change="handleChange" placeholder="请选择项目名称">
<el-option
v-for="item in ProjectDatas"
:key="item.id"