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:
zhaokaiyao@91isoft.com
2021-11-25 18:05:57 +08:00
parent 5c9154ee1c 515a814454
commit b87502f4b6
17 changed files with 1427 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/unqualProcess.js
+94 -29
View File
@@ -1,56 +1,121 @@
import axios from '@/common/axiosV2'
import axios from "@/common/axiosV2";
// 查询未整改项列表接口
export function standUnqualified (data) {
export function standUnqualified(data) {
return axios({
url: '/api/sarStandUnqualified/sar-stand-unqualified',
method: 'get',
url: "/api/sarStandUnqualified/sar-stand-unqualified",
method: "get",
params: data
})
});
}
// 人员菜单列表获取
export function roleTreeData (data) {
export function roleTreeData(data) {
return axios({
url: '/api/SarInstitution/institution/institutionAndUser',
method: 'get',
url: "/api/SarInstitution/institution/institutionAndUser",
method: "get",
params: data
})
});
}
// 上传文件
export function uploadFileText (data) {
export function uploadFileText(data) {
return axios({
url: 'api/att/attFile/upload',
method: 'get',
url: "api/att/attFile/upload",
method: "get",
params: data
})
});
}
export function dicTypeData (data) {
export function dicTypeData(data) {
return axios({
url: 'api/sys/dictype/getDicTypeListCode',
method: 'get',
url: "api/sys/dictype/getDicTypeListCode",
method: "get",
params: data
})
});
}
export function StandardsInfoPage (data) {
export function StandardsInfoPage(data) {
return axios({
url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak',
method: 'get',
url: "api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak",
method: "get",
params: data
})
});
}
// 车型库清单的下拉列表
export function solostarData (data) {
export function solostarData(data) {
return axios({
url: 'api/sarStandProjectLibrary/solostar',
method: 'get',
url: "api/sarStandProjectLibrary/solostar",
method: "get",
params: data
})
});
}
// 活动日历查询接口
export function meetingByMonth (params) {
export function meetingByMonth(params) {
return axios({
url: 'api/sapMeetInfo/getMeetingsByMonthType',
method: 'get',
url: "api/sapMeetInfo/getMeetingsByMonthType",
method: "get",
params
})
});
}
//未符合项模块新增
export function addUn(
closeState, standSerialNumber, standName,
itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit,
dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
const data = {
closeState,
standSerialNumber, //标准号
standName, //标准名称
itemsNum, //条款号
itemsName, //条款名称
productType,
productLine, //产品线
productName, //项目名称
reason, //不合规项目
responsibleUnit, //责任部门
dutyEngineer, //责任工程师
authEngineer, //认证工程师
qaEngineer, //质量工程师
planCloseTime //计划关闭时间
};
return axios({
url: "api/sarStandUnqualified/sar-stand-unqualified/addOne",
method: "post",
data
});
}
//未符合项模块编辑
export function editUn(
closeState, standSerialNumber, standName,
itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit,
dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) {
const data = {
closeState,
standSerialNumber, //标准号
standName, //标准名称
itemsNum, //条款号
itemsName, //条款名称
productType,
productLine, //产品线
productName, //项目名称
reason, //不合规项目
responsibleUnit, //责任部门
dutyEngineer, //责任工程师
authEngineer, //认证工程师
qaEngineer, //质量工程师
planCloseTime, //计划关闭时间
id
};
return axios({
url: "api/sarStandUnqualified/sar-stand-unqualified/updateOne",
method: "post",
data
});
}
src/components/navMenu/index.vue
+1 -1
View File
@@ -254,7 +254,7 @@ export default {
{
title: '标准化活动日历',
path: '/standCalendar',
menuId: '0ea66e3dd36873082b6851f69e92c8be'
menuId: ''
},
// {
// title: '标准比对库',
src/main.js
-7
View File
@@ -54,15 +54,10 @@ import { mapMutations, mapActions } from 'vuex'
// 路由拦截
router.beforeEach(function (to, from, next) {
console.log("auth : to =>", to);
console.log(webLoginType)
let toName = to.name
let token = store.state.token
let path = to.path;
let requireAuth = to.meta.requireAuth;
console.log("auth : path =>" + path);
console.log("token : token =>" + token);
console.log("requireAuth : requireAuth =>" + requireAuth);
let taskId = to.query.taskIds;
let prcId = to.query.prcId;
let prcNum = to.query.prcNum;
@@ -71,7 +66,6 @@ router.beforeEach(function (to, from, next) {
let routerType = to.query.routerType;
let param = "taskIds=" + taskId + "&prcId=" + prcId
+ "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType;
console.log(store)
let url = window.location.search
let code = "";
if(url){
@@ -232,7 +226,6 @@ router.beforeEach(function (to, from, next) {
next({path: routerPath + '?' + param2})
}
}
console.log("res : res =>", res);
})
}
if(path === '/loginVerify'){
src/pages/details/otherBussStandardDetails/index.vue
-6
View File
@@ -1194,7 +1194,6 @@ export default {
methods: {
child1Func(child1){
const list = []
console.log(child1)
if(child1 && child1.length > 1){
list.push(child1[0])
return list
@@ -2157,7 +2156,6 @@ export default {
const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
// const relatedPlansRes = await this.queryRelatedPlans()
// const relatedPlans = relatedPlansRes.list
console.log(formFieldList)
formFieldList.forEach((field) => {
displayLocation.forEach((location) => {
location.isShowImp = '0'
@@ -2194,16 +2192,12 @@ export default {
displayLocation.forEach(location => {
// 动态属性字段-FBGBJBD 单独添加至基础信息
const list = displayLocation.filter ( item => item.label === '过程稿件');
console.log(list)
if(location.label === '基础信息' && list && list.length > 0){
if (!list[0].child) {
location['child1'] = []
}else {
const childList = list[0].child.filter ( item => item.attrField === 'FBGBUSS');
console.log(childList)
console.log(childList.length)
location['child1'] = childList
console.log(location['child1'])
}
}
src/pages/home2/components/empennage/index.vue
-1
View File
@@ -148,7 +148,6 @@
}
let list
list = res.data.slice(0, c)
console.log(list)
this.linkList = list
})
}
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+1 -1
View File
@@ -39,7 +39,7 @@
<div class="action-bar">
<el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'" size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
<el-button v-btn-permission="''" size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
<!-- <el-button v-btn-permission="''" size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>-->
<el-button v-btn-permission="''" size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
<el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'" size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
<el-button v-btn-permission="''" size="mini" @click="batchCopy">批量复制</el-button>
<el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'" size="mini" @click="combineItems">合并条款</el-button>
src/pages/localTool/standContrast/pages/contrastDetails.vue
+1
View File
@@ -372,6 +372,7 @@ export default {
}, res => {
this.spinShow = false
this.$message.warning(res.data)
this.$router.push('/standContrast')
}, e => {
})
})
src/pages/localTool/standContrast/pages/seeDatalis.vue
+1 -1
View File
@@ -182,7 +182,7 @@ export default {
},
page () {
this.spinShow = true
this.$http.get('lawss/sarItemsCompareHis/page', {
this.$http.get('lawss/sarStandItemsCompareHis/page', {
page: this.splitInfoPage,
pageSize: this.splitInfoPageSize,
standHisId: JSON.parse(this.$route.query.row).id
src/pages/localTool/standContrast/pages/textComparison.vue
+2 -4
View File
@@ -93,7 +93,6 @@
</div>
</div>
</div>
<el-dialog :visible.sync="resultModal" title="比对结果" width="80%" class="standerModal">
<div class="standerModal-content">
<div class="content-header">
@@ -109,7 +108,6 @@
</div>
</div>
</el-dialog>
<loading :loading="spinShow">数据加载中……</loading>
</div>
</template>
@@ -517,7 +515,7 @@ export default {
return el.offsetTop - el.parentNode.offsetTop;
}
const offsetTop = getElementTop(domId)
/*$('#contentLeft').children('.wrap-right').animate({scrollTop: offsetTop},500)*/
$('#contentLeft').children('.wrap-right').animate({scrollTop: offsetTop},500)
},
handleRightTreeClick(treeId, treeNode) {
@@ -530,7 +528,7 @@ export default {
return el.offsetTop - el.parentNode.offsetTop;
}
const offsetTop = getElementTop(domId)
/*$('#contentRight').children('.wrap-right').animate({scrollTop: offsetTop},500)*/
$('#contentRight').children('.wrap-right').animate({scrollTop: offsetTop},500)
}
},
components: {
src/pages/localTool/standardRecognition/index.vue
+53 -46
View File
@@ -65,22 +65,22 @@
align="center"
>
</el-table-column>
<el-table-column :label="this.$t('m.textState')" width="150" align="center">
<template slot-scope="scope">
{{
scope.row.fileType === "STAND_FILE"
? "标准文本"
: scope.row.fileType === "DRAFT_FILE"
? "草案"
: scope.row.fileType === "OPINION_FILE"
? "征求意见稿"
: scope.row.fileType === "SENT_SCREEN_FILE"
? "送审稿"
: scope.row.fileType === "APPROVAL_FILE"
? "报批稿"
: "关联文件"
}}
</template>
<el-table-column :label="this.$t('m.textState')" width="150" align="center" prop="fileType">
<!-- <template slot-scope="scope">-->
<!-- {{-->
<!-- scope.row.fileType === "STAND_FILE"-->
<!-- ? "标准文本"-->
<!-- : scope.row.fileType === "DRAFT_FILE"-->
<!-- ? "草案"-->
<!-- : scope.row.fileType === "OPINION_FILE"-->
<!-- ? "征求意见稿"-->
<!-- : scope.row.fileType === "SENT_SCREEN_FILE"-->
<!-- ? "送审稿"-->
<!-- : scope.row.fileType === "APPROVAL_FILE"-->
<!-- ? "报批稿"-->
<!-- : "关联文件"-->
<!-- }}-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="resultContent"
@@ -203,9 +203,9 @@
<el-select class="bead-input" v-model="uploadFilesdfEo.fileType">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.attrName"
:value="item.attrName"
>
</el-option>
</el-select>
@@ -713,6 +713,7 @@
</template>
<script>
import axios from 'axios'
export default {
name: "StandardRecognition",
components: {},
@@ -784,30 +785,30 @@ export default {
]
},
options: [
{
value: "STAND_FILE",
label: "标准文本",
},
{
value: "DRAFT_FILE",
label: "草案",
},
{
value: "OPINION_FILE",
label: "征求意见稿",
},
{
value: "SENT_SCREEN_FILE",
label: "送审稿",
},
{
value: "APPROVAL_FILE",
label: "报批稿",
},
{
value: "RELEVANCE_FILE",
label: "关联文件",
},
// {
// value: "STAND_FILE",
// label: "标准文本",
// },
// {
// value: "DRAFT_FILE",
// label: "草案",
// },
// {
// value: "OPINION_FILE",
// label: "征求意见稿",
// },
// {
// value: "SENT_SCREEN_FILE",
// label: "送审稿",
// },
// {
// value: "APPROVAL_FILE",
// label: "报批稿",
// },
// {
// value: "RELEVANCE_FILE",
// label: "关联文件",
// },
],
/* standRecoColumn: [
{
@@ -1340,8 +1341,8 @@ export default {
).standName;
// this.uploadFilesdfEo.fileType = JSON.parse(JSON.stringify(row)).fileType
this.options.map((item) => {
if (item.value === JSON.parse(JSON.stringify(row)).fileType) {
this.uploadFilesdfEo.fileType = item.label;
if (item.attrName === JSON.parse(JSON.stringify(row)).fileType) {
this.uploadFilesdfEo.fileType = item.attrName;
}
});
this.uploadFilesdfEo.id = JSON.parse(JSON.stringify(row)).id;
@@ -1413,7 +1414,7 @@ export default {
},
// 获取doc文件
downloadFile(data) {
let URL = 'http://10.100.5.116:4201/' + data.docRealName
let URL = 'https://srms.foton.com.cn/ocrResultFile/' + data.docRealName
window.open(URL)
// console.log(URL);
// window.open(data.docRealFile);
@@ -1528,6 +1529,12 @@ export default {
computed: {},
created() {},
mounted() {
this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
_this: this
}, res => {
this.options = res.data
console.log(this.options);
})
this.getTableData();
},
destroyed() {},
src/pages/localTool/standardWarning.vue
+126 -362
View File
@@ -4,7 +4,7 @@
<div class="dynamic-content">
<!-- 实施预警 -->
<div class="dynamic" style="overflow-y: auto;">
<div class="container" :style="containerStyle">
<div class="container" >
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="标准预警" name="STANDARD">-->
<div class="dynamic-content">
@@ -14,7 +14,7 @@
<div class="more">
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
<el-row :gutter="24">
<el-col span="24">
<el-col>
<el-form-item label="标准编号">
<el-input clearable size="mini"
v-model="dynamic.standCode"
@@ -57,12 +57,12 @@
</el-col>
</el-row>
<el-row :gutter="24">
<el-col span="24">
<el-col>
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="dynamic.putTime"
v-model="dynamic.SSRQ"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -74,7 +74,7 @@
<el-date-picker
size="mini"
clearable
v-model="dynamic.putTime"
v-model="dynamic.XCXSSRQ"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -86,7 +86,7 @@
<el-date-picker
size="mini"
clearable
v-model="dynamic.putTime"
v-model="dynamic.ZCCSSRQ"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -116,13 +116,13 @@
<div class="content">
<!-- <el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>-->
<el-table
:data="newItems"
:data="warningTableDatas"
style="overflow-y: auto;"
:height="warningTableHeight"
height="100%"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
v-loading="loading.newItems"
v-loading="warningTableLoading"
>
<el-table-column prop="standType" label="类型" width="100" align="center">
<template slot-scope="scope">
@@ -143,34 +143,34 @@
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standCode" label="条款编号" width="200" align="center">
<el-table-column prop="itemsNum" label="条款编号" width="200" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.itemsNum }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" width="320" label="条款名称" align="center">
<el-table-column prop="itemsName" width="320" label="条款名称" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.itemsName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="发布日期" width="120" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.putTime ? scope.row.putTime.substring(0, 10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="putTime" label="实施日期" width="120" align="center" sortable>
<el-table-column prop="ssrq" label="实施日期" width="120" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.ssrq ? scope.row.ssrq.substring(0,10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="putTime" label="新车型实施日期" width="150" align="center" sortable>
<el-table-column prop="xcxssrq" label="新车型实施日期" width="150" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0,10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="putTime" label="在产车实施日期" width="150" align="center" sortable>
<el-table-column prop="zccssrq" label="在产车实施日期" width="150" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0,10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center">
@@ -187,173 +187,12 @@
</el-table>
<pagination
style="position: static;"
:page="pageConfig.newItemsPage"
:pageSize="pageConfig.newItemsPageSize"
:total="pageConfig.count1"
:page="pageConfig.page"
:pageSize="pageConfig.pageSize"
:total="pageConfig.total"
autoSize
@pageChange="page => handlePageChange('newItems', page)"
@pageSizeChange="pageSize => handlePageSizeChange('newItems', pageSize)"></pagination>
<!-- <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>-->
<!-- <el-table-->
<!-- :data="oldItems"-->
<!-- :height="height"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- v-loading="loading.oldItems"-->
<!-- >-->
<!-- <el-table-column prop="sortName" label="类型" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>-->
<!-- <div v-if="scope.row.standType === 'FOREIGN'">海外标准法规</div>-->
<!-- <div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>-->
<!-- <div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>-->
<!-- <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="standCode" label="标准编号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="standName" width="320" label="标准名称" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="applyType" label="适用车型" align="center">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" v-if="isShowBtn">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- <pagination-->
<!-- style="position: static;"-->
<!-- :page="pageConfig.oldItemsPage"-->
<!-- :pageSize="pageConfig.oldItemsPageSize"-->
<!-- :total="pageConfig.count2"-->
<!-- autoSize-->
<!-- @pageChange="page => handlePageChange('oldItems', page)"-->
<!-- @pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination>-->
<!-- <el-divider content-position="left" class="dynamic-child-title">新车型条款预警</el-divider>-->
<!-- <el-table-->
<!-- :data="newStand"-->
<!-- :height="height"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- v-loading="loading.newStand"-->
<!-- >-->
<!-- <el-table-column prop="standCode" label="标准编号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="standName" width="320" label="标准名称" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="itemsNum" label="条款号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <div>{{ scope.row.itemsNum }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="itemsName" label="条款要求" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <div>{{ scope.row.itemsName }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="实施日期" align="center" sortable>-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="applyType" label="适用车型" align="center">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" v-if="isShowBtn">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- <pagination-->
<!-- style="position: static;"-->
<!-- :page="pageConfig.newStandPage"-->
<!-- :pageSize="pageConfig.newStandPageSize"-->
<!-- :total="pageConfig.count3"-->
<!-- autoSize-->
<!-- @pageChange="page => handlePageChange('newStand', page)"-->
<!-- @pageSizeChange="pageSize => handlePageSizeChange('newStand', pageSize)"></pagination>-->
<!-- <el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>-->
<!-- <el-table-->
<!-- :data="oldStand"-->
<!-- :height="height"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- v-loading="loading.oldStand"-->
<!-- >-->
<!-- <el-table-column prop="standCode" label="标准编号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="standName" width="320" label="标准名称" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="itemsNum" label="条款号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <div>{{ scope.row.itemsNum }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="itemsName" label="条款要求" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <div>{{ scope.row.itemsName }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="实施日期" align="center" sortable>-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="applyType" label="适用车型" align="center">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" v-if="isShowBtn">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- <pagination-->
<!-- style="position: static;"-->
<!-- :page="pageConfig.oldStandPage"-->
<!-- :pageSize="pageConfig.oldStandPageSize"-->
<!-- :total="pageConfig.count4"-->
<!-- autoSize-->
<!-- @pageChange="page => handlePageChange('oldStand', page)"-->
<!-- @pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)"></pagination>-->
@pageChange="page => handlePageChange('page', page)"
@pageSizeChange="pageSize => handlePageSizeChange('pageSize', pageSize)"></pagination>
</div>
</div>
</div>
@@ -370,6 +209,8 @@ export default {
name: "standardWarning",
data() {
return {
//
warningTableDatas:[],
warningTableHeight: '',
applyArcticOptions: [], // 适用车型下拉框
isShowBtn: true,
@@ -380,8 +221,14 @@ export default {
standCode: "",
//标准名称
standName: "",
//发布日期
putTime: [],
//实施日期
putTime: "",
SSRQ: [],
//新车型实施日期
XCXSSRQ: [],
//在产车实施日期
ZCCSSRQ: [],
//适用车型
applyType: "",
},
@@ -402,33 +249,11 @@ export default {
oldPolicy: [],
tableHeight: 0,
pageConfig: {
newItemsPage: 1,
newItemsPageSize: 10,
count1: 0,
newStandPage: 1,
newStandPageSize: 10,
count2: 0,
oldItemsPage: 1,
oldItemsPageSize: 10,
count3: 0,
oldStandPage: 1,
oldStandPageSize: 10,
count4: 0,
newPolicyPage: 1,
newPolicyPageSize: 10,
count5: 0,
oldPolicyPage: 1,
oldPolicyPageSize: 10,
count6: 0,
},
loading: {
newItems: false,
oldItems: false,
newStand: false,
oldStand: false,
newPolicy: false,
oldPolicy: false,
page: 1,
pageSize: 10,
total: 0,
},
warningTableLoading: false,
// 记录当前分页器是哪个预警信息触发
field: ''
};
@@ -436,8 +261,8 @@ export default {
methods: {
// 获取标准预警数据 (type用于区别分页器切换)
getEarlyDate() {
this.loading[this.field] = true
this.$http.get('sys/EarlyWarning/StandWarning', {
this.warningTableLoading = true
this.$http.get('sys/EarlyWarning/getStandWarning', {
applyType: '',
...this.pageConfig
}, {
@@ -516,9 +341,7 @@ export default {
break
}
}
for (const loading in this.loading) {
this.loading[loading] = false
}
this.warningTableLoading = false
}, e => {
});
},
@@ -579,30 +402,56 @@ export default {
},
//查找适用车型
searchBtnClick() {
this.$http.get('sys/EarlyWarning/StandWarning', {
this.warningTableLoading = true
this.$http.get('sys/EarlyWarning/getStandWarning', {
...this.pageConfig,
//标准编号
standCode: this.dynamic.standCode,
//标准名称
standName: this.dynamic.standName,
//发布日期
startPutTime: this.dynamic.putTime[0],
endPutTime: this.dynamic.putTime[1],
//实施日期
putTime: this.dynamic.putTime[0],
lastTime: this.dynamic.putTime[1],
startSSRQ: this.dynamic.SSRQ[0],
endSSRQ: this.dynamic.SSRQ[1],
//新车型实施日期
startXCXSSRQ: this.dynamic.XCXSSRQ[0],
endXCXSSRQ: this.dynamic.XCXSSRQ[1],
//在产车实施日期
startZCCSSRQ: this.dynamic.ZCCSSRQ[0],
endZCCSSRQ: this.dynamic.ZCCSSRQ[1],
//适用车型
applyType: this.dynamic.applyType
}, {
_this: this,
}, res => {
const result = res.data[0]
for (const type in result) {
this[type] = result[type].records
console.log('608',res)
// 适用车型转换
for (let a = 0; a < res.data.records.length; a++) {
if (res.data.records[a].applyType !== null) {
let k = (res.data.records[a].applyType || "").split(",");
for (let i in this.energyKindOptions) {
for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label;
}
res.data.records[a].applyType = k.join(",");
}
}
}
}
this.newItemsPage = 1
this.oldItemsPage = 1
this.newStandPage = 1
this.oldStandPage = 1
this.newPolicyPage = 1
this.oldPolicypage = 1
this.warningTableDatas = res.data.records
this.pageConfig.page = res.data.current
if ((this.warningTableDatas.length === 0 || this.warningTableDatas === []) && this.pageConfig.page !== 1) {
this.warningTableLoading = true
this.handlePageChange('page', 1)
}else {
this.warningTableLoading = false
}
this.pageConfig.pageSize = res.data.size
this.pageConfig.total = res.data.total
// this.warningTableLoading = false
}, e => {
})
},
@@ -612,11 +461,18 @@ export default {
standCode: "",
//标准名称
standName: "",
//发布日期
putTime: [],
//实施日期
putTime: "",
SSRQ: [],
//新车型实施日期
XCXSSRQ: [],
//在产车实施日期
ZCCSSRQ: [],
//适用车型
applyType: "",
}
this.pageConfig.page = 1
this.searchBtnClick()
},
//取消预警
@@ -631,12 +487,10 @@ export default {
this.$http.get('sys/EarlyWarning/ChangePermissions', {
id: row.id,
}, {}, res => {
this.pageConfig.newItemsPage = 1
this.pageConfig.oldItemsPage = 1
this.pageConfig.newStandPage = 1
this.pageConfig.oldStandPage = 1
this.pageConfig.page = 1
this.pageConfig.newPolicyPage = 1
this.pageConfig.oldPolicyPage = 1
this.searchBtnClick()
this.getEarlyDate()
}
)
@@ -714,41 +568,21 @@ export default {
return date !== undefined && date != null ? date.split(" ")[0] : "";
},
handlePageChange(field, page) {
switch (field) {
// 新车型实施日期预警
case 'newItems':
this.pageConfig.newItemsPage = page
break
// 新车型条款预警
case 'newStand':
this.pageConfig.newStandPage = page
break
// 在产车实施日期预警
case 'oldItems':
this.pageConfig.oldItemsPage = page
break
// 在产车条款预警
case 'oldStand':
this.pageConfig.oldStandPage = page
break
// 政策新车型实施日期预警
case 'newPolicy':
this.pageConfig.newPolicyPage = page
break
//政策 在产车实施日期预警
case 'oldPolicy':
this.pageConfig.oldPolicyPage = page
break
}
this.pageConfig.page = page
this.searchBtnClick()
console.log('735',this.warningTableDatas)
this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
this.field = field
},
//分页每页显示数改变后方法
handlePageSizeChange(field, pageSize) {
const _pageSize = field + 'PageSize'
this.pageConfig[_pageSize] = pageSize
this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
this.field = field
// const _pageSize = field + 'PageSize'
// this.pageConfig[_pageSize] = pageSize
this.pageConfig.pageSize = pageSize
this.searchBtnClick()
console.log('771',this.warningTableDatas)
// this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
// this.field = field
},
...mapMutations(["setDetailMap"])
},
@@ -759,22 +593,27 @@ export default {
},
computed: {
containerStyle() {
return this.activeName === 'POLICY' ? {
height: '100%'
} : {}
this.$nextTick(() => {
return this.activeName === 'POLICY' ? {
height: '100%'
} : {}
})
}
},
watch: {},
mounted() {
this.warningTableHeight = $(window).height()*0.54
window.onresize = () => {
this.warningTableHeight = $(window).height()*0.54;
};
this.warningTableLoading = true
// this.$nextTick(() => {
// this.warningTableHeight = $(window).height()*0.54
// window.onresize = () => {
// this.warningTableHeight = $(window).height()*0.54;
// };
// })
// alert(this.warningTableHeight)
this.height = $(".content").height();
window.onresize = () => {
this.height = $(".content").height();
};
// this.height = $(".content").height();
// window.onresize = () => {
// this.height = $(".content").height();
// };
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
@@ -782,101 +621,25 @@ export default {
this.energyKindOptions = res.data.ENERGYTYPES; // 文本状态
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
this.zrgcs = res.data.ZRGCSCLASS;
this.loading[this.field] = true
this.$http.get('sys/EarlyWarning/StandWarning', {
this.warningTableLoading = true
this.$http.get('sys/EarlyWarning/getStandWarning', {
applyType: '',
...this.pageConfig
}, {
_this: this
}, res => {
const result = res.data[0]
for (const field in result) {
this[field] = result[field].records
this[field].forEach(item => {
// 适用车型转换
if (item.applyType !== null) {
let k = (item.applyType || "").split(",");
for (let i in this.energyKindOptions) {
for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label;
}
item.applyType = k.join(",");
}
}
}
// 责任工程师转换
if (item.dutyEngineer !== null) {
let k = (item.dutyEngineer || "").split(",");
for (let i in this.zrgcs) {
for (let m = 0; m < k.length; m++) {
if (this.zrgcs[i].value === k[m]) {
k[m] = this.zrgcs[i].label;
}
item.dutyEngineer = k.join(",");
}
}
}
})
let arr = result.newItems.records
arr.forEach(item => {
console.log(item.applyType)
// 适用车型转换
if (item.applyType !== null) {
let k = (item.applyType || "").split(",");
for (let i in this.energyKindOptions) {
for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label;
}
item.applyType = k.join(",");
}
}
}
// 责任工程师转换
if (item.dutyEngineer !== null) {
let k = (item.dutyEngineer || "").split(",");
for (let i in this.zrgcs) {
for (let m = 0; m < k.length; m++) {
if (this.zrgcs[i].value === k[m]) {
k[m] = this.zrgcs[i].label;
}
item.dutyEngineer = k.join(",");
}
}
}
})
this.newItems = arr
//可能还需要调整一下条款或标准的顺序（zyh）
switch (field) {
case 'newItems':
this.pageConfig.count1 = result.newItems.total
break
case 'oldItems':
this.pageConfig.count2 = result.oldItems.total
break
case 'newStand':
this.pageConfig.count3 = result.newStand.total
break
case 'oldStand':
this.pageConfig.count4 = result.oldStand.total
break
}
}
for (const loading in this.loading) {
this.loading[loading] = false
}
console.log('805',res)
this.warningTableDatas = res.data.records
this.pageConfig.page = res.data.current
this.pageConfig.pageSize = res.data.size
this.pageConfig.total = res.data.total
this.getEarlyDate();
this.warningTableLoading = false
}, e => {
});
});
// this.queryNewTypeByPage();
// this.queryProductionVehicleByPage();
// 四个预警同时查询,loading全部打开
for (const loading in this.loading) {
this.loading[loading] = true
}
this.getEarlyDate();
}
};
@@ -999,6 +762,7 @@ export default {
}
.container {
height: calc(100% - 139px);
/deep/ .el-tabs__header {
height: 50px;
}
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+49 -2
View File
@@ -1337,6 +1337,54 @@ export default {
})
}
break
case '17':
if (row.taskInfo === '法规认证部副部长审核') {
this.$router.push({
name: 'zcrhStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if (row.taskInfo === '法规认证部副总监批准') {
this.$router.push({
name: 'zcrhStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '公司副总批准') {
this.$router.push({
name: 'zcrhStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '修订入会信息') {
this.$router.push({
name: 'zcrhStep1-1',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break
// 政策入会流程
case '18':
if (row.taskInfo === '法规认证部副部长批准') {
this.$router.push({
@@ -1373,7 +1421,7 @@ export default {
})
}
break
// 政策参会流程
// 政策参会流程
case '19':
if (row.taskInfo === '申请人填写表单') {
this.$router.push({
@@ -1410,7 +1458,6 @@ export default {
})
}
break
case '21':
if (row.taskInfo === '分委会主任/部门中心主任提名入会代表') {
this.$router.push({
src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
-1
View File
@@ -295,7 +295,6 @@ export default {
}, e => {
})
} else {
console.log(this.formShowData.meetTime)
meetEdit(this.formShowData).then(res => {
if (res.ok) {
this.$message.success('编辑成功')
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+56 -57
View File
@@ -632,60 +632,60 @@
</template>
</template>
<template v-else-if="field.attrType === 'INPUT_NUM'">
<custom-input-num
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-input-num>
</template>
<template v-else-if="field.attrType === 'DATE_PICKER'">
<custom-date-pick
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:class="field.attrName === '在产车实施日期(国家）' || field.attrName === '新车型实施日期(国家）'|| field.attrName === '实施日期(国际）' ? 'classDisplay' : ''"
></custom-date-pick>
</template>
<template v-else-if="field.attrType === 'FILE'">
<custom-file
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@fileSuccess="fileSuccess"
></custom-file>
</template>
<template v-else-if="field.attrType === 'TEXTAREA'">
<custom-textarea
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-textarea>
</template>
<!-- 起草单位-->
<template v-else-if="field.attrType === 'SEL_OPTION' || field.attrType === 'SEL_OPTS' ">
<template>
<custom-select
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-select>
</template>
</template>
<template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'ZRLX'">
<template v-if="field.attrField === 'ZRBM'">
<el-form-item
prop="ZRBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">责任部门</template>
<template v-else-if="field.attrType === 'INPUT_NUM'">
<custom-input-num
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-input-num>
</template>
<template v-else-if="field.attrType === 'DATE_PICKER'">
<custom-date-pick
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:class="field.attrName === '在产车实施日期(国家）' || field.attrName === '新车型实施日期(国家）'|| field.attrName === '实施日期(国际）' ? 'classDisplay' : ''"
></custom-date-pick>
</template>
<template v-else-if="field.attrType === 'FILE'">
<custom-file
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@fileSuccess="fileSuccess"
></custom-file>
</template>
<template v-else-if="field.attrType === 'TEXTAREA'">
<custom-textarea
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-textarea>
</template>
<!-- 起草单位-->
<template v-else-if="field.attrType === 'SEL_OPTION'">
<template>
<custom-select
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-select>
</template>
</template>
<template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'ZRLX'">
<template v-if="field.attrField === 'ZRBM'">
<el-form-item
prop="ZRBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">责任部门</template>
<el-input
:key="field.attrField"
@@ -2592,7 +2592,7 @@
standName: this.ocrList[0].standName,
attId: this.OCRDatas[0].attId,
fileName: this.OCRDatas[0].fileName,
fileType: this.OCRDatas[0].useModel,
fileType: this.setWBType(this.OCRDatas[0].standFileClassify),
}
this.$http.post(
"ocr/OCRRestful/addOcrRecord",
@@ -2612,7 +2612,7 @@
} else if (this.OCRType === '1') {
let splitEo = {}
splitEo.standId = this.OCRDatas[0].standId
splitEo.fileType = this.OCRDatas[0].standFileClassify
splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
splitEo.attId = this.OCRDatas[0].attId
splitEo.fileName = this.OCRDatas[0].fileName
this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, {
@@ -5322,7 +5322,6 @@
_this: this
}, res => {
this.OCRoptions = res.data
console.log(res.data);
})
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+5 -3
View File
@@ -228,12 +228,12 @@
</el-form-item>
<!-- 项目名称-->
<el-form-item label="项目名称" class="serch-form-item">
<el-input v-model="projectLibrarySearch.projectName" placeholder="根据项目名称" clearable :maxlength="500"
<el-input v-model="localProTableSearch.projectName" placeholder="根据项目名称" clearable :maxlength="500"
@keyup.enter.native="getLocalProductTableBtn"></el-input>
</el-form-item>
<!-- 项目分类-->
<el-form-item label="项目分类" class="serch-form-item">
<el-select v-model="projectLibrarySearch.projectClassification" placeholder="根据项目分类" clearable
<el-select v-model="localProTableSearch.projectClassification" placeholder="根据项目分类" clearable
@keyup.enter.native="getLocalProductTableBtn">
<el-option v-for="opt in productTypeOptions" :value="opt.value === undefined ? '' :opt.label"
:key="opt.label" :label="opt.label">{{ opt.label }}
@@ -242,7 +242,7 @@
</el-form-item>
<!-- 项目状态-->
<el-form-item label="项目状态" class="serch-form-item">
<el-select v-model="projectLibrarySearch.projectStatus" placeholder="根据项目状态" clearable
<el-select v-model="localProTableSearch.projectStatus" placeholder="根据项目状态" clearable
@keyup.enter.native="getLocalProductTableBtn">
<el-option v-for="opt in xmztOptions" :value="opt.value === undefined ? '' :opt.label" :key="opt.label"
:label="opt.label">{{ opt.label }}
@@ -485,6 +485,8 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
// 查询条件
localProTableSearch: {
projectClassification: '',
projectStatus: '',
validFlag: 0,
// 项目编号
projectNumber: "",
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+950 -246
View File
File diff suppressed because it is too large Load Diff