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 !114
This commit is contained in:
王夏晖
2021-09-01 08:23:43 +00:00
parent 33fd2d7f32 1df56128e8
commit 29335c3506
9 changed files with 712 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standardWarning.vue
+134 -123
View File
@@ -5,8 +5,8 @@
<!-- 实施预警 --> <!-- 实施预警 -->
<div class="dynamic" style="overflow-y: auto;"> <div class="dynamic" style="overflow-y: auto;">
<div class="container" :style="containerStyle"> <div class="container" :style="containerStyle">
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">--> <!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="标准预警" name="STANDARD">--> <!-- <el-tab-pane label="标准预警" name="STANDARD">-->
<div class="dynamic-content"> <div class="dynamic-content">
<h5>实施预警</h5> <h5>实施预警</h5>
<div class="more"> <div class="more">
@@ -100,7 +100,7 @@
</el-table-column> </el-table-column>
<el-table-column label="标准类型" align="center"> <el-table-column label="标准类型" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.standCode.slice(0,3) }}</div> <div>{{ scope.row.standCode.slice(0, 3) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center"> <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -113,7 +113,8 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button> @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -170,7 +171,7 @@
</el-table-column> </el-table-column>
<el-table-column label="标准类型" align="center"> <el-table-column label="标准类型" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.standCode.slice(0,3) }}</div> <div>{{ scope.row.standCode.slice(0, 3) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center"> <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -183,7 +184,8 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button> @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -241,8 +243,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="mark" label="标准分类" align="center"> <el-table-column prop="mark" label="标准分类" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>--> <!-- <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
<div>{{ scope.row.standCode.slice(0,3) }}</div> <div>{{ scope.row.standCode.slice(0, 3) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center"> <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -255,7 +257,8 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button> @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -313,8 +316,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="mark" label="标准分类" align="center"> <el-table-column prop="mark" label="标准分类" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.standCode.slice(0,3) }}</div> <div>{{ scope.row.standCode.slice(0, 3) }}</div>
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>--> <!-- <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center"> <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -327,7 +330,8 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button> @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -341,105 +345,105 @@
@pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination> @pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination>
</div> </div>
</div> </div>
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="政策预警" name="POLICY">--> <!-- <el-tab-pane label="政策预警" name="POLICY">-->
<!-- <div class="dynamic-content">--> <!-- <div class="dynamic-content">-->
<!-- <h5>实施预警</h5>--> <!-- <h5>实施预警</h5>-->
<!-- <div class="content" style="height: 100%; padding-top: 5px; ">--> <!-- <div class="content" style="height: 100%; padding-top: 5px; ">-->
<!-- <div class="content-group">--> <!-- <div class="content-group">-->
<!-- <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>--> <!-- <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>-->
<!-- <div class="table-wrap">--> <!-- <div class="table-wrap">-->
<!-- <el-table--> <!-- <el-table-->
<!-- :data="newPolicy"--> <!-- :data="newPolicy"-->
<!-- :height="tableHeight"--> <!-- :height="tableHeight"-->
<!-- border--> <!-- border-->
<!-- :resizable="false"--> <!-- :resizable="false"-->
<!-- v-loading="loading.newPolicy"--> <!-- v-loading="loading.newPolicy"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"--> <!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >--> <!-- >-->
<!-- <el-table-column prop="policyId" label="政策编号" align="center">--> <!-- <el-table-column prop="policyId" label="政策编号" align="center">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>--> <!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="policyName" label="政策名称" align="center">--> <!-- <el-table-column prop="policyName" label="政策名称" align="center">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>--> <!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>--> <!-- <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}--> <!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">--> <!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="danger"--> <!-- type="danger"-->
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>--> <!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- </el-table>--> <!-- </el-table>-->
<!-- </div>--> <!-- </div>-->
<!-- <pagination--> <!-- <pagination-->
<!-- style="position: static;"--> <!-- style="position: static;"-->
<!-- :page="pageConfig.newPolicyPage"--> <!-- :page="pageConfig.newPolicyPage"-->
<!-- :pageSize="pageConfig.newPolicyPageSize"--> <!-- :pageSize="pageConfig.newPolicyPageSize"-->
<!-- :total="pageConfig.count5"--> <!-- :total="pageConfig.count5"-->
<!-- autoSize--> <!-- autoSize-->
<!-- @pageChange="page => handlePageChange('newPolicy', page)"--> <!-- @pageChange="page => handlePageChange('newPolicy', page)"-->
<!-- @pageSizeChange="pageSize => handlePageSizeChange('newPolicy', pageSize)"></pagination>--> <!-- @pageSizeChange="pageSize => handlePageSizeChange('newPolicy', pageSize)"></pagination>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="content-group">--> <!-- <div class="content-group">-->
<!-- <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>--> <!-- <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>-->
<!-- <div class="table-wrap">--> <!-- <div class="table-wrap">-->
<!-- <el-table--> <!-- <el-table-->
<!-- :data="oldPolicy"--> <!-- :data="oldPolicy"-->
<!-- :height="tableHeight"--> <!-- :height="tableHeight"-->
<!-- border--> <!-- border-->
<!-- :resizable="false"--> <!-- :resizable="false"-->
<!-- v-loading="loading.oldPolicy"--> <!-- v-loading="loading.oldPolicy"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"--> <!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >--> <!-- >-->
<!-- <el-table-column prop="policyId" label="政策编号" align="center">--> <!-- <el-table-column prop="policyId" label="政策编号" align="center">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>--> <!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="policyName" label="政策名称" align="center">--> <!-- <el-table-column prop="policyName" label="政策名称" align="center">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>--> <!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>--> <!-- <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}--> <!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">--> <!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="danger"--> <!-- type="danger"-->
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>--> <!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- </el-table>--> <!-- </el-table>-->
<!-- </div>--> <!-- </div>-->
<!-- <pagination--> <!-- <pagination-->
<!-- style="position: static;"--> <!-- style="position: static;"-->
<!-- :page="pageConfig.oldPolicyPage"--> <!-- :page="pageConfig.oldPolicyPage"-->
<!-- :pangSize="pageConfig.oldPolicyPageSize"--> <!-- :pangSize="pageConfig.oldPolicyPageSize"-->
<!-- :total="pageConfig.count6"--> <!-- :total="pageConfig.count6"-->
<!-- autoSize--> <!-- autoSize-->
<!-- @pageChange="page => handlePageChange('oldPolicy', page)"--> <!-- @pageChange="page => handlePageChange('oldPolicy', page)"-->
<!-- @pageSizeChange="pageSize => handlePageSizeChange('oldPolicy', pageSize)"></pagination>--> <!-- @pageSizeChange="pageSize => handlePageSizeChange('oldPolicy', pageSize)"></pagination>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- </el-tabs>--> <!-- </el-tabs>-->
</div> </div>
</div> </div>
</div> </div>
@@ -448,7 +452,7 @@
</template> </template>
<script> <script>
import { mapMutations } from "vuex"; import {mapMutations} from "vuex";
export default { export default {
name: "standardWarning", name: "standardWarning",
@@ -522,7 +526,7 @@ export default {
...this.pageConfig ...this.pageConfig
}, { }, {
_this: this _this: this
},res => { }, res => {
console.log(res.data); console.log(res.data);
const result = res.data[0] const result = res.data[0]
for (const field in result) { for (const field in result) {
@@ -544,7 +548,9 @@ export default {
break break
} }
} }
for (const loading in this.loading) { this.loading[loading] = false } for (const loading in this.loading) {
this.loading[loading] = false
}
}, e => { }, e => {
}); });
}, },
@@ -565,13 +571,13 @@ export default {
this.$http.get('sys/EarlyWarning/PolicyWarning', { this.$http.get('sys/EarlyWarning/PolicyWarning', {
applyType: '', applyType: '',
...this.pageConfig ...this.pageConfig
},{ }, {
_this: this _this: this
}, res => { }, res => {
const policys = res.data[0] const policys = res.data[0]
for(const field in policys) { for (const field in policys) {
this[field] = policys[field].records this[field] = policys[field].records
switch(field) { switch (field) {
case 'newPolicy': case 'newPolicy':
this.pageConfig.count5 = policys.newPolicy.total this.pageConfig.count5 = policys.newPolicy.total
break break
@@ -580,7 +586,9 @@ export default {
break break
} }
} }
for(const loading in this.loading) {this.loading[loading] = false} for (const loading in this.loading) {
this.loading[loading] = false
}
}, e => { }, e => {
}); });
}, },
@@ -613,11 +621,11 @@ export default {
putTime: this.dynamic.putTime, putTime: this.dynamic.putTime,
//适用车型 //适用车型
applyType: this.dynamic.applyType applyType: this.dynamic.applyType
},{ }, {
_this: this, _this: this,
}, res => { }, res => {
const result = res.data[0] const result = res.data[0]
for(const type in result) { for (const type in result) {
this[type] = result[type].records this[type] = result[type].records
} }
this.newItemsPage = 1 this.newItemsPage = 1
@@ -644,9 +652,9 @@ export default {
this.searchBtnClick() this.searchBtnClick()
}, },
//取消预警 //取消预警
cancelWarning (index, row) { cancelWarning(index, row) {
console.log(index, row) console.log(index, row)
this.$confirm('确认取消预警？','提示', { this.$confirm('确认取消预警？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消', cancelButtonText: '取消',
@@ -800,7 +808,9 @@ export default {
// this.queryNewTypeByPage(); // this.queryNewTypeByPage();
// this.queryProductionVehicleByPage(); // this.queryProductionVehicleByPage();
// 四个预警同时查询,loading全部打开 // 四个预警同时查询,loading全部打开
for (const loading in this.loading) { this.loading[loading] = true } for (const loading in this.loading) {
this.loading[loading] = true
}
this.getEarlyDate(); this.getEarlyDate();
} }
@@ -963,6 +973,7 @@ export default {
/deep/ .el-input__inner { /deep/ .el-input__inner {
width: 155px; width: 155px;
} }
.choose-time-area { .choose-time-area {
/deep/ .el-input__inner { /deep/ .el-input__inner {
width: 220px; width: 220px;
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+5 -2
View File
@@ -1017,9 +1017,12 @@
<template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template> <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standStateShow" prop="textStatus"
label="标准状态" label="文本状态"
width="130"> width="130">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading> <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+14 -2
View File
@@ -1020,9 +1020,12 @@
<template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template> <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standStateShow" prop="textStatus"
label="标准状态" label="文本状态"
width="130"> width="130">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading> <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -1061,6 +1064,8 @@ export default {
}, },
data () { data () {
return { return {
textStatus:'',//文本状态
textStatusMap: {}, // 文本状态id与name对应
countryArr:'', countryArr:'',
activeName:'1', activeName:'1',
// 当前流程类型(1待办/2已办) // 当前流程类型(1待办/2已办)
@@ -1765,6 +1770,12 @@ export default {
} }
}) })
}, },
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
},
}, },
created(){ created(){
this.getData() this.getData()
@@ -1794,6 +1805,7 @@ export default {
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.treeStatus = true this.treeStatus = true
this.key++ this.key++
this.setMap(this.standStateOptions);
}) })
this.busVsFunc() this.busVsFunc()
this.modelFunc() this.modelFunc()
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+5
View File
@@ -312,9 +312,14 @@ export default {
let listJSON = JSON.parse(JSON.stringify(item.responUserList)) let listJSON = JSON.parse(JSON.stringify(item.responUserList))
this.dataList = [listJSON][0].standardInfoList this.dataList = [listJSON][0].standardInfoList
} else { } else {
if (item.dockUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
this.dataList = listJSON[0].standardInfoList
}else {
let listJSONInfo = item.info let listJSONInfo = item.info
this.dataList = [listJSONInfo] this.dataList = [listJSONInfo]
} }
}
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.fileText.length !== 0) { if (item.fileText.length !== 0) {
this.fileTextList = item.fileText this.fileTextList = item.fileText
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+24
View File
@@ -372,6 +372,7 @@ export default {
}, },
data() { data() {
return { return {
multipleSelection:[],
active: "1", //默认显示 active: "1", //默认显示
commentText: "", commentText: "",
modalshowflag: false, modalshowflag: false,
@@ -434,6 +435,15 @@ export default {
}; };
}, },
methods: { methods: {
// 表格勾选
handleSelectionChange(val) {
// 单选
if (val.length > 1) {
this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(val.pop())
}
this.multipleSelection = val
},
handleTabs(type) { handleTabs(type) {
this.active = type; this.active = type;
}, },
@@ -581,10 +591,24 @@ export default {
}, },
//清单勾选框数据 //清单勾选框数据
selectListChange(data) { selectListChange(data) {
// 单选
if (data.length > 1) {
this.$refs.selection.clearSelection()
this.$refs.selection.toggleRowSelection(data.pop())
}
this.multipleSelection = data
this.selectedList = data; this.selectedList = data;
}, },
//项目勾选框数据 //项目勾选框数据
selectProjectChange(data) { selectProjectChange(data) {
// 单选
if (data.length > 1) {
this.$refs.selection.clearSelection()
this.$refs.selection.toggleRowSelection(data.pop())
}
this.multipleSelection = data
this.selectProject = data; this.selectProject = data;
}, },
//提交事件 //提交事件
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+30 -30
View File
@@ -113,22 +113,22 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrqgj"
width="190px" width="190px"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrq" prop="zccssrqgj"
align="center" align="center"
sortable sortable
width="190px" width="190px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -344,7 +344,7 @@
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -353,7 +353,7 @@
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -445,10 +445,32 @@ export default {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
standMap: new Map(), standMap: new Map(),
textStatusMap: {}// 文本状态id与name对应 textStatusMap: {},// 文本状态id与name对应
}; };
}, },
mounted() {
this.processTable();
this.getData();
// 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this,
loading: "loading"
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
this.setMap(res.data.WBZTCLASS);// 文本状态
this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
this.showLocalProductData(this.getLocalPro);
}, e => {
});
},
methods: { methods: {
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
},
processTable() { processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", { this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
@@ -659,35 +681,13 @@ export default {
this.total = res.data.total; this.total = res.data.total;
}); });
}, },
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label);
});
},
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
} }
}, },
mounted() {
this.processTable();
this.getData();
// 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
_this: this,
loading: "loading"
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
this.setMap(this.standStateOptions);
this.showLocalProductData(this.getLocalPro);
}, e => {
});
}
}; };
</script> </script>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+2 -2
View File
@@ -398,7 +398,7 @@ export default {
// 相关人员姓名 // 相关人员姓名
}, },
// 新增编辑弹窗里的数据 // 新增编辑弹窗里的数据
localProEODefault: { /* localProEODefault: {
// 项目相关人员 // 项目相关人员
userEOList: [], userEOList: [],
// 产品代码 // 产品代码
@@ -460,7 +460,7 @@ export default {
// 相关人员信息 // 相关人员信息
relatePersonShow: "" relatePersonShow: ""
// 相关人员姓名 // 相关人员姓名
}, },*/
//查询3类 //查询3类
projectLibrarySearch: { projectLibrarySearch: {
// 项目名称 // 项目名称
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+43 -31
View File
@@ -14,10 +14,16 @@
<el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col> <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="5" :push="2"> <el-col :span="5" :push="2">
<el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top"> <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
<div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div> <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
{{ localProEO.projectName }}
</div>
<div v-else></div> <div v-else></div>
<div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div> <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
<div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div> 项目名称: <span class="valueColor">{{
localProEO.projectName && localProEO.projectName.substring(0, 15) + "..."
}}</span></div>
<div class="check-item-value" v-else>项目名称: <span class="valueColor">{{ localProEO.projectName }}</span>
</div>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span> <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
@@ -39,19 +45,23 @@
</div> </div>
</el-card> </el-card>
<div class="action-bar"> <div class="action-bar">
<!-- <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>--> <el-row>
<!-- <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除--> <el-col :span="12">
<!-- </el-button>--> <span style="font-size: 16px;font-weight: bold">清单版本: {{ }}</span>
<el-button class="common-button-default export-button" </el-col>
<el-col :span="12" style="text-align: end">
<el-button
type="primary"
class="common-button-default export-button"
size="mini" @click="exportStandard" size="mini" @click="exportStandard"
v-btn-permission="''" v-btn-permission="''"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
icon="export" icon="export"
>导出 >导出
</el-button> </el-button>
</el-col>
</el-row>
</div> </div>
<!-- <el-tabs type="border-card">-->
<!-- <el-tab-pane :label="localProEO.productName" class="details-panel-tabs-item">-->
<div class="table-wrapper"> <div class="table-wrapper">
<el-table <el-table
:data="dataList" :data="dataList"
@@ -172,8 +182,6 @@
@pageSizeChange="pageSizeChangeLaws"></pagination> @pageSizeChange="pageSizeChangeLaws"></pagination>
</div> </div>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
</div> </div>
<!-- 调取弹窗 --> <!-- 调取弹窗 -->
<el-drawer <el-drawer
@@ -245,9 +253,9 @@
align="center" align="center"
width="260px" width="260px"
> >
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>--> <!-- <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>-->
<!-- </template>--> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailedListState" prop="detailedListState"
@@ -265,7 +273,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -274,7 +283,10 @@
label="更新时间" label="更新时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime }}</div> <div>{{
scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
}}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -512,7 +524,7 @@ export default {
}, },
methods: { methods: {
//搜索清单 //搜索清单
searchSarAccess(){ searchSarAccess() {
this.pageDo = 1 this.pageDo = 1
this.pageSizeDo = this.$store.getters.userInfo.configContent; this.pageSizeDo = this.$store.getters.userInfo.configContent;
this.transfer() this.transfer()
@@ -523,7 +535,7 @@ export default {
this.pageSizeNo = this.$store.getters.userInfo.configContent; this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.getStand() this.getStand()
}, },
clearSearchAccess(){ clearSearchAccess() {
this.sarSarAccessEOSearch.carType = '' this.sarSarAccessEOSearch.carType = ''
this.sarSarAccessEOSearch.detailedListName = '' this.sarSarAccessEOSearch.detailedListName = ''
this.transfer() this.transfer()
@@ -547,11 +559,11 @@ export default {
this.pageNo = page this.pageNo = page
this.getStand() this.getStand()
}, },
pageChangeDo(page){ pageChangeDo(page) {
this.pageDo = page this.pageDo = page
this.transfer() this.transfer()
}, },
pageSizeChangeDo(pageSize){ pageSizeChangeDo(pageSize) {
this.pageDo = pageSize this.pageDo = pageSize
this.transfer() this.transfer()
}, },
@@ -582,7 +594,7 @@ export default {
}); });
}, },
//点击获取项目清单 //点击获取项目清单
transfer(){ transfer() {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: 1, page: 1,
pageSize: this.pageSize, pageSize: this.pageSize,
@@ -592,12 +604,12 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.data.records; this.sarAccessListDatas = res.data.records;
this.sarAccessListDatas.forEach(item =>{ this.sarAccessListDatas.forEach(item => {
// 适用车型转换 // 适用车型转换
if (item.carType !== null) { if (item.carType !== null) {
let k = (item.carType || "").split(',') let k = (item.carType || "").split(',')
for (let i in this.energyKindOptions) { for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) { for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) { if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label k[m] = this.energyKindOptions[i].label
} }
@@ -692,7 +704,7 @@ export default {
}) })
}, },
//调取清单取消事件 //调取清单取消事件
cancelDetailed(){ cancelDetailed() {
this.detailedListModel = false; this.detailedListModel = false;
}, },
//添加标准取消事件 //添加标准取消事件
@@ -747,28 +759,28 @@ export default {
} }
}, },
//获取标准 //获取标准
getStandrd(data){ getStandrd(data) {
this.detailedId = data.id this.detailedId = data.id
this.getStand(); this.getStand();
}, },
getStand(data){ getStand(data) {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
id:this.detailedId, id: this.detailedId,
...this.standCommonlySearch, ...this.standCommonlySearch,
}, { }, {
_this: this _this: this
}, res => { }, res => {
if(res.data === null){ if (res.data === null) {
this.standardData = '' this.standardData = ''
this.totalDo ='' this.totalDo = ''
this.standModel = true; this.standModel = true;
} }
this.standardData = res.data.records this.standardData = res.data.records
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.zccssrqgj === '-'){ if (item.zccssrqgj === '-') {
item.zccssrqgj = '' item.zccssrqgj = ''
} }
if(item.xcxssrqgj === '-'){ if (item.xcxssrqgj === '-') {
item.xcxssrq = '' item.xcxssrq = ''
} }
}) })
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+1 -1
View File
@@ -190,7 +190,7 @@
destroy-on-close destroy-on-close
:wrapperClosable="false" :wrapperClosable="false"
class="seeHisToryDraw" class="seeHisToryDraw"
size="1000px" size="600px"
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<div class="el-drawer-form" style="height: auto"> <div class="el-drawer-form" style="height: auto">