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

This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-18 13:14:34 +08:00
16 changed files with 81 additions and 56 deletions
@@ -552,7 +552,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="interpretationContent" prop="readContent"
label="解读内容" label="解读内容"
show-overflow-tooltip show-overflow-tooltip
> >
@@ -621,16 +621,22 @@
<loading :loading="tableLoading">数据加载中...</loading> <loading :loading="tableLoading">数据加载中...</loading>
</div> </div>
<pagination
:page="page7"
:total="total7"
@pageChange="pageChange7"
@pageSizeChange="pageSizeChange7"></pagination>
<el-pagination
@size-change="pageSizeChange" <!-- <el-pagination-->
@current-change="pageChange" <!-- @size-change="pageSizeChange"-->
:current-page="1" <!-- @current-change="pageChange"-->
:page-sizes="[10, 20, 30, 50]" <!-- :current-page="1"-->
:page-size="100" <!-- :page-sizes="[10, 20, 30, 50]"-->
layout="sizes, prev, pager, next, jumper" <!-- :page-size="100"-->
:total="standitemTotal"> <!-- layout="sizes, prev, pager, next, jumper"-->
</el-pagination> <!-- :total="standitemTotal">-->
<!-- </el-pagination>-->
<!-- <pagination :total="standitemTotal" @pageChange="pageChange"--> <!-- <pagination :total="standitemTotal" @pageChange="pageChange"-->
<!-- @pageSizeChange="pageSizeChange"></pagination>--> <!-- @pageSizeChange="pageSizeChange"></pagination>-->
@@ -1243,6 +1249,8 @@ export default {
knowType: '', knowType: '',
KnowTitle: '', KnowTitle: '',
knowIdList: '', knowIdList: '',
total7: 0,
page7: 1,
addForm: { addForm: {
title: '', title: '',
content: '', content: '',
@@ -1759,6 +1767,15 @@ export default {
this.knowId = '' this.knowId = ''
this.AddKnowledgDialog = false this.AddKnowledgDialog = false
}, },
//查看分解单分页
pageChange7(page) {
this.page7 = page
this.selectSarStandItems()
},
pageSizeChange7(pageSize){
this.pageSize7 = pageSize
this.selectSarStandItems()
},
// 知识点分页 // 知识点分页
pageChange1(page) { pageChange1(page) {
this.pageNo = page this.pageNo = page
@@ -2317,12 +2334,9 @@ export default {
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => { this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
this.selectedItemList = [] this.selectedItemList = []
if (res.ok) { if (res.ok) {
this.standItemList = res.data.list; this.standItemList = res.data;
console.log("standItemList");
console.log(this.standItemList);
console.log("res.data");
console.log(res.data); console.log(res.data);
this.standitemTotal = res.data.count // 分页需要 this.total7 = res.data.length // 分页需要
} }
}, e => { }, e => {
}) })
@@ -31,7 +31,7 @@
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center"> <el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -148,7 +148,7 @@
<el-form :modal="queryUnqualidiedData" inline class="label-input-form"> <el-form :modal="queryUnqualidiedData" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
v-model="queryUnqualidiedData.standId" v-model="queryUnqualidiedData.standSerialNumber"
placeholder="请输入" placeholder="请输入"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
@@ -210,9 +210,9 @@
@selection-change="selectedChange" @selection-change="selectedChange"
> >
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号"> <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -97,9 +97,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center"> <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -248,6 +248,7 @@ export default {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
nonSearch: { nonSearch: {
standSerialNumber: '',
standId: '', // 标准号/名称 standId: '', // 标准号/名称
productName: '', // 项目名称 productName: '', // 项目名称
responsibleUnit: '' // 责任部门 responsibleUnit: '' // 责任部门
@@ -457,7 +458,7 @@ export default {
this.modalshowflag = false this.modalshowflag = false
}, },
//查询按钮 //查询按钮
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询 /*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => { this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选 let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选 let matchName = true; // 项目名称 筛选
@@ -479,7 +480,7 @@ export default {
return matchId && matchName && matchUnit; return matchId && matchName && matchUnit;
}) })
this.dataList = this.realList this.dataList = this.realList
}, },*/
// 点击查看 // 点击查看
handlePreview (item) { handlePreview (item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
@@ -496,6 +497,7 @@ export default {
clearAllSearch () { clearAllSearch () {
this.nonSearch = { this.nonSearch = {
standId: '', standId: '',
standSerialNumber: '',
productName: '', productName: '',
responsibleUnit: '' responsibleUnit: ''
} }
@@ -99,9 +99,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center"> <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号"> <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号"> <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -95,21 +95,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrq"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -95,12 +95,12 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -109,7 +109,7 @@
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -95,21 +95,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrq"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -352,9 +352,12 @@ export default {
standId: item.id, standId: item.id,
itemsNum: item.itemsNum, itemsNum: item.itemsNum,
itemsName: item.itemsName, itemsName: item.itemsName,
xcxssrq: item.xcxssrq,
zccssrq: item.zccssrq,
workPeople: "请选择责任人" workPeople: "请选择责任人"
}; };
children.push(aa); children.push(aa);
console.log(children);
} }
); );
this.dataList.forEach(key => { this.dataList.forEach(key => {
@@ -373,7 +376,6 @@ export default {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
} }
}); });
}, },
//保存事件 //保存事件
@@ -400,6 +402,7 @@ export default {
this.isSubmit = true; this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
@@ -96,12 +96,12 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -110,7 +110,7 @@
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -476,6 +476,7 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList; // this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList; this.dataList = this.listForm.dataList;
console.log(this.dataList);
} else { } else {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
@@ -95,21 +95,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrq"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -95,21 +95,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrq"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -95,21 +95,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrq"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrq"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1048,6 +1048,8 @@ export default {
this.sarAccessInfoSearch.standName = '' this.sarAccessInfoSearch.standName = ''
this.sarAccessInfo.standName = '' this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = '' this.sarAccessInfo.standNumber = ''
this.sarAccessInfo.typeApplicable = ''
this.sarAccessInfo.syrz = ''
this.sarAccessInfoSearch.advanceSearchVOStr = '' this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
@@ -2530,6 +2530,9 @@
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
/deep/ p{
display: inline;
}
/deep/.highlight-class { /deep/.highlight-class {
color: red !important; color: red !important;
} }