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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-07-19 14:09:40 +08:00
parent 88fbde8b51 504349cef0
commit 88ba417c7e
19 changed files with 235 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home1/index.vue
+37 -20
View File
@@ -16,27 +16,29 @@
<search-group></search-group>
<div class="main-tabs">
<div class="main-left-wrap">
<el-button type="text" class="more" @click="MORE">MORE</el-button>
<el-tabs
v-model="activeName"
class="home-tabs"
@tab-click="handleTabClick"
>
<!-- <el-tab-pane label="外部会议资料" name="conferenceMaterials">-->
<!-- <conference-materials></conference-materials>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="会议通知" name="noticeOfMeeting">-->
<!-- <notice-of-meeting></notice-of-meeting>-->
<!-- </el-tab-pane>-->
<el-tab-pane label="标准征求意见" name="solicitOpinions">
<solicitOpinions></solicitOpinions>
</el-tab-pane>
<!-- <el-tab-pane label="标准发布" name="release">-->
<!-- <release></release>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="外部资讯" name="realTimeInfo">-->
<!-- <realTimeInfo></realTimeInfo>-->
<!-- </el-tab-pane>-->
</el-tabs>
v-model="activeName"
class="home-tabs"
@tab-click="handleTabClick"
>
<!-- <el-tab-pane label="外部会议资料" name="conferenceMaterials">-->
<!-- <conference-materials></conference-materials>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="会议通知" name="noticeOfMeeting">-->
<!-- <notice-of-meeting></notice-of-meeting>-->
<!-- </el-tab-pane>-->
<el-tab-pane label="标准征求意见" name="solicitOpinions">
<solicitOpinions></solicitOpinions>
</el-tab-pane>
<!-- <el-tab-pane label="标准发布" name="release">-->
<!-- <release></release>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="外部资讯" name="realTimeInfo">-->
<!-- <realTimeInfo></realTimeInfo>-->
<!-- </el-tab-pane>-->
</el-tabs>
</div>
</div>
</div>
@@ -106,6 +108,9 @@ export default {
}, e => {})
}).catch(() => {
})
},
MORE() {
this.$router.push({name: 'standardForComments'})
}
},
}
@@ -172,8 +177,20 @@ export default {
width: 60vw;
height: 100%;
margin-right: 10px;
.more {
float: right;
color: #FFFFFF;
margin: 0px 15px;
&:hover {
color: red;
cursor: pointer;
}
}
.home-tabs {
margin-left: 2.34vw;
::v-deep.el-tabs__header{
margin: 0 70px 15px 0px
}
::v-deep {
.el-tabs__item {
font-size: 16px;
src/pages/localTool/standAutoSplit/index.vue
+12 -14
View File
@@ -28,8 +28,8 @@
</table-tools-bar>
<div class="content">
<div class="action-bar">
<el-button size="mini" @click="spiltStandFile" v-btn-permission="''"><i class="iconfont"></i>拆分</el-button>
<el-button size="mini" @click="batchDelete" v-btn-permission="''"><i class="iconfont">&#xe61b;</i>删除</el-button>
<el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="''">拆分</el-button>
<el-button size="small" type="danger" @click="batchDelete" v-btn-permission="''">删除</el-button>
</div>
<div class="table-wrap">
<div style="position: absolute;height: 100%;width: 100%;">
@@ -542,16 +542,17 @@
</el-formItem>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
size="mini"
type="primary"
class="common-button-primary"
@click="getSearchSarBussStandPage">
搜索
</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
size="mini"
@click="handleResetCondition()"
></el-button>
>清空</el-button>
</el-form-item>
</el-form>
</div>
@@ -594,11 +595,11 @@
<a @click="showLawsDetails(scope.row)">{{ scope.row.lawsName }}</a>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="stateName"-->
<!-- align="center"-->
<!-- label="文本状态">-->
<!-- </el-table-column>-->
<!-- <el-table-column
prop="fileType"
align="center"
label="文本状态">
</el-table-column>-->
<!-- <el-table-column-->
<!-- prop="putTime"-->
<!-- label="新车型实施日期"-->
@@ -931,7 +932,7 @@ export default {
_this: this
}, res => {
this.addSpiltStandList = res.data.list
this.addFileStandtotal = res.data.count
this.addFileStandtotal = res.data.list.length
this.loadData = false
}, e => {
this.loadData = false
@@ -1359,10 +1360,7 @@ export default {
name: 'ItemSplitInfo',
query: {
infoId: row.id,
// standNumSplit: row.standNumSplit === null ? row.showNumber : row.standNumSplit,
// standNameSplit: row.standNameSplit === null ? row.standName : row.standNameSplit,
result: row.result,
// fileType: row.fileType
}
})
},
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+75 -2
View File
@@ -577,6 +577,51 @@
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="类型" class="search-item search-item-last">
<el-select
@change="typeChange"
v-model="standardSearch.standType"
placeholder="请选择"
filterable
>
<el-option
v-for="item in standardTypeOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准号/标准名称" class="search-item search-item-last">
<el-input
v-model="standardSearch.standNumber"
placeholder="请输入标准号或标准名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
:loading="searching"
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="addList">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearSearch">清空
</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:data="standardData"
tooltip-effect="dark"
@@ -729,13 +774,20 @@ export default {
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
searching: false,
// 查询相关参数
// 查询选择清单相关参数
sarSarAccessEOSearch: {
countryArea: "",
detailedListName: "",
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
//查询添加标准相关数据
standardSearch: {
standType: '',
standNumber:'',
pageNo: 1,
pageSizeNo: this.$store.getters.userInfo.configContent
},
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
@@ -823,6 +875,18 @@ export default {
},
choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据
standardTypeOptions: [
{
value: 'INLAND',
label: '国内标准法规',
item:'INLAND',
},
{
value: 'FOREIGN',
label: '海外标准法规',
item:'FOREIGN',
},
],
user1: "",
user2: "",
user3: "",
@@ -878,7 +942,6 @@ export default {
// //判断当前选中的是哪个清单
selectionList(type) {
type = this.listType
console.log(type);
if (type === "project") {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page,
@@ -925,11 +988,18 @@ export default {
countryArea: "",
detailedListName: ""
};
this.standardSearch ={
standType:'',
standNumber: '',
}
this.selectionList();
this.addList()
},
//点击添加事件
addList() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
standType: this.standardSearch.standType,
standNumber: this.standardSearch.standNumber,
page: this.pageNo,
pageSize: this.pageSizeNo
}, {
@@ -1126,6 +1196,9 @@ export default {
closeDrawer() {
this.ListModel = false;
},
typeChange(type) {
this.standardSearch.standType = type
},
//添加标准取消事件
cancelStand() {
this.standModel = false;
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
-42
View File
@@ -135,46 +135,6 @@
</el-collapse>
</div>
</div>
<div class="content" v-show="active == '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
<el-card>
<h4>标准/政策法规工程师</h4>
<div style="margin-top: 10px;">
<el-input v-model="user1" placeholder="请输入"></el-input>
</div>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择责任人进行会签" placement="top" :color="user2 ? '#66b1ff' : ''">
<el-card>
<h4>责任人</h4>
<div style="margin-top: 10px;">
<el-input v-model="user2" placeholder="请输入">
</el-input>
</div>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="根据会签内容进行修订" placement="top" :color="user3 ? '#66b1ff' : ''">
<el-card>
<h4>标准/政策法规工程师</h4>
<div style="margin-top: 10px;">
<el-input v-model="user3" placeholder="请输入"></el-input>
</div>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
<el-card>
<h4>业务经理</h4>
<div style="margin-top: 10px;">
<el-input v-model="user5" placeholder="请输入"></el-input>
</div>
</el-card>
</el-timeline-item>
</el-timeline>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
@@ -197,14 +157,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
-2
View File
@@ -161,14 +161,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
-2
View File
@@ -158,14 +158,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+3 -3
View File
@@ -340,7 +340,7 @@ export default {
// 点击批量删除事件
deleteList() {
if (this.selectList.length < 1) {
if (this.selectedList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
@@ -350,7 +350,7 @@ export default {
type: "warning"
}).then(() => {
let exits = [];
this.selectList.map(item => {
this.selectedList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.id = item;
@@ -360,7 +360,7 @@ export default {
}
exits.push(item);
});
this.selectList = [];
this.selectedList = [];
}).catch(() => {
});
}
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+14 -2
View File
@@ -92,8 +92,10 @@
<el-table-column prop="planCloseTime" label="整改完成时间"/>
<el-table-column prop="responsibleUnit" label="责任部门"/>
<el-table-column prop="dutyEngineer" label="负责人"/>
<el-table-column label="佐证材料">
<div class="div-text">{{ 11 || '暂无数据' }}</div>
<el-table-column label="佐证材料" show-overflow-tooltip>
<template slot-scope="scope">
<el-button type="text" @click="download" >{{scope.row.fileText}}</el-button>
</template>
</el-table-column>
</el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
@@ -263,6 +265,16 @@ export default {
}
this.getData()
},
download(row) {
// window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
var name = row.fileText;
var url = row.fileTextPath;
const a = document.createElement('a')
a.setAttribute('download', name)
a.setAttribute('target', '_blank')
a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
a.click()
},
// 分页事件
pageChange (page) {
this.pageNo = page
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+82 -7
View File
@@ -65,7 +65,7 @@
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="addList">新增</el-button>
<el-button plain class="common-button-primary" size="mini" @click="addList">批量删除</el-button>
<el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
</div>
</div>
<el-table
@@ -163,6 +163,41 @@
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<!-- <div class="left">-->
<!-- <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">-->
<!-- <el-form-item label="标准号" class="search-item search-item-last">-->
<!-- <el-input-->
<!-- v-model="sarSarAccessEOSearch.standName"-->
<!-- placeholder="请输入标准号"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="标准名称" class="search-item search-item-last">-->
<!-- <el-input-->
<!-- v-model="sarSarAccessEOSearch.standNumber"-->
<!-- placeholder="请输入标准名称"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="search-item btn-box">-->
<!-- <el-button-->
<!-- :loading="searching"-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="small"-->
<!-- v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"-->
<!-- @click="getStandData">-->
<!-- 查询-->
<!-- </el-button>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="search-item btn-box">-->
<!-- <el-button-->
<!-- class="common-button-default"-->
<!-- size="small"-->
<!-- v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"-->
<!-- @click="clearSearch">清空-->
<!-- </el-button>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<el-table
:data="sarAccessListDatas"
tooltip-effect="dark"
@@ -344,6 +379,14 @@ export default {
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
sarSarAccessEOSearch: {
standName:'',
standNumber:'',
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
nodeList: [],
defaultProps: {
children: "children",
@@ -386,6 +429,7 @@ export default {
},
ListModel: false, //选择拆分标准抽屉状态
treeData: [], // 人员数据
selectList: [], //选择标准的选择框
isSubmit: false,
saveLoading: false,
selectedList: [], //拆分标准的选择框
@@ -497,6 +541,32 @@ export default {
addList() {
this.standModel = true;
},
// 点击批量删除事件
deleteList() {
console.log(this.selectList.length);
if(this.selectList.length < 1){
this.$message.warning('请选择一条数据进行删除')
}else {
this.$confirm('您确认删除这些数据？', '提示', {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}). then(() => {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.productLine = item
})
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.selectList = [];
}).catch(() => {
})
}
},
//取消添加事件
cancelStand() {
this.standModel = false;
@@ -590,6 +660,7 @@ export default {
}, {
_this: this
}, res => {
console.log(res.data);
this.listForm.breakdownList = res.data;
this.ListModel = false;
}, e => {
@@ -609,7 +680,7 @@ export default {
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id);
this.selectList.push(data[i].productLine);
}
},
//添加产品线select的改变
@@ -655,7 +726,7 @@ export default {
}, {
_this: this
}, res => {
this.productData = res.data;
this.productData = res.data.records;
this.totalNo = res.data.total;
}, e => {
@@ -663,20 +734,24 @@ export default {
},
//获取标准数据
getStandData() {
console.log(this.page);
console.log(this.pageSize);
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
page: this.page,
pageSize: this.pageSize,
}, {
_this: this
}, res => {
console.log(res.data);
this.sarAccessListDatas = res.data.list;
this.total = res.data.count;
}, e => {
});
}
},
clearSearch() {
this.sarSarAccessEOSearch = {
standName: "",
standNumber: ""
};
this.getStandData();
},
},
computed: {},
mounted() {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
-2
View File
@@ -132,14 +132,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
-2
View File
@@ -177,14 +177,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
-2
View File
@@ -286,14 +286,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
-2
View File
@@ -243,14 +243,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
-2
View File
@@ -243,14 +243,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
-2
View File
@@ -243,14 +243,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+1 -1
View File
@@ -462,7 +462,7 @@ export default {
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
sortKey: 1,
sortKey: 4,
detailedList: '',
detailedListName: '',
energyKind: '',
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+9 -8
View File
@@ -10,8 +10,8 @@
<el-form-item label="清单名称" prop="detailedListName" class="search-item">
<el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="detailedList" class="search-item">
<el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
<el-form-item label="项目名称" prop="projectName" class="search-item">
<el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="适用领域" prop="applicationScope" class="search-item">
<el-select
@@ -246,8 +246,8 @@
align="center">
</el-table-column>
<el-table-column
prop="detailedList"
label="国家/地区"
prop="projectName"
label="项目名称"
align="center">
</el-table-column>
<el-table-column
@@ -462,8 +462,8 @@ export default {
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
sortKey: 1,
detailedList: '',
sortKey: 2,
projectName: '',
detailedListName: '',
energyKind: '',
type: '',
@@ -478,8 +478,8 @@ export default {
type: [
{required: true, message: '国内/海外不能为空', trigger: 'change'}
],
detailedList: [
{required: true, message: '清单类别不能为空', trigger: 'change'}
projectName: [
{required: true, message: '项目名称不能为空', trigger: 'change'}
],
detailedListName: [
{required: true, message: '清单名称不能为空', trigger: 'blur'},
@@ -1097,6 +1097,7 @@ export default {
},
// 提交按钮 事件
saveSarAccess () {
alert()
this.$refs['sarAccessForm'].validate((valid) => {
if (valid) {
let rowlist = []
src/router/index.js
+1 -1
View File
@@ -702,7 +702,7 @@ const routes = [
meta: {
requireAuth: false,
// parentPath: '/standAutoSplit',
title: '标准分解单'
title: '拆分结果'
}
},
// 标准编号申领
src/sysConfig/index.js
+1 -1
View File
@@ -7,7 +7,7 @@
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
// const devIp = '192.168.10.248'
const devIp = '192.168.10.254'
const devIp = '192.168.1.108'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'