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:
fanlin
2021-07-26 13:58:51 +08:00
parent f68f9d140f 3231319451
commit c73440cdd5
8 changed files with 146 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+27 -27
View File
@@ -158,14 +158,6 @@
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled"> <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.zccssrq" v-model="form.zccssrq"
@@ -176,30 +168,38 @@
</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="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.ssrqgj" v-model="form.xcxssrq"
type="date" type="date"
placeholder="请选择实施日期(国际)" placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrqgj"
type="date"
placeholder="请选择新车型实施日期(国家)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.zccssrqgj"
type="date"
placeholder="请选择在产车实施日期(国家)"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+30 -30
View File
@@ -147,15 +147,6 @@
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled"> <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -167,33 +158,42 @@
</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="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
v-model="form.ssrqgj" v-model="form.xcxssrq"
type="date" type="date"
placeholder="请选择实施日期(国际)" placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrqgj"
type="date"
placeholder="请选择新车型实施日期(国家)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.zccssrqgj"
type="date"
placeholder="请选择在产车实施日期(国家)"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+29 -29
View File
@@ -145,14 +145,6 @@
placeholder="请选择标准实施日期(标准文本)"> placeholder="请选择标准实施日期(标准文本)">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled"> <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -163,30 +155,38 @@
</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="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
v-model="form.ssrqgj" v-model="form.xcxssrq"
type="date" type="date"
placeholder="请选择实施日期(国际)"> placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrqgj"
type="date"
placeholder="请选择新车型实施日期(国家)">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.zccssrqgj"
type="date"
placeholder="请选择在产车实施日期(国家)">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+25 -25
View File
@@ -149,13 +149,6 @@
placeholder="请选择标准实施日期(标准文本)"> placeholder="请选择标准实施日期(标准文本)">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled"> <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.zccssrq" v-model="form.zccssrq"
@@ -165,27 +158,34 @@
</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="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.ssrqgj" v-model="form.xcxssrq"
type="date" type="date"
placeholder="请选择实施日期(国际)"> placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrqgj"
type="date"
placeholder="请选择新车型实施日期(国家)">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.zccssrqgj"
type="date"
placeholder="请选择在产车实施日期(国家)">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1
View File
@@ -524,6 +524,7 @@
</template> </template>
<template v-else-if="field.attrType === 'DATE_PICKER'"> <template v-else-if="field.attrType === 'DATE_PICKER'">
<custom-date-pick <custom-date-pick
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField" :key="field.attrField"
:config="field" :config="field"
v-model="sarStandardsInfoEO[field.attrField]" v-model="sarStandardsInfoEO[field.attrField]"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1
View File
@@ -483,6 +483,7 @@
</template> </template>
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'"> <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
<custom-date-pick <custom-date-pick
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField" :key="field.attrField"
:config="field" :config="field"
v-model="sarStandardsInfoEO[field.attrField]" v-model="sarStandardsInfoEO[field.attrField]"
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+2 -1
View File
@@ -1278,13 +1278,14 @@ export default {
}, res => { }, res => {
if (this.localProTableSearch.prodectCode === 'Maintenance') { if (this.localProTableSearch.prodectCode === 'Maintenance') {
this.localProTableList = res.data.Maintenance.records this.localProTableList = res.data.Maintenance.records
this.total = res.data.Maintenance.total
} }
else if (this.localProTableSearch.prodectCode === 'notMaintenance') else if (this.localProTableSearch.prodectCode === 'notMaintenance')
{ {
this.localProTableList = res.data.notMaintenance.records this.localProTableList = res.data.notMaintenance.records
this.total = res.data.notMaintenance.total
} }
this.total = res.data.count
// this.localProTableList.map((item) => { // this.localProTableList.map((item) => {
// this.xmztOptions.map((opr) => { // this.xmztOptions.map((opr) => {
// if (item.productBrand === opr.value) { // if (item.productBrand === opr.value) {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+31 -11
View File
@@ -78,47 +78,56 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" prop="ssrq"
width="190px" width="190px"
sortable sortable
label="标准实施日期"> label="标准实施日期">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="XCXSSRQGJ" prop="xcxssrqgj"
width="190px" width="190px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span style="margin-left: 10px">{{scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '-' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ZCCSSRQGJ" prop="zccssrqgj"
sortable sortable
width="190px" width="190px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '-' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ZRBM" prop="zrbm"
label="责任部门" label="责任部门"
width="180px" width="180px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="KCCVPPSBM" prop="kccvppsbm"
width="180px" width="180px"
label="卡车VPPS编码"> label="卡车VPPS编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="KCCVPPSCN" prop="cycvppscn"
width="180px" width="180px"
label="卡车vpps中文名称"> label="卡车vpps中文名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="CYCVPPSBM" prop="cycvppsbm"
width="180px" width="180px"
label="乘车VPPS编码"> label="乘车VPPS编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="CYCVPPSBM" prop="cycvppscn"
width="180px" width="180px"
label="乘车vpps中文名称"> label="乘车vpps中文名称">
</el-table-column> </el-table-column>
@@ -451,10 +460,8 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
this.$message.success(res.message) // this.$message.success(res.message)
this.getDataList() this.getDataList()
}else {
this.$message.warning(res.message)
} }
}, e => { }, e => {
}); });
@@ -502,6 +509,17 @@ export default {
this.$message.warning("请选择一条数据进行带入"); this.$message.warning("请选择一条数据进行带入");
} }
}, },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
back () { back () {
this.$router.push(this.$store.state.detailMap) this.$router.push(this.$store.state.detailMap)
this.$store.commit('setDetailMap', '') this.$store.commit('setDetailMap', '')
@@ -568,6 +586,7 @@ export default {
} }
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName
console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
window.open(exportURL) window.open(exportURL)
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} }
@@ -575,6 +594,7 @@ export default {
console.log(this.selectList); console.log(this.selectList);
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName 'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName
console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
window.open(exportURL) window.open(exportURL)
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} }