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