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:
yanyizhou
2021-09-16 18:45:38 +08:00
parent f84dc68a19 3b23756e69
commit 0db6df8b48
4 changed files with 442 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessFooter.vue
+40 -8
View File
@@ -1,6 +1,6 @@
<!-- ProcessFooter --> <!-- ProcessFooter -->
<template> <template>
<div class="process-footer" v-if="showSave || showSubmit"> <div class="process-footer" v-if="showSave || showSubmit || showSubmit2">
<div class="footer-line"></div> <div class="footer-line"></div>
<div class="btn-group-wrap"> <div class="btn-group-wrap">
<slot></slot> <slot></slot>
@@ -39,14 +39,32 @@
v-if="showOver" v-if="showOver"
>撤销申请</el-button> >撤销申请</el-button>
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
class="common-button-primary" class="common-button-primary"
icon="el-icon-s-promotion" icon="el-icon-s-promotion"
@click="handleTransfer" @click="handleTransfer"
:loading="transferLoading" :loading="transferLoading"
v-if="showTransfer" v-if="showTransfer"
>转办</el-button> >转办</el-button>
<el-button
type="primary"
size="small"
class="common-button-primary"
icon="el-icon-check"
@click="handleSubmit2"
:loading="submitLoading"
v-if="showSubmit2"
>通过</el-button>
<el-button
type="danger"
size="small"
class="common-button-danger"
icon="el-icon-close"
@click="handleOver2"
:loading="submitLoading"
v-if="showOver2"
>驳回</el-button>
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
@@ -129,6 +147,10 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
showOver2: {
type: Boolean,
default: false
},
// 是否显示保存按钮 // 是否显示保存按钮
showSave: { showSave: {
type: Boolean, type: Boolean,
@@ -149,6 +171,10 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
showSubmit2: {
type: Boolean,
default: false
},
showTransfer:{ showTransfer:{
type: Boolean, type: Boolean,
default: false default: false
@@ -237,9 +263,15 @@ export default {
handleOver() { handleOver() {
this.$emit('over') this.$emit('over')
}, },
handleOver2() {
this.$emit('over2')
},
handleSave() { handleSave() {
this.$emit('save') this.$emit('save')
}, },
handleSubmit2() {
this.$emit('submit2')
},
handleSubmit() { handleSubmit() {
this.$emit('submit') this.$emit('submit')
}, },
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+7 -5
View File
@@ -165,6 +165,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir" prop="technicalRequir"
width="150" width="150"
label="核心技术要求" label="核心技术要求"
@@ -178,6 +179,7 @@
<el-table-column <el-table-column
prop="changePoint" prop="changePoint"
width="150" width="150"
v-if="form.itemsNum1"
label="基于上一版本差异" label="基于上一版本差异"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -187,7 +189,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="sarType === 'FOREIGN'" v-if="sarType === 'FOREIGN' && form.itemsNum1"
prop="changePoint" prop="changePoint"
width="150" width="150"
label="相对于国行标差异点" label="相对于国行标差异点"
@@ -363,21 +365,21 @@
size="800px"> size="800px">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150"> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
<el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" > <el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求" placeholder="请输入核心技术要求"
maxlength="500" maxlength="500"
></el-input> ></el-input>
</el-formItem> </el-formItem>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND'"> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-input <el-input
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入国内标准的差异点" placeholder="请输入国内标准的差异点"
maxlength="500" maxlength="500"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-input <el-input
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入上一版本差异点" placeholder="请输入上一版本差异点"
@@ -636,7 +638,7 @@
num6++ num6++
} }
} }
if (this.form.itemsNum1) { if (!this.form.itemsNum1) {
if (num1 > 0) { if (num1 > 0) {
this.$message.warning('请输入核心技术要求') this.$message.warning('请输入核心技术要求')
return return
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+394 -385
View File
@@ -8,7 +8,7 @@
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>--> <!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>-->
</div> </div>
<div class="content" v-if="active === '1'"> <div class="content" v-if="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; overflow: auto;">
@@ -32,17 +32,17 @@
</el-form-item> </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
v-for="item in countryOptions" v-for="item in countryOptions"
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 label="标准类别" prop="standSort" class="add-form-item form-item-disabled"> <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled> <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
@@ -136,7 +136,7 @@
<el-input v-model="form.standSystem" disabled></el-input> <el-input v-model="form.standSystem" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.gxhbq" v-model="form.gxhbq"
placeholder="请输入标签" placeholder="请输入标签"
@@ -181,33 +181,33 @@
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-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="请选择实施日期(国际)"-->
<!-- 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="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="请选择新车型实施日期(国家)"-->
<!-- 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="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="请选择在产车实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">--> <!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -215,84 +215,84 @@
<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-row :gutter="24">
<el-col :span="12"> <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 style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')"> <div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
{{ form.xgdName }} {{ form.xgdName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</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 style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')"> <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
{{ form.fbgbjbdName }} {{ form.fbgbjbdName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</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="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')"> <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
{{ form.zbjbdName }} {{ form.zbjbdName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</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="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')"> <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.ssgName }} {{ form.ssgName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</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="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')"> <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.caName }} {{ form.caName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <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="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')"> <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
{{ form.kwjName }} {{ form.kwjName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<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">
<div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')"> <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
{{ form.jdwjName }} {{ form.jdwjName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</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="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')"> <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }} {{ form.bpgName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</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="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')"> <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }} {{ form.zqyjgName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ProcessTitle> <ProcessTitle>
<template slot="title">适用范围</template> <template slot="title">适用范围</template>
@@ -342,11 +342,11 @@
<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 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="请选择归口管理部门"> <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
<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>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled> <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
<el-option <el-option
@@ -466,36 +466,36 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled> <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</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="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')"> <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
{{ form.glwjName }} {{ form.glwjName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <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
v-model="form.bfbdtbzh" v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号" placeholder="请输入部分代替标准号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cbbh" v-model="form.cbbh"
placeholder="请输入采标编号" placeholder="请输入采标编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled"> <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.yybj" v-model="form.yybj"
@@ -508,38 +508,38 @@
</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 <!-- <el-form-item-->
prop="approvalOpinion" <!-- prop="approvalOpinion"-->
> <!-- >-->
<el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;"> <!-- <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<el-option label="驳回" value="1"></el-option> <!-- <el-option label="驳回" value="1"></el-option>-->
<el-option label="通过" value="0"></el-option> <!-- <el-option label="通过" value="0"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item <el-form-item
prop="commentText" prop="commentText"
> >
<el-input <el-input
type="textarea" type="textarea"
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="formTongGuo.commentText"> v-model="formTongGuo.commentText">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
</div> </div>
<div class="content" v-if="active === '2'"> <div class="content" v-if="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
@@ -588,84 +588,85 @@
</div> </div>
</div> </div>
<div class="content" v-if="active === '3'"> <div class="content" v-if="active === '3'">
<div class="flow-list"> <div class="flow-list">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
:data="detailData" :data="detailData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
row-key="id" row-key="id"
:no-data-text="listNoDataText" :no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="任务步骤" label="任务步骤"
align="center" align="center"
sortable="custom" sortable="custom"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="assignee" prop="assignee"
label="任务受理人" label="任务受理人"
align="center" align="center"
sortable="custom" sortable="custom"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
label="创建时间" label="创建时间"
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="endTime" prop="endTime"
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="comment" prop="comment"
label="审批意见" label="审批意见"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.commentText}}</span> <span>{{scope.row.commentText}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completeFlag" prop="completeFlag"
label="状态" label="状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span> <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<loading :loading="loading">流程列表加载中</loading> <loading :loading="loading">流程列表加载中</loading>
</div> </div>
</div> </div>
<!-- 提交--> <!-- 提交-->
<ProcessFooter <ProcessFooter
:show-save="false" :show-save="false"
show-submit show-over2
show-submit2
show-transfer show-transfer
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@transfer="handleTransfer" @transfer="handleTransfer"
@save="handleSave" @submit2="handle2"
@submit="handleSubmit" @over2="handle1"
> >
</ProcessFooter> </ProcessFooter>
@@ -691,36 +692,36 @@
name: "bzrkStep2", name: "bzrkStep2",
data () { data () {
return { return {
// 调整处理人抽屉状态 // 调整处理人抽屉状态
drawerModal: false, drawerModal: false,
drawerTitle: '', drawerTitle: '',
nodeList: [], nodeList: [],
selectPeople:'', selectPeople:'',
xgdFileId: '', xgdFileId: '',
fbgbjbdFileId: '', fbgbjbdFileId: '',
bpgFileId: '', bpgFileId: '',
ssgFileId: '', ssgFileId: '',
zqyjgFileId: '', zqyjgFileId: '',
jdwjFileId: '', jdwjFileId: '',
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: {
approvalOpinion: '', // 通过/驳回 approvalOpinion: '', // 通过/驳回
commentText: '', // 意见 commentText: '', // 意见
}, },
title: '', // 新增编辑抽屉标题 title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示 active: '1', // 默认显示
@@ -764,7 +765,7 @@
zqyjg: '', // 征求意见稿 zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件 jdwj: '', // 解读文件
zbjbd: '', // 增补件 zbjbd: '', // 增补件
bfbdtbzh: '', // 增补件 bfbdtbzh: '', // 增补件
kwj: '', // 勘误件 kwj: '', // 勘误件
caName: '', // 草案 caName: '', // 草案
fbgbjbdName: '', // 发布稿 fbgbjbdName: '', // 发布稿
@@ -835,7 +836,7 @@
standSystemOptions: [], // 标准体系 standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门 gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度 cbcdOptions: [], // 采标程度
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
@@ -863,11 +864,11 @@
ProcessTitle, ProcessTitle,
TreeSelect TreeSelect
}, },
computed: { computed: {
listNoDataText () { listNoDataText () {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
},
}, },
},
methods: { methods: {
checkedRole (data) { checkedRole (data) {
this.assigneeNewLoading = true this.assigneeNewLoading = true
@@ -889,43 +890,43 @@
} }
}) })
}, },
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(",","");
console.log(this.fbgbjbdFileId); console.log(this.fbgbjbdFileId);
} }
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){ }else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){ }else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
}else if(fileType === 'ssg'){ }else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
}else if(fileType === 'zqyjg'){ }else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
}else if(fileType === 'jdwj'){ }else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
}else if(fileType === 'kwj'){ }else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
}else if(fileType === 'glwj'){ }else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
}else if(fileType === 'ca'){ }else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
}else if(fileType === 'zbjbd'){ }else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
} }
}, },
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
@@ -967,18 +968,18 @@
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 : '',
shunxu: this.shunxu shunxu: this.shunxu
}, { }, {
loading: 'loading', loading: 'loading',
_this: this _this: this
}, res => { }, res => {
this.detailData = res this.detailData = res
}, e => {}) }, e => {})
}, },
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
@@ -986,20 +987,20 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.xgdFileId = processForm.xgd this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg this.bpgFileId = processForm.bpg
this.ssgFileId = processForm.ssg this.ssgFileId = processForm.ssg
this.zqyjgFileId = processForm.zqyjg this.zqyjgFileId = processForm.zqyjg
this.jdwjFileId = processForm.jdwj this.jdwjFileId = processForm.jdwj
this.kwjFileId = processForm.kwj this.kwjFileId = processForm.kwj
this.glwjFileId = processForm.glwj this.glwjFileId = processForm.glwj
this.caFileId = processForm.ca this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
console.log(processForm); console.log(processForm);
console.log("processForm"); console.log("processForm");
} }
}).catch(e => { }).catch(e => {
@@ -1019,9 +1020,9 @@
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
this.form['id'] = item.id this.form['id'] = item.id
@@ -1049,42 +1050,50 @@
this.drawerTitle = '转办处理人' this.drawerTitle = '转办处理人'
}, },
handleSave() {}, handleSave() {},
handle1(){
this.formTongGuo.approvalOpinion = 1
this.handleSubmit()
},
handle2(){
this.formTongGuo.approvalOpinion = 0
this.handleSubmit()
},
handleSubmit() { handleSubmit() {
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(",");
} else { } else {
this.form.country = val this.form.country = val
}
} else if (val === '') {
this.form.country = []
} }
} else if (val === '') { this.$refs['formTongGuo'].validate((valid) => {
this.form.country = []
}
this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.form.commentText = this.formTongGuo.commentText this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.approvalOpinion = this.formTongGuo.approvalOpinion
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 => {
console.log(res); console.log(res);
if (res.success) { if (res.success) {
if(this.formTongGuo.approvalOpinion === '1'){ if(this.formTongGuo.approvalOpinion === '1'){
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{
this.processCreateStand(json) this.processCreateStand(json)
} }
} }
}) })
}}) }})
}, },
@@ -1116,11 +1125,11 @@
}, },
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 // 文本状态
@@ -1136,7 +1145,7 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.key++ this.key++
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+1 -1
View File
@@ -67,7 +67,7 @@
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')" @click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞 size="mini">导出征求意见稿
</el-button> </el-button>
</div> </div>
<el-table <el-table