FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标准入库流程手机端调整，预警去除按钮，详情增加性质

Browse Source
This commit is contained in:
shenyanpei
2022-01-04 15:01:13 +08:00
parent ee2f66e055
commit 8ab51f3f04
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
+160 -185
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,50 +137,36 @@
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 }} -->
{{value.name}} {{ value.name }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -193,7 +174,7 @@
</el-form-item> </el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled"> <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)"> <div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
{{value.name}} {{ value.name }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -201,7 +182,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)"> <div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
{{value.name}} {{ value.name }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -209,7 +190,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)"> <div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
{{value.name}} {{ value.name }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -217,17 +198,16 @@
</el-form-item> </el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled"> <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)"> <div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
{{value.name}} {{ value.name }}
</div> </div>
<div v-else> <div v-else>
- - - -
</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 }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -237,7 +217,7 @@
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************--> <!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)"> <div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
{{value.name}} {{ value.name }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -245,7 +225,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)"> <div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
{{value.name}} {{ value.name }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -253,21 +233,17 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)"> <div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
{{value.name}} {{ value.name }}
</div> </div>
<div v-else> <div v-else>
- - - -
</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
@@ -440,14 +410,12 @@
</el-form-item> </el-form-item>
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)"> <div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
{{value.name}} {{ value.name }}
</div> </div>
<div v-else> <div v-else>
- - - -
</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,27 +440,17 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</div> </div>
</el-form> </el-form>
</div> </div>
<div> <div>
<el-collapse accordion v-model="activeName"> <el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1"> <el-collapse-item title="审批意见" name="1">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-form <el-form
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"
> >
@@ -544,14 +502,19 @@
import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
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() {
return { return {
xgdFileMap: [], xgdFileMap: [],
fbgbjbdFileMap: [], fbgbjbdFileMap: [],
@@ -568,7 +531,7 @@ export default {
drawerModal: false, drawerModal: false,
drawerTitle: '', drawerTitle: '',
nodeList: [], nodeList: [],
selectPeople:'', selectPeople: '',
xgdFileId: '', xgdFileId: '',
fbgbjbdFileId: '', fbgbjbdFileId: '',
bpgFileId: '', bpgFileId: '',
@@ -578,16 +541,16 @@ export default {
kwjFileId: '', kwjFileId: '',
glwjFileId: '', glwjFileId: '',
caFileId: '', caFileId: '',
zbjbdFileId:'', zbjbdFileId: '',
rules: { rules: {
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }], commentText: [{required: true, message: '请输入意见', trigger: 'blur'}],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }] approvalOpinion: [{required: true, message: '请选择审批意见', trigger: 'change'}]
}, },
activeName:'1', activeName: '1',
// 当前流程类型(1待办/2已办) // 当前流程类型(1待办/2已办)
processType: 1, processType: 1,
detailData: [], detailData: [],
userId:this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
formTongGuo: { formTongGuo: {
@@ -677,17 +640,17 @@ export default {
xglc: '', // 相关流程 xglc: '', // 相关流程
chjl: '', // 参会记录 chjl: '', // 参会记录
//流程信息 //流程信息
prcNum:'', prcNum: '',
commentText:'', commentText: '',
prcName:'', prcName: '',
standType: '', standType: '',
}, // 标准信息 }, // 标准信息
nodeKeyCode: 'code', nodeKeyCode: 'code',
nodeKeyModel: 'model', nodeKeyModel: 'model',
key:1, key: 1,
key1:2, key1: 2,
key2:3, key2: 3,
key3:4, key3: 4,
defaultCheckedKeys1: [], defaultCheckedKeys1: [],
defaultCheckedKeys2: [], defaultCheckedKeys2: [],
defaultCheckedKeys3: [], defaultCheckedKeys3: [],
@@ -699,7 +662,7 @@ export default {
children: 'children', children: 'children',
label: 'model' label: 'model'
}, },
countryOptions:[],//国家地区 countryOptions: [],//国家地区
busVppsOptions: [], // 车系体系架构 busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构 modelOptions: [], // 模块体系架构
standSortOptions: [], // 标准类别 standSortOptions: [], // 标准类别
@@ -726,8 +689,8 @@ export default {
user4: '', user4: '',
user5: '', user5: '',
// 流程路由信息 // 流程路由信息
prcNum : this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
prcName : this.$route.query.prcName, prcName: this.$route.query.prcName,
} }
}, },
components: { components: {
@@ -738,11 +701,11 @@ export default {
TreeSelect TreeSelect
}, },
methods: { methods: {
checkedRole (data) { checkedRole(data) {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -752,82 +715,82 @@ export default {
this.$message.success('调整成功') this.$message.success('调整成功')
this.processNum() this.processNum()
this.queryProcess() this.queryProcess()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
} }
}) })
}, },
downloadFile (fileType) { downloadFile(fileType) {
//文件id中出现了','字符,去除掉 //文件id中出现了','字符,去除掉
if(fileType === 'fbgbjbd'){ if (fileType === 'fbgbjbd') {
if(this.fbgbjbdFileId.search(',')){ if (this.fbgbjbdFileId.search(',')) {
this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", "");
} }
let attId = this.fbgbjbdFileId let attId = this.fbgbjbdFileId
this.$preview(attId) this.$preview(attId)
}else if(fileType === 'xgd'){ } else if (fileType === 'xgd') {
let attId = this.xgdFileId let attId = this.xgdFileId
this.$preview(attId) this.$preview(attId)
}else if(fileType === 'bpg'){ } else if (fileType === 'bpg') {
let attId = this.bpgFileId let attId = this.bpgFileId
this.$preview(attId) this.$preview(attId)
}else if(fileType === 'ssg'){ } else if (fileType === 'ssg') {
let attId = this.ssgFileId let attId = this.ssgFileId
this.$preview(attId) this.$preview(attId)
}else if(fileType === 'zqyjg'){ } else if (fileType === 'zqyjg') {
let attId = this.zqyjgFileId let attId = this.zqyjgFileId
this.$preview(attId) this.$preview(attId)
}else if(fileType === 'jdwj'){ } else if (fileType === 'jdwj') {
let attId = this.jdwjFileId let attId = this.jdwjFileId
this.$preview(attId) this.$preview(attId)
}else if(fileType === 'kwj'){ } else if (fileType === 'kwj') {
let attId = this.kwjFileId let attId = this.kwjFileId
this.$preview(attId) this.$preview(attId)
}else if(fileType === 'glwj'){ } else if (fileType === 'glwj') {
let attId = this.glwjFileId let attId = this.glwjFileId
this.$preview(attId) this.$preview(attId)
}else if(fileType === 'ca'){ } else if (fileType === 'ca') {
let attId = this.caFileId let attId = this.caFileId
this.$preview(attId) this.$preview(attId)
}else if(fileType === 'zbjbd'){ } else if (fileType === 'zbjbd') {
let attId = this.zbjbdFileId let attId = this.zbjbdFileId
this.$preview(attId) this.$preview(attId)
} }
}, },
getRule(){ getRule() {
if (this.formTongGuo.approvalOpinion === 0) { if (this.formTongGuo.approvalOpinion === 0) {
this.rules.commentText[0].required = false; this.rules.commentText[0].required = false;
this.$refs.formTongGuo.clearValidate('commentText') this.$refs.formTongGuo.clearValidate('commentText')
}else { } else {
this.rules.commentText[0].required = true; this.rules.commentText[0].required = true;
} }
}, },
popoverHide (checkedIds, checkedData) { popoverHide(checkedIds, checkedData) {
if(checkedData) { if (checkedData) {
this.form.standSystem = checkedData.id this.form.standSystem = checkedData.id
this.form.standSystemName = checkedData.menuName this.form.standSystemName = checkedData.menuName
} }
}, },
popoverHideBusVs (checkedIds, checkedData) { popoverHideBusVs(checkedIds, checkedData) {
if(checkedData){ if (checkedData) {
this.form.cycvppsbm = checkedData.code this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName this.form.cycvppscn = checkedData.chineseName
} }
}, },
popoverHideCarVs (checkedIds, checkedData) { popoverHideCarVs(checkedIds, checkedData) {
if(checkedData){ if (checkedData) {
this.form.kccvppsbm = checkedData.code this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName this.form.kccvppscn = checkedData.chineseName
} }
}, },
popoverHideModel (checkedIds, checkedData) { popoverHideModel(checkedIds, checkedData) {
if(checkedData){ if (checkedData) {
this.form.dybxh = checkedData.model this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name this.form.dymc = checkedData.name
} }
}, },
busVsFunc(){ busVsFunc() {
this.$http.get('sarVppsTree/list', '', { this.$http.get('sarVppsTree/list', '', {
_this: this _this: this
}, res => { }, res => {
@@ -836,7 +799,7 @@ export default {
this.key2++ this.key2++
}) })
}, },
modelFunc(){ modelFunc() {
this.$http.get('sarModelTree/list', '', { this.$http.get('sarModelTree/list', '', {
_this: this _this: this
}, res => { }, res => {
@@ -844,7 +807,7 @@ export default {
this.key3++ this.key3++
}) })
}, },
processTable () { processTable() {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '', sortWord: this.shunxu ? this.paixu : '',
@@ -854,20 +817,21 @@ 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();
let idArray = [] let idArray = []
let nameArray = [] let nameArray = []
if(ids.length > 0) { if (ids.length > 0) {
idArray=ids.split(','); idArray = ids.split(',');
} }
if (names.length > 0) { if (names.length > 0) {
nameArray = names.split(','); nameArray = names.split(',');
} }
for(var i=0;i<idArray.length;i++) { for (var i = 0; i < idArray.length; i++) {
list.push({id:idArray[i],name:nameArray[i]}); list.push({id: idArray[i], name: nameArray[i]});
} }
return list; return list;
@@ -892,25 +856,25 @@ export default {
this.zbjbdFileId = processForm.zbjbd this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName); this.xgdFileMap = this.assemble(processForm.xgd, processForm.xgdName);
this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName); this.fbgbjbdFileMap = this.assemble(processForm.fbgbjbd, processForm.fbgbjbdName);
// fbgbjbdFileMap: {}, // fbgbjbdFileMap: {},
this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName); this.bpgFileMap = this.assemble(processForm.bpg, processForm.bpgName);
// bpgFileMap: {}, // bpgFileMap: {},
this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName); this.ssgFileMap = this.assemble(processForm.ssg, processForm.ssgName);
// ssgFileMap: {}, // ssgFileMap: {},
this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName); this.zqyjgFileMap = this.assemble(processForm.zqyjg, processForm.zqyjgName);
// zqyjgFileMap: {}, // zqyjgFileMap: {},
this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwjName); this.jdwjFileMap = this.assemble(processForm.jdwj, processForm.jdwjName);
// jdwjFileMap: {}, // jdwjFileMap: {},
this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName); this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName);
// kwjFileMap: {}, // kwjFileMap: {},
this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName); this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName);
// glwjFileMap: {}, // glwjFileMap: {},
this.caFileMap=this.assemble(processForm.ca,processForm.caName); this.caFileMap = this.assemble(processForm.ca, processForm.caName);
// caFileMap: {}, // caFileMap: {},
this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName); this.zbjbdFileMap = this.assemble(processForm.zbjbd, processForm.zbjbdName);
// zbjbdFileMap: {}, // zbjbdFileMap: {},
} }
@@ -921,17 +885,18 @@ export default {
/** /**
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
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 !== '') {
this.form.country=this.form.country.split(","); this.form.country = this.form.country.split(",");
} }
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
@@ -959,18 +924,19 @@ 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()
}, },
handle2(){ handle2() {
this.formTongGuo.approvalOpinion = 0 this.formTongGuo.approvalOpinion = 0
this.handleSubmit() this.handleSubmit()
}, },
handleSubmit() { handleSubmit() {
this.getRule() this.getRule()
const val= this.form.country; const val = this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') { if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) { if (val instanceof Array) {
this.form.country = val.join(","); this.form.country = val.join(",");
@@ -988,26 +954,27 @@ export default {
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
userId : this.userId, userId: this.userId,
json: json json: json
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion); console.log("this.formTongGuo.approvalOpinion", this.formTongGuo.approvalOpinion);
if(this.formTongGuo.approvalOpinion == '1'){ if (this.formTongGuo.approvalOpinion == '1') {
console.log("shibai"); console.log("shibai");
this.$message.warning("驳回成功") this.$message.warning("驳回成功")
this.isSubmit = false this.isSubmit = false
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
}else{ } else {
console.log("hello"); console.log("hello");
this.processCreateStand(json) this.processCreateStand(json)
} }
} }
}) })
}}) }
})
}, },
/** /**
@@ -1034,15 +1001,15 @@ export default {
}) })
}, },
}, },
created(){ created() {
}, },
mounted () { mounted() {
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
}, res => { }, res => {
this.countryOptions=res.data.COUNTRY//国家地区 this.countryOptions = res.data.COUNTRY//国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态 this.standStateOptions = res.data.WBZTCLASS // 文本状态
@@ -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-drawer__container { /deep/.el-select .el-input .el-select__caret {
font-size: 0;
}
/deep/.prc-content-border {
width: 600px;
}
/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) {