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:
zhaokaiyao@91isoft.com
2021-09-15 17:59:34 +08:00
parent 20e25c7e05 195628f861
commit 50d7bc4a61
34 changed files with 4248 additions and 4039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+8 -3
View File
@@ -597,23 +597,28 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dutyEngineer" prop="dutyEngineer"
label="责任工程师"> label="责任工程师"
width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="comparedWithPrevious" prop="comparedWithPrevious"
label="基于上一版本差异" label="基于上一版本差异"
width="150"> width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
label="符合性状态"> label="符合性状态"
width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-'}} {{scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="complianceState" prop="complianceState"
label="合规性分析"> label="合规性分析"
width="100">
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right"> <el-table-column label="操作" align="center" width="50" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+4
View File
@@ -161,12 +161,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="technicalRequir" prop="technicalRequir"
width="150" width="150"
label="核心技术要求" label="核心技术要求"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'INLAND'" v-if="sarType === 'INLAND'"
prop="changePoint" prop="changePoint"
width="150" width="150"
@@ -174,6 +176,7 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'FOREIGN'" v-if="sarType === 'FOREIGN'"
prop="changePoint" prop="changePoint"
width="150" width="150"
@@ -191,6 +194,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="150" width="150"
label="合规性分析" label="合规性分析"
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+8 -4
View File
@@ -171,7 +171,7 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="el-input"> <div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求"> <input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求" maxlength="500">
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -182,7 +182,7 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="el-input"> <div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异"> <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -194,7 +194,7 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="el-input"> <div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" > <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -214,7 +214,7 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="el-input"> <div class="el-input">
<input class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析"> <input class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -359,18 +359,21 @@
<el-input <el-input
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求" placeholder="请输入核心技术要求"
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'">
<el-input <el-input
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入国内标准的差异点" placeholder="请输入国内标准的差异点"
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'">
<el-input <el-input
v-model="plForm.changePoint" v-model="plForm.changePoint"
placeholder="请输入上一版本差异点" placeholder="请输入上一版本差异点"
maxlength="500"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" > <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
@@ -385,6 +388,7 @@
<el-input <el-input
v-model="plForm.complianceState" v-model="plForm.complianceState"
placeholder="请输入合规性分析" placeholder="请输入合规性分析"
maxlength="500"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" > <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+4
View File
@@ -160,12 +160,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="technicalRequir" prop="technicalRequir"
width="150" width="150"
label="核心技术要求" label="核心技术要求"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'INLAND'" v-if="sarType === 'INLAND'"
prop="changePoint" prop="changePoint"
width="150" width="150"
@@ -173,6 +175,7 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'FOREIGN'" v-if="sarType === 'FOREIGN'"
prop="changePoint" prop="changePoint"
width="150" width="150"
@@ -190,6 +193,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="150" width="150"
label="合规性分析" label="合规性分析"
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+4
View File
@@ -160,12 +160,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="technicalRequir" prop="technicalRequir"
width="150" width="150"
label="核心技术要求" label="核心技术要求"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'INLAND'" v-if="sarType === 'INLAND'"
prop="changePoint" prop="changePoint"
width="150" width="150"
@@ -173,6 +175,7 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'FOREIGN'" v-if="sarType === 'FOREIGN'"
prop="changePoint" prop="changePoint"
width="150" width="150"
@@ -190,6 +193,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="150" width="150"
label="合规性分析" label="合规性分析"
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+4
View File
@@ -161,12 +161,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="technicalRequir" prop="technicalRequir"
width="150" width="150"
label="核心技术要求" label="核心技术要求"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'INLAND'" v-if="sarType === 'INLAND'"
prop="changePoint" prop="changePoint"
width="150" width="150"
@@ -174,6 +176,7 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarType === 'FOREIGN'" v-if="sarType === 'FOREIGN'"
prop="changePoint" prop="changePoint"
width="150" width="150"
@@ -191,6 +194,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="150" width="150"
label="合规性分析" label="合规性分析"
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+164 -164
View File
@@ -299,6 +299,66 @@
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.ssgName"
clearable
></el-input>
<div v-if="form.ssgName">
<!-- {{ form.ssgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
</el-form-item>
<el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.caName"
clearable
></el-input>
<div v-if="form.caName">
<!-- {{ form.caName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -329,66 +389,6 @@
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.bpgName"
clearable
></el-input>
<div v-if="form.bpgName">
<!-- {{ form.bpgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.ssgName"
clearable
></el-input>
<div v-if="form.ssgName">
<!-- {{ form.ssgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
</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="kwj" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
@@ -421,96 +421,96 @@
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
style="display: none;" style="display: none;"
v-model="form.zqyjgName" v-model="form.jdwjName"
clearable clearable
></el-input> ></el-input>
<div v-if="form.zqyjgName"> <div v-if="form.jdwjName">
<!-- {{ form.zqyjgName }}--> <!-- {{ form.jdwjName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('zqyjg')"> @click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i> <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件 查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('zqyjg')"> @click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i> <i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
style="display: none;" style="display: none;"
v-model="form.caName" v-model="form.bpgName"
clearable clearable
></el-input> ></el-input>
<div v-if="form.caName"> <div v-if="form.bpgName">
<!-- {{ form.caName }}--> <!-- {{ form.bpgName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('ca')"> @click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i> <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件 查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('ca')"> @click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i> <i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
style="display: none;" style="display: none;"
v-model="form.jdwjName" v-model="form.zqyjgName"
clearable clearable
></el-input> ></el-input>
<div v-if="form.jdwjName"> <div v-if="form.zqyjgName">
<!-- {{ form.jdwjName }}--> <!-- {{ form.zqyjgName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('jdwj')"> @click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i> <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件 查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('jdwj')"> @click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i> <i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -788,6 +788,20 @@
@click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'" @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</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-input
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('cbbh'),config.attrName = '采标编号'"
>{{'手动查找'}}</el-button>
</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
v-model="form.yybj" v-model="form.yybj"
@@ -802,20 +816,6 @@
@click="selectLaws('yybj'),config.attrName = '引用标准'" @click="selectLaws('yybj'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</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-input
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('cbbh'),config.attrName = '采标编号'"
>{{'手动查找'}}</el-button>
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="form.byybj"--> <!-- v-model="form.byybj"-->
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+30 -54
View File
@@ -241,17 +241,17 @@
- - - -
</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="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')"> <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.bpgName }} {{ form.ssgName }}
</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 label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')"> <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.ssgName }} {{ form.caName }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -267,22 +267,6 @@
- - - -
</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">
<div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<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')">
{{ form.caName }}
</div>
<div v-else>
- -
</div>
</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 }}
@@ -291,6 +275,22 @@
- - - -
</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">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<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')">
{{ form.zqyjgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -469,14 +469,6 @@
<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="xglc" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.xglc"
placeholder="请输入相关流程"
clearable
></el-input>
</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 }}
@@ -495,6 +487,14 @@
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-input
disabled
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</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
@@ -503,30 +503,6 @@
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-input
disabled
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.byybj"
placeholder="请输入被引用标准"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.chjl"
placeholder="请输入参会记录"
clearable
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+30 -30
View File
@@ -234,17 +234,17 @@
- - - -
</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="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')"> <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.bpgName }} {{ form.ssgName }}
</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 label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')"> <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.ssgName }} {{ form.caName }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -260,22 +260,6 @@
- - - -
</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">
<div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<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')">
{{ form.caName }}
</div>
<div v-else>
- -
</div>
</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 }}
@@ -284,6 +268,22 @@
- - - -
</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">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<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')">
{{ form.zqyjgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -488,14 +488,6 @@
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-input
disabled
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
</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
@@ -504,6 +496,14 @@
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-input
disabled
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- disabled--> <!-- disabled-->
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+98 -99
View File
@@ -292,34 +292,6 @@
</el-button> </el-button>
</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-input
disabled
style="display: none;"
v-model="form.bpgName"
clearable
></el-input>
<div v-if="form.bpgName">
{{ form.bpgName }}
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('bpg')">
重新上传
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('bpg')">
点击上传
</el-button>
</div>
</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">
<el-input <el-input
disabled disabled
@@ -348,6 +320,34 @@
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.caName"
clearable
></el-input>
<div v-if="form.caName">
{{ form.caName }}
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ca')">
重新上传
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ca')">
点击上传
</el-button>
</div>
</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">
@@ -378,6 +378,62 @@
</el-button> </el-button>
</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-input
disabled
style="display: none;"
v-model="form.jdwjName"
clearable
></el-input>
<div v-if="form.jdwjName">
{{ form.jdwjName }}
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('jdwj')">
重新上传
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('jdwj')">
点击上传
</el-button>
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.bpgName"
clearable
></el-input>
<div v-if="form.bpgName">
{{ form.bpgName }}
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('bpg')">
重新上传
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('bpg')">
点击上传
</el-button>
</div>
</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">
<el-input <el-input
disabled disabled
@@ -406,62 +462,6 @@
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.caName"
clearable
></el-input>
<div v-if="form.caName">
{{ form.caName }}
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ca')">
重新上传
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ca')">
点击上传
</el-button>
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.jdwjName"
clearable
></el-input>
<div v-if="form.jdwjName">
{{ form.jdwjName }}
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('jdwj')">
重新上传
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('jdwj')">
点击上传
</el-button>
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -722,21 +722,6 @@
@click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'" @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-input
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('yybj'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button>
</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
v-model="form.cbbh" v-model="form.cbbh"
@@ -751,6 +736,20 @@
@click="selectLaws('cbbh'),config.attrName = '采标编号'" @click="selectLaws('cbbh'),config.attrName = '采标编号'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-input
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('yybj'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button>
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="form.byybj"--> <!-- v-model="form.byybj"-->
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+40 -30
View File
@@ -228,17 +228,17 @@
- - - -
</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="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')"> <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.bpgName }} {{ form.ssgName }}
</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 label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')"> <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.ssgName }} {{ form.caName }}
</div> </div>
<div v-else> <div v-else>
- - - -
@@ -254,22 +254,6 @@
- - - -
</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">
<div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<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')">
{{ form.caName }}
</div>
<div v-else>
- -
</div>
</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 }}
@@ -278,6 +262,22 @@
- - - -
</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">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<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')">
{{ form.zqyjgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -485,6 +485,22 @@
</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-input
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</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
@@ -493,14 +509,8 @@
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-input
disabled
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- disabled--> <!-- disabled-->
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+9 -28
View File
@@ -24,12 +24,10 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择征求意见" class="add-form-item form-item-disabled"> <el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button> <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
</div> </div>
</el-form-item>
<el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -37,14 +35,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.endTime" v-model="form.endTime"
@@ -52,12 +42,10 @@
placeholder="请选择结束日期"> placeholder="请选择结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="选择标准附件" class="add-form-item form-item-disabled"> <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button> <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
</div> </div>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.fjListId" v-model="form.fjListId"
style="display: none;" style="display: none;"
@@ -519,15 +507,6 @@ export default {
this.total = res.data.count this.total = res.data.count
this.spinShow = false this.spinShow = false
}) })
// var form = this.standCommonlySearch
// this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
// _this: this
// }, res => {
// this.standInfoList = res.data.records
// this.total = res.data.total
// this.spinShow = false
// }, e => {
// })
}, },
pageChange(page) { pageChange(page) {
this.standCommonlySearch.page = page this.standCommonlySearch.page = page
@@ -561,11 +540,10 @@ export default {
bringData.push(deposit.get(this.selectedList[i])); bringData.push(deposit.get(this.selectedList[i]));
} }
if (bringData[0].standYear) { if (bringData[0].standYear) {
this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName
} else { } else {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
} }
this.form.cname = bringData[0].standName;
this.listModel = false; this.listModel = false;
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行带入");
@@ -680,6 +658,9 @@ export default {
} }
} }
.el-input__icon {
width: 15px;
}
position: relative; position: relative;
height: 100%; height: 100%;
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+124 -122
View File
@@ -12,11 +12,11 @@
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; overflow: auto;">
<el-form <el-form
ref="bzzqyjForm" ref="bzzqyjForm"
:model="form" :model="form"
:rules="formRules" :rules="formRules"
class="label-input-form" class="label-input-form"
label-width="210px" label-width="210px"
> >
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
@@ -24,46 +24,36 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择征求意见" class="add-form-item form-item-disabled"> <el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button> <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
</div> </div>
</el-form-item>
<el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> />
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.endTime" v-model="form.endTime"
type="date" type="date"
placeholder="请选择结束日期"> placeholder="请选择结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="选择标准附件" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
</div>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled"> <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
</div>
<el-input <el-input
v-model="form.fjListId" v-model="form.fjListId"
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -75,11 +65,11 @@
<el-collapse-item title="意见填写"> <el-collapse-item title="意见填写">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -169,12 +159,12 @@
</div> </div>
</div> </div>
<ProcessFooter <ProcessFooter
show-save show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave" @save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<el-drawer <el-drawer
@@ -195,7 +185,8 @@
</el-formItem> </el-formItem>
<el-formItem label="标准类别" prop="standSort" class="search-item"> <el-formItem label="标准类别" prop="standSort" class="search-item">
<el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable> <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
<el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }} <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
{{ opt.label }}
</el-option> </el-option>
</el-select> </el-select>
</el-formItem> </el-formItem>
@@ -207,15 +198,17 @@
</el-formItem> </el-formItem>
<el-formItem class="search-item btn-box"> <el-formItem class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
@click="sarStandCompareHisInfo">查询</el-button> @click="sarStandCompareHisInfo">查询
</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
size="mini" size="mini"
@click="clearSearchStand">清空</el-button> @click="clearSearchStand">清空
</el-button>
</el-formItem> </el-formItem>
</el-form> </el-form>
</div> </div>
@@ -235,8 +228,12 @@
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="标准号" align="center"> <el-table-column label="标准号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div> <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">
<div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div> {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</div>
<div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="cname" label="标准名称" align="center"> <el-table-column prop="cname" label="标准名称" align="center">
@@ -257,37 +254,37 @@
</div> </div>
</el-drawer> </el-drawer>
<Role-tree <Role-tree
is-title="选择责任部门对接人" is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag2" :is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" :nodeList="nodeList2"
></Role-tree> ></Role-tree>
<Role-tree <Role-tree
check-box check-box
:is-title="drawerTitle" :is-title="drawerTitle"
:is-visible.sync="modalshowflag" :is-visible.sync="modalshowflag"
@checkedRole="checkedRole" @checkedRole="checkedRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<el-drawer <el-drawer
title="选择附件" title="选择附件"
:visible.sync="fzlistModel" :visible.sync="fzlistModel"
size="900px" size="900px"
custom-class="demo-drawer" custom-class="demo-drawer"
> >
<div class="standardForComments"> <div class="standardForComments">
<div class="content" style="height: calc(100% - 57px);"> <div class="content" style="height: calc(100% - 57px);">
<div class="table-wrap"> <div class="table-wrap">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;"> <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
<el-table <el-table
ref="selection" ref="selection"
:data="fjList" :data="fjList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;" style="width: 100%;padding:0 0 20px 0;"
height="100%" height="100%"
border border
@selection-change="handleSelection2" @selection-change="handleSelection2"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="附件名" align="center" prop="fileOldName"></el-table-column> <el-table-column label="附件名" align="center" prop="fileOldName"></el-table-column>
</el-table> </el-table>
@@ -309,7 +306,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { saveTaskFirst } from 'api/process' import {saveTaskFirst} from 'api/process'
export default { export default {
name: "bzzqyjStep1", name: "bzzqyjStep1",
@@ -339,16 +336,13 @@ export default {
}, },
formRules: { formRules: {
cid: [ cid: [
{ required: true, message: '请输入标准编号', trigger: 'change' }, {required: true, message: '请输入标准编号', trigger: 'change'},
], ],
endTime: [ endTime: [
{ required: true, message: '请输入标准结束日期', trigger: 'change' }, {required: true, message: '请输入标准结束日期', trigger: 'change'},
],
cname: [
{ required: true, message: '请输入标准名称', trigger: 'change' },
], ],
fjListId: [ fjListId: [
{ required: true, message: '请选择附件', trigger: 'change' }, {required: true, message: '请选择附件', trigger: 'change'},
] ]
}, },
// 标准征求意见数据可库 // 标准征求意见数据可库
@@ -380,16 +374,16 @@ export default {
}, },
roleFormRules: { roleFormRules: {
dockUserList: [ dockUserList: [
{ required: true, message: '请选择责任部门对接人', trigger: 'change' }, {required: true, message: '请选择责任部门对接人', trigger: 'change'},
], ],
ministerUser: [ ministerUser: [
{ required: true, message: '请选择标准法规部部长', trigger: 'change' }, {required: true, message: '请选择标准法规部部长', trigger: 'change'},
], ],
directorUser: [ directorUser: [
{ required: true, message: '请选择技术管理中心主任', trigger: 'change' }, {required: true, message: '请选择技术管理中心主任', trigger: 'change'},
], ],
presidentUser: [ presidentUser: [
{ required: true, message: '请选择工程研究院院长', trigger: 'change' }, {required: true, message: '请选择工程研究院院长', trigger: 'change'},
] ]
}, },
nodeList: [], nodeList: [],
@@ -406,7 +400,7 @@ export default {
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
}, },
mounted () { mounted() {
this.sarStandCompareHis() this.sarStandCompareHis()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
@@ -420,7 +414,7 @@ export default {
} }
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -430,7 +424,7 @@ export default {
} }
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
}, },
addfjList () { addfjList() {
this.$http.get('lawss/sarStandFile/queryFileInfo', { this.$http.get('lawss/sarStandFile/queryFileInfo', {
standId: this.form.standId standId: this.form.standId
}, {}, res => { }, {}, res => {
@@ -438,18 +432,18 @@ export default {
}) })
this.fzlistModel = true this.fzlistModel = true
}, },
handleSelection2 (data) { handleSelection2(data) {
if(data.length > 5) { if (data.length > 5) {
this.$message.warning('最多选择5条附件') this.$message.warning('最多选择5条附件')
} else { } else {
this.addFjList = data this.addFjList = data
} }
}, },
closeDrawer2 () { closeDrawer2() {
this.fzlistModel = false this.fzlistModel = false
this.addFjList = [] this.addFjList = []
}, },
enterDrawer2 () { enterDrawer2() {
this.fzlistModel = false this.fzlistModel = false
this.form.fjList = this.addFjList this.form.fjList = this.addFjList
let idList = [] let idList = []
@@ -462,7 +456,7 @@ export default {
this.form.fjListId = idList.join(',') this.form.fjListId = idList.join(',')
}, },
// 点击查看 // 点击查看
handlePreview (item) { handlePreview(item) {
let pageType let pageType
if (item.standType === 'FOREIGN') { if (item.standType === 'FOREIGN') {
pageType = 'FOREIGN_STAND' pageType = 'FOREIGN_STAND'
@@ -485,7 +479,7 @@ export default {
/** 标准征求意见库方法* /** 标准征求意见库方法*
* **********************************************/ * **********************************************/
// 清空 // 清空
clearSearchStand () { clearSearchStand() {
this.standCommonlySearch.page = 1 this.standCommonlySearch.page = 1
this.standCommonlySearch.standSort = '' this.standCommonlySearch.standSort = ''
this.standCommonlySearch.standNumber = '' this.standCommonlySearch.standNumber = ''
@@ -498,32 +492,23 @@ export default {
this.sarStandCompareHis() this.sarStandCompareHis()
}, },
// 查询表格 // 查询表格
sarStandCompareHis () { sarStandCompareHis() {
this.spinShow = true this.spinShow = true
var formData = this.standCommonlySearch var formData = this.standCommonlySearch
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this _this: this
}, res => { }, res => {
this.standInfoList = res.data.list this.standInfoList = res.data.list
this.total = res.data.count this.total = res.data.count
this.spinShow = false this.spinShow = false
}) })
// var form = this.standCommonlySearch
// this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
// _this: this
// }, res => {
// this.standInfoList = res.data.records
// this.total = res.data.total
// this.spinShow = false
// }, e => {
// })
}, },
pageChange (page) { pageChange(page) {
this.standCommonlySearch.page = page this.standCommonlySearch.page = page
this.sarStandCompareHis() this.sarStandCompareHis()
}, },
// 分页每页显示数改变后方法 // 分页每页显示数改变后方法
pageSizeChange (pageSize) { pageSizeChange(pageSize) {
this.$store.getters.userInfo.configContent = pageSize this.$store.getters.userInfo.configContent = pageSize
this.standCommonlySearch.size = pageSize this.standCommonlySearch.size = pageSize
this.sarStandCompareHis() this.sarStandCompareHis()
@@ -550,13 +535,12 @@ export default {
bringData.push(deposit.get(this.selectedList[i])); bringData.push(deposit.get(this.selectedList[i]));
} }
if (bringData[0].standYear) { if (bringData[0].standYear) {
this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName
} else { } else {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
} }
this.form.standType = bringData[0].standType this.form.standType = bringData[0].standType
this.form.standId = bringData[0].id this.form.standId = bringData[0].id
this.form.cname = bringData[0].standName;
this.listModel = false; this.listModel = false;
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行带入");
@@ -566,10 +550,10 @@ export default {
}, },
/*** **********************************************/ /*** **********************************************/
/** 流程节点负责人的选择 *****************************/ /** 流程节点负责人的选择 *****************************/
checkedRole2 (data) { checkedRole2(data) {
var idList = '' var idList = ''
var nameList = '' var nameList = ''
data.forEach( item => { data.forEach(item => {
if (nameList.length > 0) { if (nameList.length > 0) {
nameList += ',' nameList += ','
idList += ',' idList += ','
@@ -580,7 +564,7 @@ export default {
this.roleForm.dockUserList = idList this.roleForm.dockUserList = idList
this.roleForm.dockUserListName = nameList this.roleForm.dockUserListName = nameList
}, },
checkedRole (data) { checkedRole(data) {
if (this.type === 'ministerUser') { if (this.type === 'ministerUser') {
this.roleForm.ministerUser = data[0].id this.roleForm.ministerUser = data[0].id
this.roleForm.ministerUserName = data[0].name this.roleForm.ministerUserName = data[0].name
@@ -592,14 +576,14 @@ export default {
this.roleForm.presidentUserName = data[0].name this.roleForm.presidentUserName = data[0].name
} }
}, },
choiceZRRS () { choiceZRRS() {
this.nodeList2 = [] this.nodeList2 = []
if ( this.roleForm.dockUserList.length > 0) { if (this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',') this.nodeList2 = this.roleForm.dockUserList.split(',')
} }
this.modalshowflag2 = true this.modalshowflag2 = true
}, },
choiceZRR (type, title, id) { choiceZRR(type, title, id) {
this.nodeList = [] this.nodeList = []
this.nodeList.push(id) this.nodeList.push(id)
this.type = type this.type = type
@@ -678,20 +662,27 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
.bzzqyjStep1 { .bzzqyjStep1 {
.myForm { .myForm {
/deep/.el-form-item__content { /deep/ .el-form-item__content {
line-height: 10px; line-height: 10px;
} }
} }
/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;
} }
} }
.el-input__icon {
width: 15px;
}
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -699,6 +690,7 @@ export default {
position: absolute; position: absolute;
top: 0; top: 0;
right: 10px; right: 10px;
.headerTabsItem { .headerTabsItem {
border: 1px solid #c1c1c1; border: 1px solid #c1c1c1;
padding: 0 5px; padding: 0 5px;
@@ -706,12 +698,14 @@ export default {
line-height: 30px; line-height: 30px;
cursor: pointer; cursor: pointer;
} }
.active { .active {
border: 1px solid #E6A23C; border: 1px solid #E6A23C;
color: #fff; color: #fff;
background: #E6A23C; background: #E6A23C;
} }
} }
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -719,34 +713,42 @@ export default {
height: calc(~'100% - 107px'); height: calc(~'100% - 107px');
overflow: auto; overflow: auto;
} }
.standardForComments { .standardForComments {
height: 100%; height: 100%;
background: #fff; background: #fff;
.el-divider--horizontal { .el-divider--horizontal {
display: block; display: block;
height: 1px; height: 1px;
width: 100%; width: 100%;
margin: 0; margin: 0;
} }
flex-direction: column; flex-direction: column;
.action-bar { .action-bar {
margin-bottom: 5px; margin-bottom: 5px;
padding: 0; padding: 0;
} }
.content { .content {
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.table-wrap { .table-wrap {
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
} }
& > .pagination { & > .pagination {
position: static; position: static;
/deep/.pagination-slot {
/deep/ .pagination-slot {
padding: 0; padding: 0;
} }
} }
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+2 -10
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,7 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled"> <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+497 -486
View File
@@ -1,498 +1,509 @@
<template> <template>
<div class="bzdyStep3"> <div class="bzdyStep3">
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">填写征求意见</template> <template slot="proNode">填写征求意见</template>
</ProcessHeader> </ProcessHeader>
<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 === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input
v-model="form.fjListId"
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<ProcessTitle>
<template slot="title">征求意见列表</template>
</ProcessTitle>
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="addModal"
size="mini">新增</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="addDelete"
size="mini">删除</el-button>
</div>
<el-table
ref="multipleTable"
:data="data"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
label="序号"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="chapterNumber"
label="章条编号"
width="170px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber"></el-input>
</template>
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称"
width="170px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template>
</el-table-column>
<el-table-column
prop="commentText"
align="center"
label="修改意见内容（包括理由或依据）">
<el-table-column
prop="name"
align="center"
label="修改前">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
</template>
</el-table-column>
<el-table-column
prop="name"
align="center"
label="修改后">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
</template>
</el-table-column>
<el-table-column
prop="name"
align="center"
label="修改理由">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
</template>
</el-table-column>
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
</div> </div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input
v-model="form.fjListId"
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<ProcessTitle>
<template slot="title">征求意见列表</template>
</ProcessTitle>
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="addModal"
size="mini">新增
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="addDelete"
size="mini">删除
</el-button>
</div>
<el-table
ref="multipleTable"
:data="data"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
label="序号"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="chapterNumber"
label="章条编号"
width="170px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber"></el-input>
</template>
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称"
width="170px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template>
</el-table-column>
<el-table-column
prop="commentText"
align="center"
label="修改意见内容（包括理由或依据）">
<el-table-column
prop="name"
align="center"
label="修改前">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
</template>
</el-table-column>
<el-table-column
prop="name"
align="center"
label="修改后">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
</template>
</el-table-column>
<el-table-column
prop="name"
align="center"
label="修改理由">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
</template>
</el-table-column>
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
</div>
</template> </template>
<script> <script>
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process' import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from 'api/process'
export default { export default {
name: "bzzqyjStep3", name: "bzzqyjStep3",
data() { data() {
return { return {
histortData: [], histortData: [],
idList: [], idList: [],
data: [], data: [],
commentText: '', commentText: '',
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
roleRow: {}, roleRow: {},
nodeList: [], nodeList: [],
type: '', type: '',
defaultProps: { defaultProps: {
children: 'children', children: 'children',
label: 'name' label: 'name'
}, },
treeData: [], // 人员数据 treeData: [], // 人员数据
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题 drawerTitle: '', //drawer标题
textarea: '', // 意见 textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示 active: '1', // 默认显示
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
cid: '', // 编号 cid: '', // 编号
endTime: '', // 结束日期 endTime: '', // 结束日期
cname: '', // 名称 cname: '', // 名称
fjList: [], fjList: [],
fjListId: '', fjListId: '',
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' }, {required: true, message: '请选择责任人', trigger: 'change'},
] ]
}, },
json: {} json: {}
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
updataFj (item) {
let id
let type = item.fileName.split('.')
if (type[1] === 'pdf') {
id = item.attId
} else {
id = item.oriAttId
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
handleSelectionChange (val) {
this.idList = []
val.forEach( item => {
this.idList.push(item.id)
})
},
addDelete () {
if (this.idList.length > 0) {
this.$confirm('删除选中数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
for (let a = 0; a < this.data.length; a++) {
this.idList.forEach(item => {
if (this.data[a].id === item) {
this.data.splice(a, 1)
}
})
}
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
} else {
this.$message.warning('请选择要删除的数据')
}
},
addModal () {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
var json = {
chapterNumber: '',
chapterName: '',
commentText: '',
oldText: '',
newText: '',
reason: '',
id: id,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId,
department: this.$store.getters.userInfo.orgName
}
this.data.push(json)
},
handleTabs(name) {
this.active = name
},
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
let json = this.form
json.data = this.data
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见')
} else {
var a = 0
var b = 0
// var c = 0
for (let s1 = 0; s1 < this.data.length; s1++) {
if (!this.data[s1].chapterNumber) {
a++
}
if (!this.data[s1].chapterName) {
b++
}
// if (!this.data[s1].commentText) {
// c++
// }
}
if (a > 0) {
this.$message.warning('请输入章节编号')
} else if (b > 0) {
this.$message.warning('请输入章节名称')
}
// else if (c > 0) {
// this.$message.warning('请输入意见内容')
// }
else {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.info = this.data
json.department = this.$store.getters.userInfo.orgName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.json = data
this.data = data.info || data.data || data.form.data|| []
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
}
} }
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
updataFj(item) {
let id
let type = item.fileName.split('.')
if (type[1] === 'pdf') {
id = item.attId
} else {
id = item.oriAttId
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {
})
},
handleSelectionChange(val) {
this.idList = []
val.forEach(item => {
this.idList.push(item.id)
})
},
addDelete() {
if (this.idList.length > 0) {
this.$confirm('删除选中数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
for (let a = 0; a < this.data.length; a++) {
this.idList.forEach(item => {
if (this.data[a].id === item) {
this.data.splice(a, 1)
}
})
}
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
} else {
this.$message.warning('请选择要删除的数据')
}
},
addModal() {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
var json = {
chapterNumber: '',
chapterName: '',
commentText: '',
oldText: '',
newText: '',
reason: '',
id: id,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId,
department: this.$store.getters.userInfo.orgName
}
this.data.push(json)
},
handleTabs(name) {
this.active = name
},
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
let json = this.form
json.data = this.data
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见')
} else {
var a = 0
var b = 0
// var c = 0
for (let s1 = 0; s1 < this.data.length; s1++) {
if (!this.data[s1].chapterNumber) {
a++
}
if (!this.data[s1].chapterName) {
b++
}
// if (!this.data[s1].commentText) {
// c++
// }
}
if (a > 0) {
this.$message.warning('请输入章节编号')
} else if (b > 0) {
this.$message.warning('请输入章节名称')
}
// else if (c > 0) {
// this.$message.warning('请输入意见内容')
// }
else {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.info = this.data
json.form = this.form
json.department = this.$store.getters.userInfo.orgName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.json = data
this.data = data.info || data.data || data.form.data || []
}).catch(e => {
})
})
},
},
mounted() {
this.getHistoryData()
this.getData()
}
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep3 {
/deep/.el-drawer__container { .bzdyStep3 {
.prc-content-border { /deep/ .el-drawer__container {
border: none; .prc-content-border {
padding: 0 20px 0; border: none;
} padding: 0 20px 0;
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
} }
}
.fileClass {
cursor: pointer;
}
.fileClass:hover {
color: #0c91e5;
}
.el-input__icon {
width: 15px;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
}
</style> </style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+396 -390
View File
@@ -1,402 +1,408 @@
<template> <template>
<div class="bzdyStep4"> <div class="bzdyStep4">
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">对接人批准</template> <template slot="proNode">对接人批准</template>
</ProcessHeader> </ProcessHeader>
<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 === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input
v-model="form.fjListId"
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<ProcessTitle>
<template slot="title">征求意见列表</template>
</ProcessTitle>
<el-table
ref="multipleTable"
:data="data"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="index"
label="序号"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="chapterNumber"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称">
</el-table-column>
<el-table-column
align="center"
prop="commentText"
label="修改意见内容（包括理由或依据）">
<el-table-column
prop="oldText"
align="center"
label="修改前">
</el-table-column>
<el-table-column
prop="newText"
align="center"
label="修改后">
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="修改理由">
</el-table-column>
</el-table-column>
<el-table-column
prop="department"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
label="提出人">
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
approval
submitBTNText="同意"
>
</ProcessFooter>
</div> </div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input
v-model="form.fjListId"
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<ProcessTitle>
<template slot="title">征求意见列表</template>
</ProcessTitle>
<el-table
ref="multipleTable"
:data="data"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="index"
label="序号"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="chapterNumber"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称">
</el-table-column>
<el-table-column
align="center"
prop="commentText"
label="修改意见内容（包括理由或依据）">
<el-table-column
prop="oldText"
align="center"
label="修改前">
</el-table-column>
<el-table-column
prop="newText"
align="center"
label="修改后">
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="修改理由">
</el-table-column>
</el-table-column>
<el-table-column
prop="department"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
label="提出人">
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
approval
submitBTNText="同意"
>
</ProcessFooter>
</div>
</template> </template>
<script> <script>
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail, processCreateStand} from 'api/process'
export default { export default {
name: "bzzqyjStep4", name: "bzzqyjStep4",
data() { data() {
return { return {
histortData: [], histortData: [],
data: [], data: [],
commentText: '', commentText: '',
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
roleRow: {}, roleRow: {},
nodeList: [], nodeList: [],
type: '', type: '',
defaultProps: { defaultProps: {
children: 'children', children: 'children',
label: 'name' label: 'name'
}, },
treeData: [], // 人员数据 treeData: [], // 人员数据
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题 drawerTitle: '', //drawer标题
textarea: '', // 意见 textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示 active: '1', // 默认显示
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
cid: '', // 编号 cid: '', // 编号
endTime: '', // 结束日期 endTime: '', // 结束日期
cname: '', // 名称 cname: '', // 名称
fjList: [], fjList: [],
fjListId: '', fjListId: '',
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' }, {required: true, message: '请选择责任人', trigger: 'change'},
] ]
}, },
json: {} json: {}
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
updataFj (item) {
let id
let type = item.fileName.split('.')
if (type[1] === 'pdf') {
id = item.attId
} else {
id = item.oriAttId
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo () {
if (this.commentText) {
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.json = data
this.data = data.info || data.data
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
}
} }
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
updataFj(item) {
let id
let type = item.fileName.split('.')
if (type[1] === 'pdf') {
id = item.attId
} else {
id = item.oriAttId
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {
})
},
handleTabs(name) {
this.active = name
},
handleSave() {
},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo() {
if (this.commentText) {
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.json = data
this.data = data.info || data.data
}).catch(e => {
})
})
},
},
mounted() {
this.getHistoryData()
this.getData()
}
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep4 {
/deep/.el-drawer__container { .bzdyStep4 {
.prc-content-border { /deep/ .el-drawer__container {
border: none; .prc-content-border {
padding: 0 20px 0; border: none;
} padding: 0 20px 0;
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
} }
}
.fileClass {
cursor: pointer;
}
.fileClass:hover {
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
}
</style> </style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+10 -16
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -50,11 +42,13 @@
</el-form-item> </el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled"> <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.fjListId" v-model="form.fjListId"
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -248,7 +242,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process"; import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from "api/process";
export default { export default {
name: "bzzqyjStep5", name: "bzzqyjStep5",
@@ -284,7 +278,7 @@ export default {
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: "请选择责任人", trigger: "change" } {required: true, message: "请选择责任人", trigger: "change"}
] ]
}, },
json: {} json: {}
@@ -296,7 +290,7 @@ export default {
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -410,7 +404,7 @@ export default {
item.type = false; item.type = false;
}); });
this.json = data; this.json = data;
this.data = data.summaryList this.data = data.info
if (data.introduce) { if (data.introduce) {
} else { } else {
this.$http.get("slrs/sar-public-idea-all/getPublicIdea", { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+16 -21
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -50,11 +42,13 @@
</el-form-item> </el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled"> <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.fjListId" v-model="form.fjListId"
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -229,7 +223,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, processCreateStand } from "api/process"; import {inboundLiaisonDetail, processCreateStand} from "api/process";
export default { export default {
name: "bzzqyjStep6", name: "bzzqyjStep6",
@@ -268,7 +262,7 @@ export default {
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: "请选择责任人", trigger: "change" } {required: true, message: "请选择责任人", trigger: "change"}
] ]
}, },
json: {} json: {}
@@ -280,7 +274,7 @@ export default {
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -387,13 +381,14 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg); let data = JSON.parse(res.mesg);
this.form.cid = data.cid this.form.fjList = data.fjList || data.form.fjList
this.form.endTime = data.endTime this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cname = data.cname this.form.cid = data.cid || data.form.cid;
this.form.fjList = data.fjList this.form.endTime = data.endTime || data.form.endTime;
this.form.fjListId = data.fjListId this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = [] var arr = []
data.summaryList.forEach( item => { data.info.forEach(item => {
if (item.state != '3') { if (item.state != '3') {
arr.push(item) arr.push(item)
} }
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+460 -450
View File
@@ -1,462 +1,472 @@
<template> <template>
<div class="bzdyStep7"> <div class="bzdyStep7">
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">审核</template> <template slot="proNode">审核</template>
</ProcessHeader> </ProcessHeader>
<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 === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input
v-model="form.fjListId"
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<ProcessTitle>
<template slot="title">征求意见列表</template>
</ProcessTitle>
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
size="mini">导出汇总单</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞</el-button>
</div>
<el-table
ref="multipleTable"
:data="data"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="index"
label="序号"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="chapterNumber"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称">
</el-table-column>
<el-table-column
align="center"
prop="commentText"
label="修改意见内容（包括理由或依据）">
<el-table-column
prop="oldText"
align="center"
label="修改前">
</el-table-column>
<el-table-column
prop="newText"
align="center"
label="修改后">
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="修改理由">
</el-table-column>
</el-table-column>
<el-table-column
prop="department"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
approval
submitBTNText="同意"
>
</ProcessFooter>
</div> </div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input
v-model="form.fjListId"
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<ProcessTitle>
<template slot="title">征求意见列表</template>
</ProcessTitle>
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
size="mini">导出汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞
</el-button>
</div>
<el-table
ref="multipleTable"
:data="data"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="index"
label="序号"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="chapterNumber"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称">
</el-table-column>
<el-table-column
align="center"
prop="commentText"
label="修改意见内容（包括理由或依据）">
<el-table-column
prop="oldText"
align="center"
label="修改前">
</el-table-column>
<el-table-column
prop="newText"
align="center"
label="修改后">
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="修改理由">
</el-table-column>
</el-table-column>
<el-table-column
prop="department"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
approval
submitBTNText="同意"
>
</ProcessFooter>
</div>
</template> </template>
<script> <script>
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail, processCreateStand} from 'api/process'
export default { export default {
name: "bzzqyjStep7", name: "bzzqyjStep7",
data() { data() {
return { return {
histortData: [], histortData: [],
oldData: [], oldData: [],
data: [], data: [],
commentText: '', commentText: '',
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
roleRow: {}, roleRow: {},
nodeList: [], nodeList: [],
type: '', type: '',
defaultProps: { defaultProps: {
children: 'children', children: 'children',
label: 'name' label: 'name'
}, },
treeData: [], // 人员数据 treeData: [], // 人员数据
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题 drawerTitle: '', //drawer标题
textarea: '', // 意见 textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示 active: '1', // 默认显示
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
cid: '', // 编号 cid: '', // 编号
endTime: '', // 结束日期 endTime: '', // 结束日期
cname: '', // 名称 cname: '', // 名称
fjList: [], fjList: [],
fjListId: '', fjListId: '',
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' }, {required: true, message: '请选择责任人', trigger: 'change'},
] ]
}, },
json: {} json: {}
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
updataFj (item) {
let id
let type = item.fileName.split('.')
if (type[1] === 'pdf') {
id = item.attId
} else {
id = item.oriAttId
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
upload (row, title) {
var params = {
columnName: {
chapterNumber : '章条编号',
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
},
stateText (row) {
if (row === '1') {
return '上报'
} else if (row === '2') {
return '处理后上报'
}
},
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞')
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
var arr = []
data.summaryList.forEach( item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.data = arr
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
}
} }
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
updataFj(item) {
let id
let type = item.fileName.split('.')
if (type[1] === 'pdf') {
id = item.attId
} else {
id = item.oriAttId
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {
})
},
upload(row, title) {
var params = {
columnName: {
chapterNumber: '章条编号',
chapterName: '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
})
},
stateText(row) {
if (row === '1') {
return '上报'
} else if (row === '2') {
return '处理后上报'
}
},
handleTabs(name) {
this.active = name
},
handleSave() {
},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞')
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.data = arr
}).catch(e => {
})
})
},
},
mounted() {
this.getHistoryData()
this.getData()
}
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep7 {
/deep/.el-drawer__container { .bzdyStep7 {
.prc-content-border { /deep/ .el-drawer__container {
border: none; .prc-content-border {
padding: 0 20px 0; border: none;
} padding: 0 20px 0;
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
} }
}
.fileClass {
cursor: pointer;
}
.fileClass:hover {
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
}
</style> </style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+461 -451
View File
@@ -1,463 +1,473 @@
<template> <template>
<div class="bzdyStep8"> <div class="bzdyStep8">
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">技术管理中心主任审定</template> <template slot="proNode">技术管理中心主任审定</template>
</ProcessHeader> </ProcessHeader>
<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 === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input
v-model="form.fjListId"
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<ProcessTitle>
<template slot="title">征求意见列表</template>
</ProcessTitle>
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
size="mini">导出汇总单</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞</el-button>
</div>
<el-table
ref="multipleTable"
:data="data"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="index"
label="序号"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="chapterNumber"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称">
</el-table-column>
<el-table-column
prop="commentText"
align="center"
label="修改意见内容（包括理由或依据）">
<el-table-column
prop="oldText"
align="center"
label="修改前">
</el-table-column>
<el-table-column
prop="newText"
align="center"
label="修改后">
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="修改理由">
</el-table-column>
</el-table-column>
<el-table-column
prop="department"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
approval
submitBTNText="同意"
>
</ProcessFooter>
</div> </div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input
v-model="form.fjListId"
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<ProcessTitle>
<template slot="title">征求意见列表</template>
</ProcessTitle>
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
size="mini">导出汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞
</el-button>
</div>
<el-table
ref="multipleTable"
:data="data"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="index"
label="序号"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="chapterNumber"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称">
</el-table-column>
<el-table-column
prop="commentText"
align="center"
label="修改意见内容（包括理由或依据）">
<el-table-column
prop="oldText"
align="center"
label="修改前">
</el-table-column>
<el-table-column
prop="newText"
align="center"
label="修改后">
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="修改理由">
</el-table-column>
</el-table-column>
<el-table-column
prop="department"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
approval
submitBTNText="同意"
>
</ProcessFooter>
</div>
</template> </template>
<script> <script>
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail, processCreateStand} from 'api/process'
export default { export default {
name: "bzzqyjStep8", name: "bzzqyjStep8",
data() { data() {
return { return {
histortData: [], histortData: [],
oldData: [], oldData: [],
data: [], data: [],
commentText: '', commentText: '',
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
roleRow: {}, roleRow: {},
nodeList: [], nodeList: [],
type: '', type: '',
defaultProps: { defaultProps: {
children: 'children', children: 'children',
label: 'name' label: 'name'
}, },
treeData: [], // 人员数据 treeData: [], // 人员数据
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题 drawerTitle: '', //drawer标题
textarea: '', // 意见 textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示 active: '1', // 默认显示
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
cid: '', // 编号 cid: '', // 编号
endTime: '', // 结束日期 endTime: '', // 结束日期
cname: '', // 名称 cname: '', // 名称
fjList: [], fjList: [],
fjListId: '', fjListId: '',
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' }, {required: true, message: '请选择责任人', trigger: 'change'},
] ]
}, },
json: {} json: {}
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
updataFj (item) {
let id
let type = item.fileName.split('.')
if (type[1] === 'pdf') {
id = item.attId
} else {
id = item.oriAttId
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
upload (row, title) {
var params = {
columnName: {
chapterNumber : '章条编号',
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
},
stateText (row) {
if (row === '1') {
return '上报'
} else if (row === '2') {
return '处理后上报'
}
},
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞')
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
var arr = []
data.summaryList.forEach( item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
}
} }
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
updataFj(item) {
let id
let type = item.fileName.split('.')
if (type[1] === 'pdf') {
id = item.attId
} else {
id = item.oriAttId
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {
})
},
upload(row, title) {
var params = {
columnName: {
chapterNumber: '章条编号',
chapterName: '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
})
},
stateText(row) {
if (row === '1') {
return '上报'
} else if (row === '2') {
return '处理后上报'
}
},
handleTabs(name) {
this.active = name
},
handleSave() {
},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞')
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
})
})
},
},
mounted() {
this.getHistoryData()
this.getData()
}
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep8 {
/deep/.el-drawer__container { .bzdyStep8 {
.prc-content-border { /deep/ .el-drawer__container {
border: none; .prc-content-border {
padding: 0 20px 0; border: none;
} padding: 0 20px 0;
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
} }
}
.fileClass {
cursor: pointer;
}
.fileClass:hover {
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
}
</style> </style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+16 -21
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -50,11 +42,13 @@
</el-form-item> </el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled"> <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.fjListId" v-model="form.fjListId"
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -229,7 +223,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, processCreateStand } from "api/process"; import {inboundLiaisonDetail, processCreateStand} from "api/process";
export default { export default {
name: "bzzqyjStep9", name: "bzzqyjStep9",
@@ -265,7 +259,7 @@ export default {
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: "请选择责任人", trigger: "change" } {required: true, message: "请选择责任人", trigger: "change"}
] ]
}, },
json: {} json: {}
@@ -277,7 +271,7 @@ export default {
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -381,13 +375,14 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.cid = data.cid this.form.fjList = data.fjList || data.form.fjList
this.form.endTime = data.endTime this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cname = data.cname this.form.cid = data.cid || data.form.cid;
this.form.fjList = data.fjList this.form.endTime = data.endTime || data.form.endTime;
this.form.fjListId = data.fjListId this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = [] var arr = []
data.summaryList.forEach( item => { data.info.forEach(item => {
if (item.state != '3') { if (item.state != '3') {
arr.push(item) arr.push(item)
} }
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+46 -39
View File
@@ -28,14 +28,16 @@
</el-form-item> </el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input <el-input
disabled @click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled @click.native="handlePreview(listForm)"
readonly
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
></el-input> ></el-input>
@@ -399,6 +401,8 @@ export default {
}, },
data() { data() {
return { return {
//用来判断提交事件条件是否满足
satisfyFlag: true,
active: "1", active: "1",
standModel: false, standModel: false,
sarAccessListDatas: [], sarAccessListDatas: [],
@@ -699,50 +703,53 @@ export default {
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if (this.dataList.length < 1) { if (this.dataList.length < 1) {
this.satisfyFlag = false
this.$message.warning("请添加产品线信息"); this.$message.warning("请添加产品线信息");
} }
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) { if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
this.satisfyFlag = false
this.$message.warning("请选择分发责任人"); this.$message.warning("请选择分发责任人");
} else {
var json = Object.assign(this.listForm, this.roleForm);
this.isSubmit = true
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
});
} else {
this.isSubmit = false
return this.$message.warning("请完善人员信息");
}
});
} else {
this.isSubmit = false
return this.$message.warning("请完善基础信息");
}
});
} }
}); });
if(this.satisfyFlag){
this.isSubmit = true;
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
}
});
} else {
this.isSubmit = false;
return this.$message.warning("请完善人员信息");
}
});
} else {
this.isSubmit = false;
return this.$message.warning("请完善基础信息");
}
});
}
}, },
//选择拆分标准取消事件 //选择拆分标准取消事件
closeDrawer() { closeDrawer() {
src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
+17 -5
View File
@@ -25,26 +25,28 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled readonly
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled readonly
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
></el-input> ></el-input>
@@ -284,6 +286,17 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
@@ -303,7 +316,6 @@ export default {
*/ */
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
console.log(item);
this.listForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName this.listForm.prcName = this.prcName
src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+18 -5
View File
@@ -25,28 +25,30 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -402,6 +404,17 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank")
},
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
@@ -424,7 +437,7 @@ export default {
this.listForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName this.listForm.prcName = this.prcName
this.listForm['id'] = item.id this.listForm.id = item.id
this.dataList = item.dataList this.dataList = item.dataList
}) })
}, },
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+46 -40
View File
@@ -28,14 +28,16 @@
</el-form-item> </el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input <el-input
disabled @click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled @click.native="handlePreview(listForm)"
readonly
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
></el-input> ></el-input>
@@ -387,6 +389,8 @@ export default {
}, },
data() { data() {
return { return {
//用来判断提交事件条件是否满足
satisfyFlag: true,
active: "1", active: "1",
standModel: false, standModel: false,
sarAccessListDatas: [], sarAccessListDatas: [],
@@ -672,51 +676,53 @@ export default {
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if (this.dataList.length < 1) { if (this.dataList.length < 1) {
this.satisfyFlag = false
this.$message.warning("请添加产品线信息"); this.$message.warning("请添加产品线信息");
} }
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) { if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
this.satisfyFlag = false
this.$message.warning("请选择分发责任人"); this.$message.warning("请选择分发责任人");
} else {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
}
});
} else {
this.isSubmit = false;
return this.$message.warning("请完善人员信息");
}
});
} else {
this.isSubmit = false;
return this.$message.warning("请完善基础信息");
}
});
} }
}); });
if(this.satisfyFlag){
this.isSubmit = true;
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
}
});
} else {
this.isSubmit = false;
return this.$message.warning("请完善人员信息");
}
});
} else {
this.isSubmit = false;
return this.$message.warning("请完善基础信息");
}
});
}
}, },
//选择拆分标准取消事件 //选择拆分标准取消事件
closeDrawer() { closeDrawer() {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+17 -5
View File
@@ -25,26 +25,28 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled readonly
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled readonly
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
></el-input> ></el-input>
@@ -352,6 +354,17 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
@@ -371,7 +384,6 @@ export default {
*/ */
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
console.log(item);
this.listForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName this.listForm.prcName = this.prcName
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+106 -92
View File
@@ -25,28 +25,30 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -57,7 +59,8 @@
</process-title> </process-title>
<div class="tableTitle"> <div class="tableTitle">
<div class="tableButton"> <div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发落实人</el-button> <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发落实人
</el-button>
</div> </div>
</div> </div>
<el-table <el-table
@@ -121,8 +124,9 @@
width="170" width="170"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.implementerId" style="display: none;"/> <el-input v-model="scope.row.implementerId" style="display: none;" />
<el-input v-model="scope.row.implementer" placeholder="请选择落实人" @click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)"/> <el-input v-model="scope.row.implementer" placeholder="请选择落实人"
@click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -220,11 +224,11 @@
</ProcessFooter> </ProcessFooter>
<!-- 福田全公司选人解决方案 --> <!-- 福田全公司选人解决方案 -->
<Role-tree <Role-tree
check-box check-box
:is-title="drawerTitle" :is-title="drawerTitle"
:is-visible.sync="drawerModal" :is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole" @checkedRole="checkedTransferRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
</div> </div>
</template> </template>
@@ -233,7 +237,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process"; import { inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew } from "api/process";
export default { export default {
name: "xmpgStep3", name: "xmpgStep3",
@@ -274,8 +278,8 @@ export default {
tabValue: "listOfCountries", tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框 selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框 selectList: [], //选择标准的选择框
lsIndex: '', lsIndex: "",
lsType: '', lsType: "",
bringData: [], bringData: [],
commentText: "", //填写会签意见 commentText: "", //填写会签意见
page: 1, page: 1,
@@ -289,7 +293,7 @@ export default {
qualityEngineer: "", //质量工程师 qualityEngineer: "", //质量工程师
breakdownList: [{ //分解单数据 breakdownList: [{ //分解单数据
implementer: "", implementer: "",
implementerId:'', implementerId: "",
applyArctic: "", applyArctic: "",
busStandCover: "", busStandCover: "",
claimType: "", claimType: "",
@@ -302,7 +306,7 @@ export default {
}], }],
dataList: [{ dataList: [{
implementer: "", implementer: "",
implementerId:'', implementerId: "",
projectLine: "", //产品线 projectLine: "", //产品线
uname: "",//产品线责任人 uname: "",//产品线责任人
distributePerson: "", //分发责任人 distributePerson: "", //分发责任人
@@ -327,7 +331,7 @@ export default {
}, },
roleForm: { roleForm: {
implementer: "", implementer: "",
implementerId: "", implementerId: ""
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
user1: "", user1: "",
@@ -340,45 +344,45 @@ export default {
}, },
methods: { methods: {
//确认转办 //确认转办
checkedTransferRole (data) { checkedTransferRole(data) {
this.assigneeNewLoading = true this.assigneeNewLoading = true;
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false;
if (res.success) { if (res.success) {
this.drawerModal = false this.drawerModal = false;
this.$message.success('调整成功') this.$message.success("调整成功");
this.$router.push("/processCenter"); this.$router.push("/processCenter");
this.processNum() this.processNum();
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message);
} }
}) });
}, },
// 请求转换流程图 // 请求转换流程图
processNum (row) { processNum(row) {
axios.request({ axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
responseType: 'blob', responseType: "blob",
method: 'get', method: "get",
params: { params: {
prcNum: this.$route.query.prcNum prcNum: this.$route.query.prcNum
} }
}).then(res => { }).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'}) // let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data) // let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data) this.processStep = window.URL.createObjectURL(res.data);
}) });
}, },
//转办事件 //转办事件
handleTransfer(){ handleTransfer() {
this.drawerModal = true this.drawerModal = true;
this.drawerTitle = '转办处理人' this.drawerTitle = "转办处理人";
this.selectPeople = row this.selectPeople = row;
}, },
processTable() { processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", { this.$http.get("lawss/activiti/get_list_by_instance", {
@@ -397,13 +401,23 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
@@ -417,7 +431,7 @@ export default {
*/ */
getFormFieldList(item) { getFormFieldList(item) {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if(item.form === undefined){ if (item.form === undefined) {
this.listForm.prcNum = this.prcNum; this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
@@ -425,12 +439,11 @@ export default {
this.listForm.breakdownList = []; this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) { for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
console.log(item.pepdtos[i].xCXSSRQ === null); if (item.pepdtos[i].xCXSSRQ === null) {
if(item.pepdtos[i].xCXSSRQ === null){ item.pepdtos[i].xCXSSRQ = "";
item.pepdtos[i].xCXSSRQ = ''
} }
if(item.pepdtos[i].zCCSSRQ === null){ if (item.pepdtos[i].zCCSSRQ === null) {
item.pepdtos[i].zCCSSRQ = '' item.pepdtos[i].zCCSSRQ = "";
} }
this.listForm.breakdownList.push({ this.listForm.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName, itemsName: item.pepdtos[i].breakdownList[j].itemsName,
@@ -449,54 +462,55 @@ export default {
qualityEngineerName: item.pepdtos[i].qualityEngineerName, qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber, standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName, standName: item.pepdtos[i].standName,
xCXSSRQ : item.pepdtos[i].XCXSSRQ, id: item.pepdtos[0].id,
zCCSSRQ : item.pepdtos[i].ZCCSSRQ, xCXSSRQ: item.pepdtos[i].XCXSSRQ,
zCCSSRQ: item.pepdtos[i].ZCCSSRQ
}); });
} }
} }
} else { } else {
this.listForm = item.form this.listForm = item.form;
this.listForm.breakdownList = item.form.breakdownList this.listForm.breakdownList = item.form.breakdownList;
} }
}, },
checkedRole (data) { checkedRole(data) {
if (this.type === 1) { if (this.type === 1) {
this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id;
this.listForm.breakdownList[this.lsIndex].implementer = data[0].name this.listForm.breakdownList[this.lsIndex].implementer = data[0].name;
} else if(this.type === 2) { } else if (this.type === 2) {
this.listForm.breakdownList.forEach( item => { this.listForm.breakdownList.forEach(item => {
this.selectList.forEach( items => { this.selectList.forEach(items => {
if (item === items) { if (item === items) {
item.implementerId = data[0].id item.implementerId = data[0].id;
item.implementer = data[0].name item.implementer = data[0].name;
} }
}) });
}) });
} }
this.modalshowflag = false this.modalshowflag = false;
}, },
cancleUserInfo() { cancleUserInfo() {
this.modalshowflag = false; this.modalshowflag = false;
}, },
choiceZRRS (row, type, index) { choiceZRRS(row, type, index) {
this.type = type this.type = type;
if (type === 1) { if (type === 1) {
this.drawerTitle = '选择责任人' this.drawerTitle = "选择责任人";
this.nodeList = [] this.nodeList = [];
this.lsIndex = index this.lsIndex = index;
this.lsType = type this.lsType = type;
this.nodeList.push(row) this.nodeList.push(row);
this.modalshowflag = true this.modalshowflag = true;
} else if (type === 2) { } else if (type === 2) {
// 批量 // 批量
if (this.selectList.length > 0) { if (this.selectList.length > 0) {
this.lsType = type this.lsType = type;
this.nodeList = [] this.nodeList = [];
this.modalshowflag = true this.modalshowflag = true;
this.drawerTitle = '批量选择责任人' this.drawerTitle = "批量选择责任人";
} else { } else {
this.$message.warning('请选择要分发的数据') this.$message.warning("请选择要分发的数据");
} }
} }
}, },
@@ -507,24 +521,24 @@ export default {
}, },
//保存事件 //保存事件
// handleSave() { handleSave() {
// this.saveLoading = true; this.saveLoading = true;
// let _formData = new FormData(); let _formData = new FormData();
// _formData.append("id", this.bpnId || ""); _formData.append("id", this.bpnId || "");
// _formData.append("prcType", "5"); _formData.append("prcType", "5");
// _formData.append('taskIds', this.taskIds) _formData.append("taskIds", this.taskIds);
// _formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
// form: this.listForm, form: this.listForm,
// commentText: this.commentText commentText: this.commentText
// })); }));
// saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
// this.saveLoading = false; this.saveLoading = false;
// this.$message.success("保存成功"); this.$message.success("保存成功");
// this.bpnId = res.result; this.bpnId = res.result;
// }).catch(e => { }).catch(e => {
// this.saveLoading = false; this.saveLoading = false;
// }); });
// }, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.breakdownList.forEach(item => { this.listForm.breakdownList.forEach(item => {
@@ -543,7 +557,7 @@ export default {
this.listForm.approvalOpinion = ""; this.listForm.approvalOpinion = "";
this.listForm.signFlag = ""; this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm.breakdownList); const json = JSON.stringify(this.listForm.breakdownList);
this.isSubmit = true this.isSubmit = true;
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
@@ -555,7 +569,7 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false this.isSubmit = false;
}, e => { }, e => {
}); });
} else { } else {
@@ -573,7 +587,7 @@ export default {
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
this.selectList = data this.selectList = data;
}, },
selectThree() { selectThree() {
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+18 -5
View File
@@ -25,28 +25,30 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -492,6 +494,17 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank")
},
//将时间戳转换为日期格式 //将时间戳转换为日期格式
getLocalTime(item) { getLocalTime(item) {
return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " "); return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
@@ -509,7 +522,6 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
@@ -545,6 +557,7 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.standName = item.step3DTOS[0].standName; this.listForm.standName = item.step3DTOS[0].standName;
this.listForm.standNumber = item.step3DTOS[0].standNumber; this.listForm.standNumber = item.step3DTOS[0].standNumber;
this.listForm.id = item.step3DTOS[0].id;
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName; this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName; this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
this.listForm.itemsName = item.step3DTOS[0].itemsName; this.listForm.itemsName = item.step3DTOS[0].itemsName;
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+18 -5
View File
@@ -25,28 +25,30 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -470,6 +472,17 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank")
},
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
@@ -492,10 +505,10 @@ export default {
this.listForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.dataList this.dataList = item.dataList
this.listForm.standName = item.standName this.listForm.standName = item.standName
this.listForm.standNumber = item.standNumber this.listForm.standNumber = item.standNumber
this.listForm.id = item.id
this.listForm.qualityEngineerName = item.qualityEngineerName this.listForm.qualityEngineerName = item.qualityEngineerName
this.listForm.certifiedEngineerName = item.certifiedEngineerName this.listForm.certifiedEngineerName = item.certifiedEngineerName
this.listForm.responsibleUnit = item.responsibleUnit this.listForm.responsibleUnit = item.responsibleUnit
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+18 -5
View File
@@ -25,28 +25,30 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -469,6 +471,17 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank")
},
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
@@ -491,8 +504,8 @@ export default {
this.listForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.dataList this.dataList = item.dataList
this.listForm.id = item.step3DTOS[0].id
this.listForm.standName = item.step3DTOS[0].standName this.listForm.standName = item.step3DTOS[0].standName
this.listForm.standNumber = item.step3DTOS[0].standNumber this.listForm.standNumber = item.step3DTOS[0].standNumber
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+18 -5
View File
@@ -25,28 +25,30 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
disabled readonly
@click.native="handlePreview(listForm)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
disabled readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -469,6 +471,17 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank")
},
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
@@ -491,7 +504,7 @@ export default {
this.listForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName this.listForm.prcName = this.prcName
this.listForm['id'] = item.id this.listForm.id = item.id
this.dataList = item.dataList this.dataList = item.dataList
}) })
}, },
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+586 -601
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+951 -853
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+4
View File
@@ -193,20 +193,24 @@
align="center" align="center"
label="解读内容"> label="解读内容">
<el-table-column <el-table-column
show-overflow-tooltip
prop="coreTechnicalRequirement" prop="coreTechnicalRequirement"
label="核心技术要求(简述、请勿抄写标准)"> label="核心技术要求(简述、请勿抄写标准)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarProject.position === '1'" v-if="sarProject.position === '1'"
prop="comparedWithPrevious" prop="comparedWithPrevious"
label="相对于上一版本变化点"> label="相对于上一版本变化点">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
v-if="sarProject.position === '2'" v-if="sarProject.position === '2'"
prop="comparedDomesticStandard" prop="comparedDomesticStandard"
label="相对于国行标差异点"> label="相对于国行标差异点">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="complianceState" prop="complianceState"
label="合规性分析"> label="合规性分析">
</el-table-column> </el-table-column>