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 
# Conflicts:
#	src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
This commit is contained in:
zhutianqi
2021-08-10 15:52:33 +08:00
parent 9f7988254f e1bca81ad9
commit 3e66ebda6d
7 changed files with 267 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+2
View File
@@ -409,6 +409,7 @@ export default {
// 查询相关参数 // 查询相关参数
searching: false, searching: false,
commentText:'', commentText:'',
fileType: 'FBGBJBD',
standardSearch: { standardSearch: {
standType: "", standType: "",
standName: "" standName: ""
@@ -847,6 +848,7 @@ export default {
this.$http.post("SarStandItems/sar-stand-items/findStand", { this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page, page: this.page,
size: this.pageSize, size: this.pageSize,
fileType: this.fileType,
...this.standardSearch ...this.standardSearch
}, { }, {
_this: this _this: this
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+2
View File
@@ -396,6 +396,7 @@ export default {
drawerTitle: "", //drawer标题 drawerTitle: "", //drawer标题
// 查询相关参数 // 查询相关参数
searching: false, searching: false,
fileType: 'FBGBJBD',
standardSearch: { standardSearch: {
standType: "", standType: "",
standName: "" standName: ""
@@ -822,6 +823,7 @@ export default {
this.$http.post("SarStandItems/sar-stand-items/findStand", { this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page, page: this.page,
size: this.pageSize, size: this.pageSize,
fileType: this.fileType,
...this.standardSearch ...this.standardSearch
}, { }, {
_this: this _this: this
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+10 -2
View File
@@ -369,6 +369,16 @@ export default {
this.listForm.breakdownList = []; this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) { for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
if(item.pepdtos[i].xCXSSRQ === null){
this.listForm.breakdownList.xCXSSRQ = ""
} else {
this.listForm.breakdownList.xCXSSRQ = item.pepdtos[i].xCXSSRQ
}
if(item.pepdtos[i].zCCSSRQ === null){
this.listForm.breakdownList.zCCSSRQ = ""
} else {
this.listForm.breakdownList.zCCSSRQ = item.pepdtos[i].zCCSSRQ
}
this.listForm.breakdownList.push({ this.listForm.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName, itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum, itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
@@ -386,8 +396,6 @@ export default {
qualityEngineerName: item.pepdtos[i].qualityEngineerName, qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber, standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName, standName: item.pepdtos[i].standName,
xCXSSRQ: item.pepdtos[i].xCXSSRQ,
zCCSSRQ: item.pepdtos[i].zCCSSRQ
}); });
} }
} }
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+14 -6
View File
@@ -68,8 +68,10 @@
label="标准号" label="标准号"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a> }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -484,6 +486,7 @@ export default {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
_this: this _this: this
}, res => { }, res => {
console.log(res.data.records);
this.listForm.dataList = res.data.records; this.listForm.dataList = res.data.records;
this.dataList = res.data.records; this.dataList = res.data.records;
this.listForm.dataList.forEach(item => { this.listForm.dataList.forEach(item => {
@@ -517,7 +520,12 @@ export default {
{ {
_this: this _this: this
}, res => { }, res => {
if (!res.data.length) {
this.dataList = []
this.$message.warning("请选择带有分解单的标准");
} else {
this.listForm.breakdownList = res.data; this.listForm.breakdownList = res.data;
}
}); });
}, },
//标准的多选框改变 //标准的多选框改变
@@ -597,13 +605,13 @@ export default {
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: "OtherStandardDetails",
params: { params: {
id: item.standId, id: item.standId,
pageType: 'INLAND_STAND' pageType: "INLAND_STAND"
} }
}) });
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, "_blank");
}, },
choiceZRR(type, title, id) { choiceZRR(type, title, id) {
this.nodeList = []; this.nodeList = [];
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+88 -66
View File
@@ -15,10 +15,14 @@
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'314ad07cd81834dfdd3c58476cdcde68'">查询</el-button> <el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws"
v-btn-permission="'314ad07cd81834dfdd3c58476cdcde68'">查询
</el-button>
</el-form-item> </el-form-item>
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" @click="resetSelect" size="mini" v-btn-permission="'eb402ab8306d437c7d33e9e4b4e4341a'">清空</el-button> <el-button class="common-button-default" @click="resetSelect" size="mini"
v-btn-permission="'eb402ab8306d437c7d33e9e4b4e4341a'">清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -125,14 +129,16 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'" v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'"
@click="querySarProStateZero">查询</el-button> @click="querySarProStateZero">查询
</el-button>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
class="common-button-default" class="common-button-default"
size="mini" size="mini"
v-btn-permission="'aa4d6d0cc28d016f8241159c9e7d4c80'" v-btn-permission="'aa4d6d0cc28d016f8241159c9e7d4c80'"
@click="clearSearchProState">清空</el-button> @click="clearSearchProState">清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -204,6 +210,9 @@
align="center" align="center"
prop="researchImplementationTime" prop="researchImplementationTime"
label="实施时间"> label="实施时间">
<template slot-scope="scope">
<span>{{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
@@ -232,6 +241,9 @@
align="center" align="center"
prop="researchCompletionTime" prop="researchCompletionTime"
label="完成时间"> label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.researchCompletionTime ? $moment(scope.row.researchCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -244,6 +256,9 @@
align="center" align="center"
prop="productionImplementationTime" prop="productionImplementationTime"
label="实施时间"> label="实施时间">
<template slot-scope="scope">
<span>{{ scope.row.productionImplementationTime ? $moment(scope.row.productionImplementationTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
@@ -266,6 +281,9 @@
align="center" align="center"
prop="productionCompletionTime" prop="productionCompletionTime"
label="完成时间"> label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.productionCompletionTime ? $moment(scope.row.productionCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -283,12 +301,12 @@
<script> <script>
export default { export default {
name: 'standInvolveProjectDetail', name: "standInvolveProjectDetail",
data() { data() {
return { return {
sarProject: { sarProject: {
standName: '', // 标准政策名称 standName: "", // 标准政策名称
standNumber: '', // 标准/政策号 standNumber: "", // 标准/政策号
standApplicationType: 1 standApplicationType: 1
}, // 条件查询 }, // 条件查询
showSarProStateModal: false, // 查看drawer开关 showSarProStateModal: false, // 查看drawer开关
@@ -302,71 +320,72 @@ export default {
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: { sarProStateEO: {
productName: '', productName: "",
standId: '' standId: ""
}, },
sarProStateTotal: 0, sarProStateTotal: 0,
sarProStateTotalPage: 1, sarProStateTotalPage: 1,
sarProStatePageSize: this.$store.getters.userInfo.configContent, sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStateListDatas: [], // 符合性项目列表数据 sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null, // 符合性项目列表高度 sarProStateTableHeight: null, // 符合性项目列表高度
standId: '' // 符合性项目Id standId: "" // 符合性项目Id
} };
}, },
methods: { methods: {
searchStandAndLaws() { searchStandAndLaws() {
this.page = 1 this.page = 1;
this.queryStandAndLaws() this.queryStandAndLaws();
}, // 查询 }, // 查询
pageChange(page) { pageChange(page) {
this.page = page this.page = page;
this.queryStandAndLaws() this.queryStandAndLaws();
}, },
pageSizeChange(pageSize) { pageSizeChange(pageSize) {
this.pageSize = pageSize this.pageSize = pageSize;
this.$store.getters.userInfo.configContent = pageSize this.$store.getters.userInfo.configContent = pageSize;
this.queryStandAndLaws() this.queryStandAndLaws();
}, },
//点击查看详情 //点击查看详情
handlePreview(item) { handlePreview(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: "OtherStandardDetails",
params: { params: {
id: item.standId, id: item.standId,
pageType: 'INLAND_STAND' pageType: "INLAND_STAND"
} }
}) });
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, "_blank");
}, },
queryStandAndLaws() { queryStandAndLaws() {
this.sarProject.current = this.page this.sarProject.current = this.page;
this.sarProject.size = this.pageSize this.sarProject.size = this.pageSize;
this.$http.get('sarStandardComplianceAssessResult/standard', this.sarProject, { this.$http.get("sarStandardComplianceAssessResult/standard", this.sarProject, {
_this: this, _this: this,
loading: 'loading', loading: "loading"
}, res => { }, res => {
this.sarProjectListDatas = res.data.records this.sarProjectListDatas = res.data.records;
this.total = res.data.total this.total = res.data.total;
}, e=> {}) }, e => {
});
}, // 分页查询 }, // 分页查询
resetSelect() { resetSelect() {
this.sarProject.country = '' this.sarProject.country = "";
this.sarProject.standCode='' this.sarProject.standCode = "";
this.sarProject.standName = '' this.sarProject.standName = "";
this.sarProject.standNumber='' this.sarProject.standNumber = "";
this.queryStandAndLaws() this.queryStandAndLaws();
}, // 外层清空条件查询 }, // 外层清空条件查询
handleProjectCompliance(row) { handleProjectCompliance(row) {
this.standId = row.standId this.standId = row.standId;
this.querySarProStateZero() this.querySarProStateZero();
}, // 查看项目符合性 }, // 查看项目符合性
querySarProStateZero() { querySarProStateZero() {
this.sarProStateTotalPage = 1 this.sarProStateTotalPage = 1;
var form = this.sarProStateEO var form = this.sarProStateEO;
// form.standId = this.standId // form.standId = this.standId
form.current = this.sarProStateTotalPage form.current = this.sarProStateTotalPage;
form.size = this.sarProStatePageSize form.size = this.sarProStatePageSize;
this.$http.get('sarStandardComplianceAssessResult/product', form, { this.$http.get("sarStandardComplianceAssessResult/product", form, {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
@@ -377,49 +396,50 @@ export default {
// } // }
// } // }
// }) // })
this.sarProStateListDatas = res.data.records this.sarProStateListDatas = res.data.records;
this.sarProStateTotal = res.data.total this.sarProStateTotal = res.data.total;
} }
}) });
this.showSarProStateModal = true this.showSarProStateModal = true;
}, // 查询项目数据 }, // 查询项目数据
clearSearchProState() { clearSearchProState() {
this.sarProStateEO.productName = '' this.sarProStateEO.productName = "";
this.sarProStateEO.standId = '' this.sarProStateEO.standId = "";
this.sarProStateTotalPage = 1 this.sarProStateTotalPage = 1;
this.querySarProStateZero() this.querySarProStateZero();
}, // 清空条件查询 }, // 清空条件查询
clearSearchPro() { clearSearchPro() {
this.sarProStateEO.productName = '' this.sarProStateEO.productName = "";
this.sarProStateEO.standId = '' this.sarProStateEO.standId = "";
this.showSarProStateModal = false this.showSarProStateModal = false;
this.standId = '' this.standId = "";
}, // 关闭查看事件 }, // 关闭查看事件
pageProStateChange(page) { pageProStateChange(page) {
this.sarProStateTotalPage = page this.sarProStateTotalPage = page;
this.querySarProStateZero() this.querySarProStateZero();
}, },
pageProStateSizeChange(pageSize) { pageProStateSizeChange(pageSize) {
this.sarProStatePageSize = pageSize this.sarProStatePageSize = pageSize;
this.$store.getters.userInfo.configContent = pageSize this.$store.getters.userInfo.configContent = pageSize;
this.querySarProStateZero() this.querySarProStateZero();
}, }
}, },
mounted() { mounted() {
this.queryStandAndLaws() this.queryStandAndLaws();
this.tableHeight = $('.regulatory-repository').height() - 159 this.tableHeight = $(".regulatory-repository").height() - 159;
this.sarProStateTableHeight=$('.regulatory-repository').height() -120 this.sarProStateTableHeight = $(".regulatory-repository").height() - 120;
window.onresize = () => { window.onresize = () => {
this.tableHeight = $('.regulatory-repository').height() - 159 this.tableHeight = $(".regulatory-repository").height() - 159;
this.sarProStateTableHeight=$('.regulatory-repository').height() - 120 this.sarProStateTableHeight = $(".regulatory-repository").height() - 120;
} };
}
} }
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.stand-involve-project-detail { .stand-involve-project-detail {
height: 100%; height: 100%;
.laws-details-header { .laws-details-header {
background: #fff; background: #fff;
// height: 30px; // height: 30px;
@@ -430,6 +450,7 @@ export default {
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
} }
.title { .title {
display: inline-block; display: inline-block;
font-weight: bold; font-weight: bold;
@@ -439,6 +460,7 @@ export default {
text-align: center; text-align: center;
} }
} }
.contaiiner { .contaiiner {
background: #fff; background: #fff;
padding: 5px 10px; padding: 5px 10px;
src/pages/searchCenter/pages/advancedSearch.vue
+6 -6
View File
@@ -13,7 +13,7 @@
</h5> </h5>
</div> </div>
<div v-if="!kindtext" style="position: absolute;right: 110px;display: flex"> <div v-if="!kindtext" style="position: absolute;right: 110px;display: flex">
<el-input v-model="standForm.selectValue" :placeholder="$t('m.standSelect')" @keyup.enter.native="btnSearch" <el-input v-model.trim="standForm.selectValue" :placeholder="$t('m.standSelect')" @keyup.enter.native="btnSearch"
clearable> clearable>
</el-input> </el-input>
<el-button type="primary" @click="btnSearch" style="width: 98px;background:#3391CE <el-button type="primary" @click="btnSearch" style="width: 98px;background:#3391CE
@@ -899,8 +899,8 @@
v-if="selectIndex !== 'items'" v-if="selectIndex !== 'items'"
width="130"> width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.issue_time !== null && scope.row.issue_time !== undefined"> <div v-if="scope.row.issue_time !== null && scope.row.issueTime !== undefined">
{{ $dateFormat(new Date(scope.row.issue_time), "yyyy-MM-dd") }} {{ $dateFormat(new Date(scope.row.issueTime), "yyyy-MM-dd") }}
</div> </div>
<div v-else></div> <div v-else></div>
</template> </template>
@@ -910,8 +910,8 @@
:label="$t('m.putTime')" :label="$t('m.putTime')"
width="130"> width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.put_time !== null && scope.row.put_time !== undefined"> <div v-if="scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== ''">
{{ $dateFormat(new Date(scope.row.put_time), "yyyy-MM-dd") }} {{ $dateFormat(new Date(scope.row.SSRQ), "yyyy-MM-dd") }}
</div> </div>
<div v-else></div> <div v-else></div>
</template> </template>
@@ -919,7 +919,7 @@
<el-table-column <el-table-column
align="center" align="center"
width="180" width="180"
:label="selectIndex === 'INLAND_STAND' ? '标准状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '企业标准状态')"> :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '企业标准状态')">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{ scope.row.standstateshow }} {{ scope.row.standstateshow }}
src/pages/searchCenter/pages/standardSearch.vue
+1 -1
View File
@@ -11,7 +11,7 @@
<el-input <el-input
placeholder="请输入查询条件" placeholder="请输入查询条件"
clearable clearable
v-model="keywords" v-model.trim="keywords"
@keyup.enter.native="searchSarByInputKeyByCondition"> @keyup.enter.native="searchSarByInputKeyByCondition">
</el-input> </el-input>
</div> </div>