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
2022-01-04 15:18:58 +08:00
parent b2b2719421 8ab51f3f04
commit 6c595a47c4
5 changed files with 520 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/DatePickerGroup.vue
+1 -1
View File
@@ -144,7 +144,7 @@ export default {
}, },
watch: { watch: {
value (val) { value (val) {
this.tagList = val !== '' && val !== null ? val.split(',') : [] this.tagList = val !== '' && val !== null && val !== undefined? val.split(',') : []
// 把日期的时分秒去掉 // 把日期的时分秒去掉
this.tagList=this.tagList.map((item)=>item.substring(0,10)) this.tagList=this.tagList.map((item)=>item.substring(0,10))
}, },
src/pages/details/otherStandardDetails/index.vue
+3 -4
View File
@@ -266,10 +266,9 @@
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{ <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
sarStandardsInfoEO.issueTime || '-' sarStandardsInfoEO.issueTime || '-'
}}</span></p> }}</span></p>
<!-- <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{--> <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
<!-- standMap[sarStandardsInfoEO.standNature] || '-'--> standMap[sarStandardsInfoEO.standNature] || '-'
<!-- }}</span></p>--> }}</span></p>
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
style=" margin-right: 150px;">标准体系</label><span>{{ style=" margin-right: 150px;">标准体系</label><span>{{
sarStandardsInfoEO.standSystem || '-' sarStandardsInfoEO.standSystem || '-'
src/pages/localTool/standardWarning.vue
+2 -2
View File
@@ -184,7 +184,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center"> <el-table-column prop="applyType" label="适用车型" align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right"> <!-- <el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -192,7 +192,7 @@
@click="cancelWarning(scope.$index, scope.row)">取消预警 @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
style="position: static;" style="position: static;"
src/pages/processCenter/pages/phone/bzrk/step2.vue
+69 -94
View File
@@ -15,22 +15,26 @@
ref="qbkwForm" ref="qbkwForm"
:model="form" :model="form"
class="label-input-form" class="label-input-form"
label-width="210px" label-width="180px"
> >
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24">
<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" disabled> <el-radio-group v-model="form.standInData" disabled>
<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>
</el-form-item> </el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standNumber"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled> <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option <el-option
@@ -84,16 +88,7 @@
<el-radio label="2">否</el-radio> <el-radio label="2">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standNumber"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled> <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option <el-option
@@ -142,46 +137,32 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</div> </div>
<ProcessTitle> <ProcessTitle>
<template slot="title">实施日期</template> <template slot="title">实施日期</template>
</ProcessTitle> </ProcessTitle>
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<cus-tom-data-picker-group <cus-tom-data-picker-group
:key="'ssrq'"
:config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}" :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
v-model="form.ssrq" v-model="form.ssrq"
:disabled="true" :disabled="true"
></cus-tom-data-picker-group> ></cus-tom-data-picker-group>
<cus-tom-data-picker-group <cus-tom-data-picker-group
:key="'zccssrq'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}" :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.zccssrq" v-model="form.zccssrq"
:disabled="true" :disabled="true"
></cus-tom-data-picker-group> ></cus-tom-data-picker-group>
</el-col>
<el-col :span="12">
<cus-tom-data-picker-group <cus-tom-data-picker-group
:key="'zccssrq'"
:config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}" :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
v-model="form.xcxssrq" v-model="form.xcxssrq"
:disabled="true" :disabled="true"
></cus-tom-data-picker-group> ></cus-tom-data-picker-group>
</el-col>
</el-row>
</div> </div>
<ProcessTitle> <ProcessTitle>
<template slot="title">文本信息</template> <template slot="title">文本信息</template>
</ProcessTitle> </ProcessTitle>
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)"> <div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)">
<!-- {{ value.name }} --> <!-- {{ value.name }} -->
@@ -223,8 +204,7 @@
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)"> <div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
{{ value.name }} {{ value.name }}
@@ -259,15 +239,11 @@
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</div> </div>
<ProcessTitle> <ProcessTitle>
<template slot="title">适用范围</template> <template slot="title">适用范围</template>
</ProcessTitle> </ProcessTitle>
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled> <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option <el-option
@@ -301,15 +277,36 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" label-width="190px" class="add-form-item form-item-disabled">
<el-input v-model="form.cycvppsbm" disabled></el-input> <el-input v-model="form.cycvppsbm" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-input v-model="form.kccvppsbm" disabled></el-input> <el-input v-model="form.kccvppsbm" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" label-width="210px" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" label-width="210px" class="add-form-item form-item-disabled">
<el-input
v-model="form.kccvppscn"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled"> <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" disabled></el-input> <el-input v-model="form.dybxh" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-input
v-model="form.dymc"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled> <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option> <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -337,8 +334,6 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled"> <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled> <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
<el-option <el-option
@@ -372,38 +367,17 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item>--> </el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.kccvppscn"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-input
v-model="form.dymc"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<span>{{ form.wssmr }}</span> <span>{{ form.wssmr }}</span>
<!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>--> <!--<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
<!-- <el-option--> <el-option
<!-- v-for="item in wssmrOptions"--> v-for="item in wssmrOptions"
<!-- placeholder="请选择"--> placeholder="请选择"
<!-- :key="item.value"--> :key="item.value"
<!-- :value="item.value"--> :value="item.value"
<!-- :label="item.label"--> :label="item.label"
<!-- ></el-option>--> ></el-option>
<!-- </el-select>--> </el-select>-->
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled> <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
@@ -416,15 +390,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</div> </div>
<ProcessTitle> <ProcessTitle>
<template slot="title">关联信息</template> <template slot="title">关联信息</template>
</ProcessTitle> </ProcessTitle>
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled"> <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -446,8 +416,6 @@
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled"> <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -472,8 +440,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</div> </div>
</el-form> </el-form>
</div> </div>
@@ -485,14 +451,6 @@
ref="formTongGuo" ref="formTongGuo"
:model="formTongGuo" :model="formTongGuo"
:rules="rules"> :rules="rules">
<!-- <el-form-item-->
<!-- prop="approvalOpinion"-->
<!-- >-->
<!-- <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<!-- <el-option label="驳回" value="1"></el-option>-->
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item <el-form-item
prop="commentText" prop="commentText"
> >
@@ -548,7 +506,12 @@ import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/pro
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CusTomDataPickerGroup import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
import Vue from 'vue';
import { Form } from 'vant';
import { Field } from 'vant';
Vue.use(Form);
Vue.use(Field);
export default { export default {
name: "phoneBzrkStep2", name: "phoneBzrkStep2",
data() { data() {
@@ -854,7 +817,8 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.detailData = res this.detailData = res
}, e => {}) }, e => {
})
}, },
assemble(ids, names) { assemble(ids, names) {
let list = new Array(); let list = new Array();
@@ -924,10 +888,11 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item)) this.form = JSON.parse(JSON.stringify(item))
/* console.log(this.form)
this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm]
this.defaultCheckedKeys3 = [this.form.dybxh] this.defaultCheckedKeys3 = [this.form.dybxh]*/
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
@@ -959,7 +924,8 @@ export default {
this.drawerModal = true this.drawerModal = true
this.drawerTitle = '转办处理人' this.drawerTitle = '转办处理人'
}, },
handleSave() {}, handleSave() {
},
handle1() { handle1() {
this.formTongGuo.approvalOpinion = 1 this.formTongGuo.approvalOpinion = 1
this.handleSubmit() this.handleSubmit()
@@ -1007,7 +973,8 @@ export default {
} }
} }
}) })
}}) }
})
}, },
/** /**
@@ -1069,30 +1036,37 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/phone'; @import '~@/assets/styles/phone';
.bzrkStep2 { .bzrkStep2 {
/deep/.el-select .el-input .el-select__caret {
font-size: 0;
}
/deep/.prc-content-border {
width: 600px;
}
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
/deep/ .van-dialog__content { /deep/ .van-dialog__content {
min-height: 300px; min-height: 300px;
padding: 10px; padding: 10px;
} }
.prc-content-border {
overflow: auto;
}
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
position: relative; position: relative;
height: 100%; height: 100%;
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
overflow: auto; overflow: auto;
.tableTitle { .tableTitle {
margin-bottom: 10px; margin-bottom: 10px;
height: 30px; height: 30px;
@@ -1100,6 +1074,7 @@ export default {
position: relative; position: relative;
font-size: 13px; font-size: 13px;
font-weight: bold; font-weight: bold;
.tableButton { .tableButton {
position: absolute; position: absolute;
right: 0; right: 0;
src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue
+4 -4
View File
@@ -4,7 +4,7 @@
<el-form-item <el-form-item
:label="config.attrName" :label="config.attrName"
:prop="config.attrField" :prop="config.attrField"
label-width="150px" label-width="180px"
class="add-form-item" class="add-form-item"
:class="{'form-item-disabled': disabled}" :class="{'form-item-disabled': disabled}"
> >
@@ -12,7 +12,7 @@
v-show="false" v-show="false"
:value="value" :value="value"
:placeholder="placeholder" :placeholder="placeholder"
clearable :disabled="disabled"
></el-input> ></el-input>
<div class="date-picker-group"> <div class="date-picker-group">
<template v-for="(tag, index) in tagList"> <template v-for="(tag, index) in tagList">
@@ -20,7 +20,7 @@
<div class="tag-wrap" v-if="tagAnimateList.includes(tag)" :key="index"> <div class="tag-wrap" v-if="tagAnimateList.includes(tag)" :key="index">
<el-tag <el-tag
size="small" size="small"
closable :closable="!disabled"
@close="handleRemoveTag(index)">{{ tag }}</el-tag> @close="handleRemoveTag(index)">{{ tag }}</el-tag>
</div> </div>
</transition> </transition>
@@ -122,7 +122,7 @@ export default {
}, },
watch: { watch: {
value (val) { value (val) {
this.tagList = val !== '' && val !== null ? val.split(',') : [] this.tagList = val !== '' && val !== null && val !== undefined ? val.split(',') : []
}, },
tagList: { tagList: {
handler (val) { handler (val) {