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:
zhutianqi
2021-12-17 17:31:25 +08:00
parent b3ecd95964 cdda1c385d
commit 72a16863c0
23 changed files with 851 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+1 -1
View File
@@ -143,7 +143,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
+1 -1
View File
@@ -139,7 +139,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+1 -1
View File
@@ -139,7 +139,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+1 -1
View File
@@ -158,7 +158,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+1 -1
View File
@@ -140,7 +140,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+2 -2
View File
@@ -1477,9 +1477,9 @@ export default {
replaceLoading: true,
replacePage: 1,
rules:{
/* standSort: [
standSort: [
{ required: true, message: '请选择标准类别', trigger: 'change' }
],*/
],
standNumber: [
{ required: true, message: '请输入标准编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
+279 -24
View File
@@ -37,12 +37,19 @@
placeholder="请输入标准编号"
clearable>
</el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="showStand"
style="position:absolute;top: 10px;right: 0;"
>手动查找</el-button>
</el-form-item>
<el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
<div class="form-select">
<el-select v-model="wbbzform.hostOrTask" placeholder="请选择主持或参与">
<el-option
v-for="item in associationOptions"
v-for="item in participateOptions"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -81,23 +88,18 @@
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准类型" prop="standType" class="add-form-item ">
<div class="form-select">
<el-select v-model="wbbzform.standType" placeholder="请选择标准类型">
<el-option
v-for="item in associationOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<el-form-item label="标准类别" prop="standType" class="add-form-item ">
<el-input
v-model="wbbzform.standType"
placeholder="请输入标准类别"
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
<div class="form-select">
<el-select v-model="wbbzform.standRevise" placeholder="请选择标准制修订">
<el-option
v-for="item in associationOptions"
v-for="item in standReviseOptions"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -257,6 +259,134 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- 添加标准抽屉-->
<el-drawer
title="添加标准"
:visible.sync="standModel"
size="900px"
custom-class="demo-drawer"
>
<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
type="primary"
class="common-button-primary"
size="small"
@click="getStandDataBtn">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
@click="clearStandSearch">清空
</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:data="standardData"
tooltip-effect="dark"
style="width: 100%"
border
ref="table"
class="table-height"
: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="标准名称"
>
<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>
</div>
<pagination
:page="pageNo"
:pageSize="pageSizeNo"
:total="totalNo"
@pageChange="pageChangeNo"
@pageSizeChange="pageSizeChangeNo"
/>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="cancelStand">取消</el-button>
<el-button type="primary" size="mini" @click="okStand">添加</el-button>
</div>
</el-drawer>
<ProcessFooter
show-save
show-submit
@@ -295,6 +425,31 @@ export default {
saveLoading: false,
loading: false,
detailData: [], //审批历史信息
standardData: [],
standModel: false,
pageNo: 1,
pageSizeNo: this.$store.getters.userInfo.configContent,
totalNo: 0,
//查询添加标准相关数据
standardSearch: {
standType: "",
standNumber: "",
pageNo: 1,
pageSizeNo: this.$store.getters.userInfo.configContent
},
standardTypeOptions: [
{
value: "INLAND",
label: "国内标准法规",
item: "INLAND"
},
{
value: "FOREIGN",
label: "海外标准法规",
item: "FOREIGN"
}
],
standList: [],
wbbzform: {
reportingUnit: "",
standNumber: "",
@@ -319,21 +474,40 @@ export default {
// expenses: '',
// costBudget:'',
// }], //参与人表格信息
associationOptions: [{
value: "选项1",
label: "1"
}, {
value: "选项2",
label: "2"
}, {
value: "选项3",
label: "3"
}]
participateOptions: [
{
value: '0',
label: '主持'
},
{
value: '2',
label: '参与'
},
{
value: '3',
label: 'N/A'
},
],
standReviseOptions: [
{
value: '制定完成',
label: '制定完成'
},
{
value: '制定中',
label: '制定中'
},
{
value: '未制定',
label: '未制定'
},
],
};
},
mounted() {
this.getData();
this.processTable();
this.getStandData()
},
methods: {
getData() {
@@ -383,6 +557,84 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
showStand(){
this.standModel = true
},
//添加标准确定事件
okStand(){
if(this.standList.length < 1){
this.$message.warning('请至少选择一条标准')
}else if(this.standList.length > 1){
this.$message.warning('您只能选择一条标准进行添加')
}else{
this.wbbzform.standName = this.standList[0].standName || this.standList[0].standEnName
this.wbbzform.standType = this.standList[0].standSort
this.wbbzform.standNumber = this.standList[0].standSort + '\xa0\xa0 '+ this.standList[0].standNumber
this.standModel = false
}
},
//添加标准取消事件
cancelStand() {
this.standModel = false;
},
typeChange(type) {
this.standardSearch.standType = type;
},
clearStandSearch() {
this.standardSearch = {
standType: "",
standNumber: ""
};
this.getStandData();
},
getStandDataBtn(){
this.pageNo =1;
this.getStandData();
},
//查询项目下的标准
getStandData() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
standType: this.standardSearch.standType,
standNumber: this.standardSearch.standNumber,
page: this.pageNo,
pageSize: this.pageSizeNo
}, {
_this: this
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
this.$set(item, "ZCCSSRQ", item.zccssrq);
this.$set(item, "XCXSSRQ", item.xcxssrq);
})
this.totalNo = res.data.count;
}, e => {
});
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
//添加标准select的改变
selectThree(data) {
this.standList = data;
},
pageChangeNo(page) {
this.pageNo = page;
this.getStandData();
},
pageSizeChangeNo(pageSize) {
this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.getStandData();
},
handleSave() {
},
//不备案
@@ -520,6 +772,9 @@ export default {
background: #E6A23C;
}
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+62 -30
View File
@@ -33,37 +33,37 @@
</el-form-item>
<el-form-item label="协会名称" prop="associationName" class="add-form-item ">
<div class="form-select">
<el-select v-model="wbbzform.associationName" placeholder="请选择协会名称">
<el-select @change="comityChange" v-model="wbbzform.associationName" placeholder="请选择协会名称">
<el-option
v-for="item in associationOptions"
:key="item.value"
:label="item.label"
:value="item.value">
v-for="item in comityOptionsOne"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
<el-select v-model="wbbzform.committee" placeholder="请选择分标委">
<el-select v-if="wbbzform.associationName !== ''" @change="comityChangeOne" v-model="wbbzform.committee" placeholder="请选择分标委">
<el-option
v-for="item in associationOptions"
:key="item.value"
:label="item.label"
:value="item.value">
v-for="item in comityOptionsTwo"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
<el-select v-model="wbbzform.workingGroup" placeholder="请选择工作组">
<el-select v-if="wbbzform.associationName !== '' && wbbzform.committee !== ''" v-model="wbbzform.workingGroup" placeholder="请选择工作组">
<el-option
v-for="item in associationOptions"
:key="item.value"
:label="item.label"
:value="item.value">
v-for="item in comityOptionsOneThree"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</div>
</el-form-item>
<el-form-item label="人员角色" prop="personnelRole" class="add-form-item ">
<el-form-item label="会员角色" prop="personnelRole" class="add-form-item ">
<div class="form-select">
<el-select v-model="wbbzform.personnelRole" placeholder="请选择会员角色">
<el-option
v-for="item in associationOptions"
v-for="item in comityRoleOptions"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -122,7 +122,7 @@
<el-table-column
prop="workPeople"
label="参与人"
width="150"
width="220"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.workPeopleId" style="display: none;" readonly/>
@@ -132,6 +132,7 @@
</el-table-column>
<el-table-column
prop="duties"
width="180"
label="职务"
align="center">
</el-table-column>
@@ -149,20 +150,27 @@
</el-table-column>
<el-table-column
prop="tenure"
width="200"
label="任期"
align="center">
</el-table-column>
<el-table-column
prop="account"
label="账户"
width="200"
width="300"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.account" placeholder="请输入账户"></el-input>
</template>
</el-table-column>
<el-table-column
prop="password"
label="密码"
width="350"
width="300"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.password" placeholder="请输入密码"></el-input>
</template>
</el-table-column>
</el-table>
<ProcessTitle>
@@ -349,6 +357,9 @@ export default {
recordLoading: false,
loading: false,
modalshowflag: false,
comityOptionsOne: [], //工作组数据
comityOptionsTwo: [], //分标委数据
comityOptionsOneThree: [], //工作组数据
drawerTitle: '',
nodeList: [],
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
@@ -391,16 +402,12 @@ export default {
associationData: [], //协会表格信息
detailData: [], //审批历史信息
selectedId: "",
associationOptions: [{
value: '选项1',
label: '1'
}, {
value: '选项2',
label: '2'
},{
value: '选项3',
label: '3'
}],
comityRoleOptions: [
{value: '0', label: '委员'},
{value: '1', label: '观察委员'},
{value: '2', label: '通讯委员'},
{value: '3', label: '成员'}
],
};
},
methods: {
@@ -683,8 +690,33 @@ export default {
}
return true;
},
/** 获取分标委数据字典数据 */
comityChange() {
this.wbbzform.committee = ''
this.wbbzform.workingGroup = ''
this.comityOptionsOne.forEach(item => {
if (item.children !== null && item.id === this.wbbzform.associationName) {
this.comityOptionsTwo = item.children
}
})
},
/** 获取工作组字典数据 */
comityChangeOne() {
this.wbbzform.workingGroup = ''
this.comityOptionsTwo.forEach(item => {
if (item.children !== null && item.id === this.wbbzform.committee) {
this.comityOptionsOneThree = item.children
}
})
},
},
mounted() {
/* 获取标准法规工作组数据 */
this.$http.get('wg_work_group/researchData',{type:0},{
_this: this
}, res => {
this.comityOptionsOne = res.data.children
})
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getDatas()
src/pages/processCenter/pages/phone/index.vue
+90
View File
@@ -0,0 +1,90 @@
<template>
<div class="phoneIndex phoneBox">
<loading :loading="loading"></loading>
</div>
</template>
<script>
import { mapMutations, mapActions } from 'vuex'
import {Base64} from "js-base64";
import {get_verify_by_instance, loginMobile} from "../../../../api/process";
import router from "../../../../router";
export default {
name: "phoneIndex",
data() {
return {
phoneInfo: {},
loading: true
}
},
methods: {
loginMobile(pid,taskIds) {
loginMobile({
taskIds: taskIds,
pId: pid
}).then(res => {
this.loginNew(res)
});
},
loginNew (res) {
let Base64 = require('js-base64').Base64
let userInfoStr = Base64.decode(res.data)
let userInfo2 = decodeURIComponent(userInfoStr)
let userInfoObj = JSON.parse(userInfo2)
userInfoObj.userId = userInfoObj.usid
window.sessionStorage.setItem('userInfoObj', userInfoObj);
this.setToken(userInfoObj.token) // vuex存储token
console.log(this.setToken)
let userInfo = {}
for (let key in userInfoObj) {
if (key !== 'uname') {
userInfo[key] = userInfoObj[key]
} else {
userInfo.uName = userInfoObj[key]
}
}
this.setUserInfo(JSON.stringify((userInfo)))
// this.resetTime()
// 获取用户菜单
window.sessionStorage.setItem('userInfo', userInfo); // del
this.routerPage()
},
routerPage() {
if (this.$store.state.token) {
let routerName = 'phone'+ this.phoneInfo.toName.charAt(0).toUpperCase() + this.phoneInfo.toName.slice(1)
this.loading = false
this.$router.push({
name: routerName,
query: {
taskIds: this.phoneInfo.taskId,
prcId: this.phoneInfo.prcId,
prcNum: this.phoneInfo.prcNum,
taskAssignee: this.phoneInfo.toName,
prcName: this.phoneInfo.prcName,
prcType: this.phoneInfo.prcType
}
})
} else {
this.loading = true
}
},
...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']),
},
watch: {
},
mounted() {
this.phoneInfo = JSON.parse(sessionStorage.getItem("param"))
let pId = this.phoneInfo.prcId
let taskIds = this.phoneInfo.taskId
this.loginMobile(pId,taskIds)
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/phone';
.phoneIndex {
}
</style>
src/pages/processCenter/pages/phone/wfhxzg/step3.vue
+4 -1
View File
@@ -179,8 +179,10 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {changeAssigneeNew, completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js";
import {Base64} from "js-base64";
import {mapMutations} from "vuex";
export default {
name: "phoneWfhxStep3",
name: "phoneWfhxzgStep3",
data() {
return {
passInfo: 0,
@@ -241,6 +243,7 @@ export default {
}
},
methods: {
...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']),
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
src/pages/processCenter/pages/phone/wfhxzg/step5.vue
+1 -1
View File
@@ -177,7 +177,7 @@ import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process";
export default {
name: "phoneWfhxStep5",
name: "phoneWfhxzgStep5",
data() {
return {
drawerTitle: '',
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+6 -3
View File
@@ -452,7 +452,7 @@
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.ssrq"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -460,7 +460,7 @@
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -468,7 +468,7 @@
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -2350,6 +2350,9 @@ export default {
background: #ffffff;
text-align: right;
}
/deep/.el-date-editor.el-input {
width: 100%;
}
}
.labelBox {
/deep/ .el-form-item__label {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+6 -3
View File
@@ -517,7 +517,7 @@
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.ssrq"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -525,7 +525,7 @@
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -533,7 +533,7 @@
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -2318,6 +2318,9 @@ export default {
background: #ffffff;
text-align: right;
}
/deep/.el-date-editor.el-input {
width: 100%;
}
}
.labelBox {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+21 -13
View File
@@ -597,7 +597,7 @@
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSCN'">
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px"
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
prop="cycvppscn" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
@@ -606,7 +606,7 @@
</el-form-item>
</template>
<template v-else-if="field.attrField === 'KCCVPPSCN'">
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" label-width="150px" prop="kccvppscn"
<el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" label-width="150px" prop="kccvppscn"
class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
@@ -1714,17 +1714,10 @@
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 关联模块--乘用车vpps中文名称-->
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber"
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
placeholder="关联模块--乘用车vpps中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!--关联模块--卡车VPPS编码-->
<el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
placeholder="关联模块--卡车VPPS编码"
placeholder="关联模块--乘用车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
@@ -1771,11 +1764,18 @@
</el-option>
</el-select>
</el-form-item>
<!--关联模块--卡车VPPS编码-->
<el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
placeholder="关联模块--卡车VPPS编码"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber"
<el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车vpps中文名称"
placeholder="关联模块--卡车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
</el-col>
@@ -4238,6 +4238,10 @@ export default {
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData
formData.startIssueTime = formData.issueTime[0]
formData.endIssueTime = formData.issueTime[1]
formData.issueTime = null
this.loading = true
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this, loading: 'loading'
@@ -5622,6 +5626,10 @@ export default {
overflow-x: scroll;
}
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
width: 280px;
}
.OCRstandardForComments {
height: 100%;
}
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+4 -1
View File
@@ -1026,7 +1026,7 @@
:model="sarBussionessSearch"
:inline="true"
class="label-input-form table-lattice"
label-width="76px"
label-width="300px"
style="display: flex;flex-wrap: wrap">
<ProcessTitle>
<template slot="title">基础信息</template>
@@ -4552,6 +4552,9 @@ export default {
width:70%;
height:100%;
}
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
width: 280px;
}
/deep/.contentTitle{
width: 100%;
}
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+33 -17
View File
@@ -465,7 +465,7 @@
<el-form
:model="sarStandardsSearch"
:inline="true"
label-width="68px"
label-width="300px"
class="label-input-form table-lattice"
style="display: flex;flex-wrap: wrap">
<ProcessTitle>
@@ -497,7 +497,10 @@
<el-form-item label="标准发布日期" title="标准发布日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="sarStandardsSearch.issueTime"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据标准发布日期查找">
</el-date-picker>
@@ -566,7 +569,10 @@
<el-form-item label="实施日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.SSRQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据实施日期查找">
</el-date-picker>
@@ -575,7 +581,10 @@
<el-form-item title="在产车实施日期" label="在产车实施日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.ZCCSSRQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据在产车实施日期查找">
</el-date-picker>
@@ -587,7 +596,10 @@
<el-date-picker
value-format="yyyy-MM-dd"
v-model="advanceSearchMapping.XCXSSRQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
placeholder="根据新车型实施日期查找">
</el-date-picker>
</el-form-item>
@@ -641,15 +653,15 @@
</el-select>
</el-form-item>
<!-- 关联模块--乘用车vpps中文名称-->
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
placeholder="关联模块--乘用车vpps中文名称"
placeholder="关联模块--乘用车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车vpps中文名称"
placeholder="关联模块--卡车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
@@ -718,10 +730,10 @@
</el-col>
<el-col :span="12">
<!-- 被代替标准号-->
<el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!-- 被引用标准-->
<el-form-item label="被引用标准" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.BYYBJ" clearable
@@ -5132,6 +5144,10 @@ export default {
@import '~@/assets/styles/style';
#foreignStandardsAndRegulations {
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
width: 280px;
}
//background: #fff;
display: flex;
height: 100%;
@@ -5366,15 +5382,15 @@ export default {
.label-input-form {
&.table-lattice {
/deep/ .el-input__inner {
height: 30px;
//height: 30px;
line-height: 30px;
border-radius: 0 !important;
}
}
.el-date-editor.el-input, .el-date-editor.el-input__inner {
width: 190px
}
//.el-date-editor.el-input, .el-date-editor.el-input__inner {
// width: 190px
//}
.classDisplay {
display: none;
src/pages/regulatoryRepository/workingGroup/index.vue
+15 -1
View File
@@ -14,6 +14,7 @@
<workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
</el-tab-pane>
</el-tabs>
<el-button size="mini" type="primary" @click="statisticsBtn" class="statistics">工作组统计</el-button>
</div>
</template>
<script>
@@ -30,14 +31,27 @@
activeName: 'workingGroup1',
}
},
methods: {},
methods: {
statisticsBtn(){
this.$router.push({
name: 'dataStatisComments'
})
}
},
mounted() {},
beforeDestroy() {}
}
</script>
<style lang="less" scoped>
.workingGroup{
position: relative;
height: 100%;
.statistics{
position: absolute;
top: 0;
right: 0;
margin: 5px;
}
.home-tabs {
height: 100%;
/deep/.el-tabs__content {