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:
zhutianqi
2021-12-28 20:49:38 +08:00
parent 4d4e81a912 473e694c8d
commit a60b8b3f37
9 changed files with 175 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+47 -7
View File
@@ -69,6 +69,44 @@
<label style=" margin-right: 164px;">{{ child.attrName }}</label> <label style=" margin-right: 164px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0" <template v-if="child.value && child.value.length > 0"
v-for="(file, fileIndex) in child1Func(child.value)"> v-for="(file, fileIndex) in child1Func(child.value)">
<span>
<div style="margin-left: 19%">
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
</div>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span>
<el-button
v-if="child.attrField === itemNam "
v-for="(itemNam,index) in itemExistList"
:key="index"
@click="showItemsModel(child.attrField)"
class="decomposition-btn"
style="right:62px"
icon="icon-separate"
>标准分解单
</el-button>
<!-- <el-button v-if="child.value && child.value.length > 1"-->
<!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
<!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
<!-- 更多-->
<!-- </el-button>-->
</template>
<template v-else-if="child.value && child.value.length > 0 && child.value.length === 1"
v-for="(file, fileIndex) in child1Func(child.value)">
<span> <span>
<a style="font-size: 16px;color: #409EFF;cursor: pointer" <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -97,13 +135,13 @@
icon="icon-separate" icon="icon-separate"
>标准分解单 >标准分解单
</el-button> </el-button>
<el-button v-if="child.value && child.value.length > 1" <!-- <el-button v-if="child.value && child.value.length > 1"-->
style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);" <!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)"> <!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
更多 <!-- 更多-->
</el-button> <!-- </el-button>-->
</template> </template>
<template v-if="child.value === null">-</template> <template v-else-if="child.value === null">-</template>
</p> </p>
</template> </template>
<!--修订本--> <!--修订本-->
@@ -2076,7 +2114,9 @@ export default {
console.log('1943',child1) console.log('1943',child1)
const list = [] const list = []
if (child1 && child1.length > 1) { if (child1 && child1.length > 1) {
list.push(child1[0]) for (let i = 0; i < child1.length; i++) {
list.push(child1[i])
}
return list return list
} }
return child1 return child1
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+3 -2
View File
@@ -49,7 +49,7 @@
/> />
<i <i
title="下载带水印" title="下载带水印"
@click.stop="downloadFileByWater(item.id, item.name)" @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="''" v-btn-permission="''"
/> />
@@ -360,7 +360,8 @@ export default {
name: item.oldFileName, name: item.oldFileName,
uid: item.uid, uid: item.uid,
status: item.status, status: item.status,
id: item.id id: item.id,
fileSuffix: item.fileSuffix
}); });
}); });
}); });
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+69 -67
View File
@@ -274,75 +274,77 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-table <div class="table-height">
:data="standardData" <el-table
v-loading="loading" :data="standardData"
tooltip-effect="dark" v-loading="loading"
style="width: 100%" tooltip-effect="dark"
border style="width: 100%"
ref="table" border
class="table-height" ref="table"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree" @selection-change="selectThree"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="code"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="标准名称"
> >
<template slot-scope="scope"> <el-table-column
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a> type="selection"
</template> width="55"
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="issueTime" <el-table-column
align="center" prop="code"
label="发布日期"> align="center"
<template slot-scope="scope"> label="标准号">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span> <template slot-scope="scope">
</template> <a v-if="scope.row.standYear" class="table-jump"
</el-table-column> @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
<el-table-column scope.row.standNumber
prop="XCXSSRQ" }}-{{ scope.row.standYear }}</a>
align="center" <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
label="新车型实施日期"> scope.row.standSortShow }}
</el-table-column> {{ scope.row.standNumber }}</a>
<el-table-column </template>
show-overflow-tooltip </el-table-column>
prop="ZCCSSRQ" <el-table-column
align="center" prop="standName"
label="在产车实施日期"> align="center"
</el-table-column> label="标准名称"
<el-table-column >
show-overflow-tooltip <template slot-scope="scope">
prop="textStatus" <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
align="center" </template>
label="文本状态"> </el-table-column>
<template slot-scope="scope"> <el-table-column
<span>{{ textStatusMap[scope.row.textStatus] }}</span> prop="issueTime"
</template> align="center"
</el-table-column> label="发布日期">
</el-table> <template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div> </div>
<pagination <pagination
:page="pageNo" :page="pageNo"
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+3 -2
View File
@@ -49,7 +49,7 @@
/> />
<i <i
title="下载带水印" title="下载带水印"
@click.stop="downloadFileByWater(item.id, item.name)" @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="''" v-btn-permission="''"
/> />
@@ -429,7 +429,8 @@ export default {
name: item.oldFileName, name: item.oldFileName,
uid: item.uid, uid: item.uid,
status: item.status, status: item.status,
id: item.id id: item.id,
fileSuffix: item.fileSuffix
}); });
}); });
}); });
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+2
View File
@@ -1836,9 +1836,11 @@ export default {
/** val === '1' (国外) val === '0'（ 国内 ）*/ /** val === '1' (国外) val === '0'（ 国内 ）*/
// 国内英文名称不必填 国外必填 ，标准性质国内不体现 // 国内英文名称不必填 国外必填 ，标准性质国内不体现
if (val === '1') { if (val === '1') {
this.rules.standName[0].required = false
this.rules.standEnName[0].required = true; this.rules.standEnName[0].required = true;
this.rules.standNature[0].required = false this.rules.standNature[0].required = false
} else { } else {
this.rules.standName[0].required = true
this.rules.standNature[0].required = true this.rules.standNature[0].required = true
this.rules.standEnName[0].required = false; this.rules.standEnName[0].required = false;
} }
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+18 -1
View File
@@ -26,7 +26,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled"> <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData"> <el-radio-group v-model="form.standInData" @change="standInChange">
<el-radio label="0">国内标准入库</el-radio> <el-radio label="0">国内标准入库</el-radio>
<el-radio label="1">海外标准入库</el-radio> <el-radio label="1">海外标准入库</el-radio>
</el-radio-group> </el-radio-group>
@@ -1692,6 +1692,23 @@ export default {
}, },
}, },
methods: { methods: {
// 标准来源改变事件
standInChange(val) {
this.verifySarStandard = false
/** val === '1' (国外) val === '0'（ 国内 ）*/
// 国内英文名称不必填 国外必填 ，标准性质国内不体现
if (val === '1') {
this.rules.standName[0].required = false
this.rules.standNature[0].required = false
this.rules.standEnName[0].required = true;
} else {
this.rules.standName[0].required = true
this.rules.standNature[0].required = true
this.rules.standEnName[0].required = false;
}
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
},
getBusStandFileByAttId(attId) { getBusStandFileByAttId(attId) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getBusStandFileByAttId({ getBusStandFileByAttId({
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+26 -26
View File
@@ -170,32 +170,32 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<el-date-picker <!-- <el-date-picker-->
disabled <!-- disabled-->
v-model="form.ssrqgj" <!-- v-model="form.ssrqgj"-->
type="date" <!-- type="date"-->
placeholder="请选择实施日期(国际)"> <!-- placeholder="请选择实施日期(国际)">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<el-date-picker <!-- <el-date-picker-->
disabled <!-- disabled-->
v-model="form.xcxssrqgj" <!-- v-model="form.xcxssrqgj"-->
type="date" <!-- type="date"-->
placeholder="请选择新车型实施日期(国家)"> <!-- placeholder="请选择新车型实施日期(国家)">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<el-date-picker <!-- <el-date-picker-->
disabled <!-- disabled-->
v-model="form.zccssrqgj" <!-- v-model="form.zccssrqgj"-->
type="date" <!-- type="date"-->
placeholder="请选择在产车实施日期(国家)"> <!-- placeholder="请选择在产车实施日期(国家)">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
</div> </div>
<ProcessTitle> <ProcessTitle>
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+5
View File
@@ -226,6 +226,8 @@
background background
:page-sizes="[20, 40, 60]" :page-sizes="[20, 40, 60]"
:total="total" :total="total"
:page-size="pageSize"
@size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
</el-pagination> </el-pagination>
@@ -753,6 +755,9 @@ export default {
handleCurrentChange(currentPage) { handleCurrentChange(currentPage) {
this.currentPage = currentPage; this.currentPage = currentPage;
}, },
handleSizeChange(size) {
this.pageSize = size;
},
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true; this.saveLoading = true;
src/pages/searchCenter/pages/advancedSearch.vue
+2 -30
View File
@@ -305,21 +305,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled"> <el-form-item label="乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<el-input v-model="standForm.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', standForm.cycvppsbm)"></el-input> <el-input v-model="standForm.cycvppsbm" placeholder="请输入乘用车VPPS编码" clearable></el-input>
<tree-select-new
width = "800"
:key="key1"
:lazy=true
:multiple=true
:check-strictly= true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
:urlChild="urlChild"
@popoverHideCancel = "modalShowFlag2 = false"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -332,21 +318,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="卡车VPPS编码" prop="kccvppsbm"> <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model="standForm.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', standForm.kccvppsbm)"></el-input> <el-input v-model="standForm.kccvppsbm" placeholder="请输入卡车VPPS编码" clearable></el-input>
<tree-select-new
width = "800"
:key="key2"
:lazy=true
:multiple=true
:check-strictly= true
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
@popoverHideCancel = "modalShowFlag3 = false"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>