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!136
This commit is contained in:
王夏晖
2021-09-13 14:00:11 +08:00
parent 872311675c 3e5794e3e4
commit ff326e7853
7 changed files with 99 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -836,7 +836,7 @@
<label class="see-drawer-name" title="新车型实施日期">新车型实施日期</label>
<span class="see-drawer-val"
:title="standShowItemEO.xcxssrq">{{
standShowItemEO.xcxssrq ? $moment(standShowItemEO.xccssrq).format('YYYY-MM-DD') : ''
standShowItemEO.xccssrq ? $moment(standShowItemEO.xccssrq).format('YYYY-MM-DD') : ''
}}</span>
</div>
<div class="see-drawer-div">
src/pages/localTool/standardWarning.vue
+64 -52
View File
@@ -8,59 +8,70 @@
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="标准预警" name="STANDARD">-->
<div class="dynamic-content">
<el-row>
<el-col>
<h5>实施预警</h5>
</el-col>
<el-col>
<div class="more">
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
<el-form-item label="标准编号">
<el-input clearable size="small"
v-model="dynamic.standCode"
placeholder="根据标准编号查找">
</el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input clearable size="small"
v-model="dynamic.standName"
placeholder="根据标准名称查找">
</el-input>
</el-form-item>
<el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
<el-datePicker
clearable size="small"
v-model="dynamic.putTime"
value-format="yyyy-MM-dd"
placeholder="根据实施日期查找">
</el-datePicker>
</el-form-item>
<el-form-item label="适用车型">
<el-input clearable size="small"
v-model="dynamic.applyType"
placeholder="根据适用车型查找">
</el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="small"
@click="searchBtnClick"
class="common-button-primary">
查询
</el-button>
<el-button
size="small"
@click="clearBtnClick"
class="common-button-primary">
清空
</el-button>
</el-form-item>
</el-form>
<div>
<h5>实施预警</h5>
</div>
<div class="more">
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
<el-form-item label="标准编号">
<el-input clearable size="mini"
v-model="dynamic.standCode"
placeholder="根据标准编号查找">
</el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input clearable size="mini"
v-model="dynamic.standName"
placeholder="根据标准名称查找">
</el-input>
</el-form-item>
<el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
<el-datePicker
clearable size="mini"
v-model="dynamic.putTime"
value-format="yyyy-MM-dd"
placeholder="根据实施日期查找">
</el-datePicker>
</el-form-item>
<el-form-item label="适用车型">
<el-input clearable size="mini"
v-model="dynamic.applyType"
placeholder="根据适用车型查找">
</el-input>
</el-form-item>
<div style="margin: 8px 0 0 0; float: right">
<el-button
type="primary"
size="mini"
@click="searchBtnClick"
class="common-button-primary">
查询
</el-button>
<el-button
size="mini"
@click="clearBtnClick"
class="common-button-primary">
清空
</el-button>
</div>
</el-col>
</el-row>
<div class="content" style="height: 100%; padding-top: 5px; ">
<!-- <el-form-item>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="mini"-->
<!-- @click="searchBtnClick"-->
<!-- class="common-button-primary">-->
<!-- 查询-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- @click="clearBtnClick"-->
<!-- class="common-button-primary">-->
<!-- 清空-->
<!-- </el-button>-->
<!-- </el-form-item>-->
</el-form>
</div>
<div class="content" style="height: 100%; padding-top: 50px; ">
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
<el-table
:data="newItems"
@@ -1087,6 +1098,7 @@ export default {
}
.more {
margin-top: 30px;
/deep/ .el-input__inner {
width: 155px;
}
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+4 -10
View File
@@ -231,7 +231,7 @@
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
disabled></el-input>
</div>
</el-form-item>
</el-card>
@@ -788,10 +788,10 @@ export default {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
dockUser: "",
ministerUser: "",
ministerUser: this.$store.getters.userInfo.userId,
directorUser: "",
dockUserName: "",
ministerUserName: "",
ministerUserName: this.$store.getters.userInfo.userName,
directorUserName: ""
},
formRules: {
@@ -806,9 +806,6 @@ export default {
dockUserName: [
{ required: true, message: "请选择会签责任人", trigger: "change" }
],
ministerUserName: [
{ required: true, message: "请选择修订责任人", trigger: "change" }
],
directorUserName: [
{ required: true, message: "请选择审批责任人", trigger: "change" }
]
@@ -898,10 +895,7 @@ export default {
if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id;
this.roleForm.dockUserName = this.roleRow.name;
} else if (this.type === "ministerUser") {
this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "directorUser") {
} else if (this.type === "directorUser") {
this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = data[0].name;
}
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+7 -13
View File
@@ -131,20 +131,20 @@
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -231,7 +231,7 @@
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
disabled></el-input>
</div>
</el-form-item>
</el-card>
@@ -758,10 +758,10 @@ export default {
prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
dockUser: "",
ministerUser: "",
ministerUser: this.$store.getters.userInfo.userId,
directorUser: "",
dockUserName: "",
ministerUserName: "",
ministerUserName: this.$store.getters.userInfo.userName,
directorUserName: ""
},
formRules: {
@@ -776,9 +776,6 @@ export default {
dockUserName: [
{required: true, message: "请选择会签责任人", trigger: "change"}
],
ministerUserName: [
{required: true, message: "请选择修订责任人", trigger: "change"}
],
directorUserName: [
{required: true, message: "请选择审批责任人", trigger: "change"}
]
@@ -857,9 +854,6 @@ export default {
if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id;
this.roleForm.dockUserName = this.roleRow.name;
} else if (this.type === "ministerUser") {
this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "directorUser") {
this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = data[0].name;
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
-4
View File
@@ -80,7 +80,6 @@
prop="prcType"
label="流程类型"
align="center"
width="500"
>
<template slot-scope="scope">
{{ scope.row.prcName || getPrcName(scope.row.prcType) }}
@@ -98,14 +97,12 @@
prop="creatUserName"
label="发起人"
align="center"
width="300"
>
</el-table-column>
<el-table-column
prop="creatTime"
label="创建日期"
align="center"
width="380"
>
<template slot-scope="scope">
<span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -115,7 +112,6 @@
prop="overTime"
label="完成日期"
align="center"
width="380"
>
<template slot-scope="scope">
<span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+3 -3
View File
@@ -2530,8 +2530,8 @@ export default {
this.selectChildMenu(data)
this.productModal = true
// 取消所有的选中效果
this.productTitle = '编辑体系'
this.handleSelectAll(false)
this.productTitle = '编辑信息'
// const newChild = { id: this.id++, label: 'testtest', children: [] };
// if (!data.children) {
// this.$set(data, 'children', []);
@@ -2543,10 +2543,10 @@ export default {
this.modalType = 1
this.selectChildMenu(data)
this.productModal = true
this.productTitle = '新增体系'
this.productModelAdd.dicTypeCode = ''
// 取消所有的选中效果
this.handleSelectAll(false)
this.productTitle = '新增下级菜单信息'
this.productModelAdd.dicTypeCode = ''
// const newChild = { id: this.id++, label: 'testtest', children: [] };
// if (!data.children) {
// this.$set(data, 'children', []);
src/pages/regulatoryRepository/standardForComments/index.vue
+20 -15
View File
@@ -16,14 +16,26 @@
<el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable
:maxlength="100"></el-input>
</el-formItem>
<el-formItem label="开始日期" class="search-item">
<el-datePicker v-model="standCommonlySearch.start" :editable="false"
placeholder="请选择开始日期"></el-datePicker>
</el-formItem>
<el-formItem label="结束日期" class="search-item">
<el-datePicker v-model="standCommonlySearch.end" :editable="false"
placeholder="请选择结束日期"></el-datePicker>
</el-formItem>
<el-form-item label="开始日期" >
<el-date-picker
v-model="standCommonlySearch.start"
type="date"
:editable="false"
placeholder="请选择开始日期"
size="small"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="结束日期" >
<el-date-picker
v-model="standCommonlySearch.end"
type="date"
:editable="false"
placeholder="请选择结束日期"
size="small"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-formItem class="search-item btn-box">
<el-button
type="primary"
@@ -139,18 +151,11 @@ export default {
this.splitInfoPage = 1;
this.sarStandCompareHis();
},
// getTime(time){
// let date = new Date(time + 8 * 3600 * 1000); // 增加8小时
// console.log(date.toJSON().substr(0, 19).replace('T', ' '));
// return date.toJSON().substr(0, 19).replace('T', ' ');
// },
// 查询表格
sarStandCompareHis() {
this.spinShow = true;
this.standCommonlySearch.start = new Date(this.standCommonlySearch.start).getTime() //转换为毫秒时间戳
this.standCommonlySearch.type = 1;
var form = this.standCommonlySearch;
console.log(form);
this.$http.get("slrs/sar-public-idea/SelectAllPage", form, {
_this: this
}, res => {