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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!162
This commit is contained in:
王夏晖
2021-09-26 09:03:28 +08:00
parent 730098f884 58f24945a1
commit 6931ea5e89
11 changed files with 145 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/linkManage/index.vue
+1 -2
View File
@@ -44,8 +44,7 @@
</el-table-column>
<el-table-column
prop="name"
label="链接名称"
width="220px">
label="链接名称">
</el-table-column>
<el-table-column
label="链接">
src/pages/config/pages/mechanismManage/index.vue
+22 -15
View File
@@ -394,22 +394,29 @@ export default {
}
</style>
<style lang="less" scoped>
/deep/.el-select__tags {
overflow-x: hidden;
}
/deep/.width-all{
width: 100%;
}
.filter-tree {
height: calc(~'100% - 50px')
}
.laws-tree{
/deep/.clearable {
top: 20px;
#mechanism-manage{
height: 100%;
.content {
height: calc(~'100% - 105px - 56px')
}
/deep/.el-select__tags {
overflow-x: hidden;
}
/deep/.width-all{
width: 100%;
}
.filter-tree {
height: calc(~'100% - 50px')
}
.laws-tree{
/deep/.clearable {
top: 20px;
}
}
.add-form-item {
display: flex;
}
}
.add-form-item {
display: flex;
}
</style>
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+78 -39
View File
@@ -49,24 +49,21 @@
></el-input>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div>
<p>
{{ listForm.fileName }}
<el-upload
:action="uploadFileListPath"
show-file-list
:file-list="fileInfoList"
name="file"
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
<el-button class="common-button-default" size="mini">
点击上传
</el-button>
</el-upload>
</p>
<div class="file-box">
<el-upload
:action="uploadFileListPath"
show-file-list
:file-list="fileInfoList"
name="file"
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
<el-button class="common-button-default" size="mini">
点击上传
</el-button>
</el-upload>
</div>
</el-form-item>
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
@@ -129,6 +126,9 @@
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"
@@ -209,22 +209,8 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
<el-card>
<el-form-item prop="dockUserName2" style="margin-bottom: 0">
<h4>会签人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
@click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''">
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
<h4>标准/政策法规工程师</h4>
@@ -305,7 +291,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -313,7 +299,7 @@
align="center">
</el-table-column>
<el-table-column
prop="countryArea"
prop="countryAreaShow"
label="国家/地区"
align="center">
</el-table-column>
@@ -376,7 +362,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -462,7 +448,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -815,6 +801,7 @@ export default {
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件
fileIds: [], // 上传的附件
fileList: [],
fileListName: [], //上传的附件名称
standardData: [], //添加标准数据
standardData1: [], //添加标准数据
@@ -885,12 +872,38 @@ export default {
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes);
mes.form.fileName.forEach(itemId => {
this.fileIds = itemId.id
this.fileInfoList.push(itemId)
this.getFileInfo();
});
this.listForm = mes.form;
this.dataList = mes.form.dataList;
this.roleForm = mes.roleForm;
this.commentText = mes.commentText;
});
},
// 请求上传的文件信息
getFileInfo() {
this.$http.get("att/attFile/getMultiFileInfos", {
fileIds: this.fileIds
}, {
_this: this
}, res => {
this.$nextTick(() => {
res.data.map(item => {
// 赋值要回显的上传文件内容
this.fileList.push({
name: item.oldFileName,
uid: item.uid,
status: item.status,
id: item.id
});
});
});
}, e => {
});
},
checkedRole(data) {
if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id;
@@ -998,7 +1011,22 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records;
let arr = res.data.records;
//国家地区字段转换
arr.map(item => {
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
for (let m = 0; m < k.length; m++) {
if (this.countryOptions[i].value === k[m]) {
k[m] = this.countryOptions[i].label
}
item.countryAreaShow = k.join(',')
}
}
}
})
this.sarAccessListDatas = arr;
this.total = res.data.total;
}, e => {
});
@@ -1256,6 +1284,17 @@ export default {
cancelStand() {
this.standModel = false;
},
// 点击清单名称跳转事件
showTable(item) {
sessionStorage.setItem("accessRow", JSON.stringify(item));
this.$store.commit("setDetailMap", this.$route.path);
this.$router.push({
name: "AccessStandardDetails",
params: {
id: item.id
}
});
},
//添加标准确定事件
okStand() {
if (this.standList.length < 1) {
@@ -1344,6 +1383,7 @@ export default {
this.listForm.inforlist = formId.join(",");
}, e => {
});
this.$refs.detailedSelection.clearSelection()
} else {
this.$message.warning("请选择一条数据进行带入");
}
@@ -1413,7 +1453,6 @@ export default {
});
},
pageChange(page) {
console.log(page);
this.page = page;
this.selectionList();
},
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+16 -18
View File
@@ -209,20 +209,6 @@
</el-form-item>
</el-card>
</el-timeline-item>
<!-- <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
<!-- :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
<!-- <el-card>-->
<!-- <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
<!-- <h4>会签人</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
<!-- <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
<!-- @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card>
@@ -305,7 +291,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -376,7 +362,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -447,7 +433,7 @@
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
ref="detailedSelection"
>
<el-table-column
type="selection"
@@ -959,7 +945,7 @@ export default {
}, res => {
let arr = res.data.records;
//国家地区字段转换
arr.forEach(item => {
arr.map(item => {
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
@@ -1235,6 +1221,17 @@ export default {
cancelStand() {
this.standModel = false;
},
// 点击清单名称跳转事件
showTable(item) {
sessionStorage.setItem("accessRow", JSON.stringify(item));
this.$store.commit("setDetailMap", this.$route.path);
this.$router.push({
name: "AccessStandardDetails",
params: {
id: item.id
}
});
},
//添加标准确定事件
okStand() {
this.getStandData();
@@ -1324,6 +1321,7 @@ export default {
this.listForm.inforlist = formId.join(",");
}, e => {
});
this.$refs.detailedSelection.clearSelection()
} else {
this.$message.warning("请选择一条数据进行带入");
}
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+3
View File
@@ -779,6 +779,7 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
console.log(item.commentText);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
if(item.form === undefined){
@@ -791,9 +792,11 @@ export default {
this.listForm.jlUserId = item.jlUserId
this.listForm.zrUserId = item.zrUserId
this.fileInfoList = item.fileName
this.commentText = item.commentText
} else {
this.listForm = item.form
this.dataList = item.form.dataList
this.commentText = item.commentText
this.listForm.dataList = item.form.dataList
this.fileInfoList = item.form.fileName
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+1 -1
View File
@@ -272,7 +272,7 @@ export default {
this.countryOptions.forEach(item => {
map.set(item.value, item.label);
});
arr.forEach(item => {
arr.map(item => {
// 国家地区转换
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(",");
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+6 -3
View File
@@ -202,7 +202,6 @@
show-overflow-tooltip
prop="standName"
label="标准名称"
width="300"
>
<template slot-scope="scope">
<a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
@@ -4989,7 +4988,6 @@ export default {
background: url('~@/assets/images/shangqi/img/none-file.png');
background-size: 100% 100%;
}
/deep/ .is-show {
position: relative;
display: inline-block;
@@ -4998,7 +4996,12 @@ export default {
background: url('~@/assets/images/shangqi/img/tree.png');
background-size: 100% 100%;
}
#domesticStandardDatabase{
height: 100%;
.content {
height: calc(~'100% - 105px - 56px')
}
}
/deep/ .tree-line {
.el-tree-node {
position: relative;
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
-2
View File
@@ -306,7 +306,6 @@
show-overflow-tooltip
prop="standName"
label="中文名称"
width="300"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -318,7 +317,6 @@
show-overflow-tooltip
prop="standEnName"
label="英文名称"
width="300"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
-1
View File
@@ -199,7 +199,6 @@
show-overflow-tooltip
prop="standName"
label="标准名称"
width="300"
>
<template slot-scope="scope">
<a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
src/pages/searchCenter/pages/standardSearch.vue
+14 -12
View File
@@ -366,7 +366,7 @@
},
seniortypeAll: ['selectIndex'],
seniortypeStand: ['selectIndex', 'standSort', 'category', 'nature', 'standState', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD'],
seniortypeBuss: ['selectIndex', 'country', 'standSort', 'category', 'nature', 'standState', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD'],
seniortypeBuss: ['selectIndex', 'country', 'standSort', 'category', 'nature', 'standState', 'textStatus', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD'],
// seniortypeLaws: ['selectIndex', 'country', 'SYCLLX', 'ZRLX', 'WSSFCY'], // 政策的适用车辆类型、我司是否参与 和 国内的字段不一样
seniortypeLaws: ['selectIndex', 'country', 'CLLX', 'ZRLX', 'CYSD'], // 政策的适用车辆类型、我司是否参与 和 国内的字段不一样
seniortypeEnterprise : ['selectIndex','BUSSSTATE','ORGLIST'],
@@ -877,9 +877,7 @@
// 检索栏每一项回显数字
if (seniortype[i] === 'standSort') {
renameType = 'standSort'
}if(seniortype[i] === 'standState') {
renameType ='statecode'
} else if (seniortype[i] === 'applyArctic') {
}else if (seniortype[i] === 'applyArctic') {
renameType = 'apply_arctic'
} else if (seniortype[i] === 'energyKind') {
renameType = 'energy_kind'
@@ -893,13 +891,16 @@
renameType = 'QCDW'
} else if (this.selectIndex === 'enterprise' && seniortype[i] === 'BUSSSTATE'){
renameType = 'textStatusBuss'
}
else {
}else if (this.selectIndex === 'bussstand' && seniortype[i] === 'standState'){
renameType = 'textStatus'
}else {
renameType = seniortype[i]
}
console.log(renameType)
let resultsubdata = resultdata[renameType] || {}
let countAll = 0
if (nowdata) {
console.log(nowdata)
for (let ji = 0; ji < nowdata.length; ji++) {
if (resultsubdata[nowdata[ji].value] === undefined) {
nowdata[ji].number = 0
@@ -1128,20 +1129,20 @@
// filterOptions.standSort.options = [{label: '全部', value: 'all'}]
filterOptions.standSort.index = 1
// 标准状态
filterOptions.standState = originOptions.standState
filterOptions.standState.title = '标准状态'
filterOptions.standState = originOptions.WBZTCLASS
filterOptions.standState.title = '文本状态'
filterOptions.standState.index = 2
// 我司参与状态
// filterOptions.CYSD = originOptions.CYSD
// filterOptions.CYSD.title = '我司参与深度'
// filterOptions.CYSD.index = 3
// 监管类型
filterOptions.ZRLX = originOptions.ZRLX
filterOptions.ZRLX.title = '监管类型'
filterOptions.ZRLX.index = 4
// filterOptions.ZRLX = originOptions.ZRLX
// filterOptions.ZRLX.title = '监管类型'
// filterOptions.ZRLX.index = 4
// 适用车辆类型
filterOptions.CLLX = originOptions.CLLX
filterOptions.CLLX.index = 5
filterOptions.CLLX.index = 3
// 采标程度
// filterOptions.CBCD = originOptions.CBCD
// filterOptions.CBCD.index = 6
@@ -1272,6 +1273,7 @@
if (condition.selectIndex === 'bussstand') {
condition.selectIndex = 'stand'
condition.standType = 'FOREIGN'
condition.textStatus = condition.standState
} else if (condition.selectIndex === 'stand') {
condition.standType = 'INLAND'
}
src/sysConfig/index.js
+4 -4
View File
@@ -4,10 +4,10 @@
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
// const devIp = '62.234.136.153'
// const devInterfacePORT = '8033'
const devIp = '192.168.10.247'
const devInterfacePORT = '9999'
const devIp = '62.234.136.153'
const devInterfacePORT = '8033'
// const devIp = '192.168.10.247'
// const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'