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 
Develop

See merge request LAWS/laws-system-front-FOTON!262
This commit is contained in:
王夏晖
2021-12-28 19:53:20 +08:00
parent 097b04ed14 3952d0d0ea
commit c7dd27cdfb
13 changed files with 219 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standCalendar/index.vue
+34 -11
View File
@@ -103,10 +103,10 @@
<!-- 会议编辑抽屉 -->
<el-drawer
title="编辑人员信息"
title="编辑会议信息"
:visible.sync="meetFlag"
:before-close="falseDrawer"
size="600px"
size="800px"
>
<div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
<el-form class="label-input-form" ref="editMeetForm" :model="editMeetForm" label-width="80px">
@@ -241,9 +241,9 @@
<!-- 编辑框内的人员的table上的编辑 -->
<el-drawer
title="编辑人员信息"
:title="dialogTitle"
:visible.sync="editFlag"
size="500px"
size="600px"
:before-close="falseDrawerTab"
custom-class="demo-drawer"
>
@@ -339,6 +339,7 @@ export default {
// 议题选中时储存数组
deleteTable: [],
loading: false,
dialogTitle: ''
}
},
mounted() {
@@ -619,10 +620,19 @@ export default {
fillFile: this.fillFile = []
}
this.editMeetForm.attend.push(list)
this.dialogTitle = '新增人员信息'
this.add_partDialog(list)
},
add_partDialog(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.editForm = row
this.editFlag = true
},
// 编辑按钮
edit_partForm(row) {
this.dialogTitle = '编辑人员信息'
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.editForm = row
@@ -679,13 +689,26 @@ export default {
this.editFlag = false
},
falseDrawerTab() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
if (this.dialogTitle = '新增人员信息') {
let Items = JSON.parse(localStorage.getItem('objs'))
this.editMeetForm.attend = Items.attend
this.editMeetForm.content = Items.content
this.editMeetForm.date = Items.date
this.editMeetForm.files = Items.files
this.editMeetForm.id = Items.id
this.editMeetForm.partPeople = Items.partPeople
this.editMeetForm.place = Items.place
this.editMeetForm.title = Items.title
this.editMeetForm.type = Items.type
} else {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
}
this.editFlag = false
},
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+26 -10
View File
@@ -295,7 +295,7 @@
</div>
</div>
<el-drawer
title="编辑人员信息"
:title="isTitle"
:visible.sync="editFlag"
size="500px"
>
@@ -478,6 +478,7 @@ export default {
acceptShow: false,
roleShowflag: false,
nodeList: [],
isTitle: ''
}
},
computed: {
@@ -539,6 +540,8 @@ export default {
fillFile: this.fillFile = []
}
this.rh_pageData.myPartRole.push(list)
this.isTitle = '新增人员信息'
this.add_partDialog(list)
},
fillFile_up(row) {
@@ -625,8 +628,17 @@ export default {
handleClose() {
this.upDialog = false
},
add_partDialog(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.fileListData = row
this.reData = this.fileListData.fillFile
this.editForm = row
this.editFlag = true
},
// 编辑按钮
edit_partForm(row) {
this.isTitle = '编辑人员信息'
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.fileListData = row
@@ -639,15 +651,19 @@ export default {
this.editFlag = false
},
falseDrawer() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillPost = Item.fillPost
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
this.editForm.fillFile = Item.fillFile
if (this.isTitle === '新增人员信息') {
this.getData()
} else {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillPost = Item.fillPost
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
this.editForm.fillFile = Item.fillFile
}
this.editFlag = false
},
// 编辑框选人
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+24 -9
View File
@@ -257,7 +257,7 @@
</div>
</div>
<el-drawer
title="编辑人员信息"
:title="isTitle"
:visible.sync="editFlag"
size="500px"
custom-class="demo-drawer"
@@ -356,7 +356,8 @@ export default {
fillDept: '',
fillTel: '',
fillMail: '',
}
},
isTitle: ''
}
},
computed: {
@@ -416,21 +417,35 @@ export default {
fillMail: this.fillMail,
}
this.ch_pageData.myPartRole.push(list)
this.isTitle = '新增人员信息'
this.add_partDialog(list)
},
// 编辑框确认按钮
OkDrawer() {
this.editFlag = false
},
falseDrawer() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
if (this.isTitle = '新增人员信息') {
this.getData()
} else {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
}
this.editFlag = false
},
add_partDialog(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.fileListData = row
this.editForm = row
this.editFlag = true
},
/** 入会人员编辑 */
edit_partForm(row) {
// 用来储存取消时原来的数据，防止取消时修改
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+3 -2
View File
@@ -49,7 +49,7 @@
/>
<i
title="下载带水印"
@click.stop="downloadFileByWater(item.id, item.name)"
@click.stop="downloadFileByWater(item.id, item.fileSuffix)"
class="icon-download2"
v-btn-permission="''"
/>
@@ -360,7 +360,8 @@ export default {
name: item.oldFileName,
uid: item.uid,
status: item.status,
id: item.id
id: item.id,
fileSuffix: item.fileSuffix
});
});
});
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+69 -67
View File
@@ -274,75 +274,77 @@
</el-form-item>
</el-form>
</div>
<el-table
:data="standardData"
v-loading="loading"
tooltip-effect="dark"
style="width: 100%"
border
ref="table"
class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
<div class="table-height">
<el-table
:data="standardData"
v-loading="loading"
tooltip-effect="dark"
style="width: 100%"
border
ref="table"
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="code"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
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>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="标准名称"
@selection-change="selectThree"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="code"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
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>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<pagination
:page="pageNo"
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+3 -2
View File
@@ -49,7 +49,7 @@
/>
<i
title="下载带水印"
@click.stop="downloadFileByWater(item.id, item.name)"
@click.stop="downloadFileByWater(item.id, item.fileSuffix)"
class="icon-download2"
v-btn-permission="''"
/>
@@ -429,7 +429,8 @@ export default {
name: item.oldFileName,
uid: item.uid,
status: item.status,
id: item.id
id: item.id,
fileSuffix: item.fileSuffix
});
});
});
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+2
View File
@@ -1836,9 +1836,11 @@ export default {
/** val === '1' (国外) val === '0'（ 国内 ）*/
// 国内英文名称不必填 国外必填 ，标准性质国内不体现
if (val === '1') {
this.rules.standName[0].required = false
this.rules.standEnName[0].required = true;
this.rules.standNature[0].required = false
} else {
this.rules.standName[0].required = true
this.rules.standNature[0].required = true
this.rules.standEnName[0].required = false;
}
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+18 -1
View File
@@ -26,7 +26,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData">
<el-radio-group v-model="form.standInData" @change="standInChange">
<el-radio label="0">国内标准入库</el-radio>
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
@@ -1692,6 +1692,23 @@ export default {
},
},
methods: {
// 标准来源改变事件
standInChange(val) {
this.verifySarStandard = false
/** val === '1' (国外) val === '0'（ 国内 ）*/
// 国内英文名称不必填 国外必填 ，标准性质国内不体现
if (val === '1') {
this.rules.standName[0].required = false
this.rules.standNature[0].required = false
this.rules.standEnName[0].required = true;
} else {
this.rules.standName[0].required = true
this.rules.standNature[0].required = true
this.rules.standEnName[0].required = false;
}
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
},
getBusStandFileByAttId(attId) {
return new Promise((resolve, reject) => {
getBusStandFileByAttId({
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+26 -26
View File
@@ -170,32 +170,32 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.ssrqgj"
type="date"
placeholder="请选择实施日期(国际)">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrqgj"
type="date"
placeholder="请选择新车型实施日期(国家)">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.zccssrqgj"
type="date"
placeholder="请选择在产车实施日期(国家)">
</el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</div>
<ProcessTitle>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+6 -3
View File
@@ -82,7 +82,7 @@
style="display: none;"
clearable
></el-input>
<el-input v-model="form.bzfgName" placeholder="请选择标准法规工程师分线管理员" @click.native="choiceZRR(form.bzfgId)"></el-input>
<el-input disabled v-model="form.bzfgName" placeholder="请选择标准法规工程师分线管理员"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -467,8 +467,11 @@
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
this.form.bzfgId = data.bzfgId || ''
this.form.bzfgName = data.bzfgName || ''
console.log(data);
this.form.bzfgId = data.startUser
this.form.bzfgName = data.startUserName
// this.form.bzfgId = data.bzfgId || ''
// this.form.bzfgName = data.bzfgName || ''
this.json = data
this.data = data.info || data.data
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+1 -1
View File
@@ -459,7 +459,7 @@ export default {
newText: '',
reason: '',
id: id,
department: this.$store.getters.userInfo.upDeptName,
department: this.$store.getters.userInfo.institutionName,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId
}
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+5
View File
@@ -226,6 +226,8 @@
background
:page-sizes="[20, 40, 60]"
:total="total"
:page-size="pageSize"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination>
@@ -753,6 +755,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
handleSizeChange(size) {
this.pageSize = size;
},
//保存事件
handleSave() {
this.saveLoading = true;
src/pages/searchCenter/pages/advancedSearch.vue
+2 -30
View File
@@ -305,21 +305,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<el-input v-model="standForm.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', standForm.cycvppsbm)"></el-input>
<tree-select-new
width = "800"
:key="key1"
:lazy=true
:multiple=true
:check-strictly= true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
:urlChild="urlChild"
@popoverHideCancel = "modalShowFlag2 = false"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
<el-input v-model="standForm.cycvppsbm" placeholder="请输入乘用车VPPS编码" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -332,21 +318,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model="standForm.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', standForm.kccvppsbm)"></el-input>
<tree-select-new
width = "800"
:key="key2"
:lazy=true
:multiple=true
:check-strictly= true
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
@popoverHideCancel = "modalShowFlag3 = false"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
<el-input v-model="standForm.kccvppsbm" placeholder="请输入卡车VPPS编码" clearable></el-input>
</el-form-item>
</el-col>
</el-row>