Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!177

src/assets/styles/newStyle.less

@@ -445,6 +445,9 @@ tr.el-table__row{
 .el-table th>.cell {
   font-size: 14px;
 }
+.el-table td>.cell {
+  font-size: 12px;
+}
 .el-table th.gutter{
   display: table-cell !important;
 }

src/pages/processCenter/pages/components/ProcessFooter.vue

@@ -102,6 +102,15 @@
         :loading="submitLoading"
         v-if="showConfirm"
       >接收待办</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        class="common-button-primary"
+        icon="el-icon-check"
+        @click="handleSubmit"
+        :loading="submitLoading"
+        v-if="showAffirm"
+      >确认</el-button>
     </div>
 
     <!-- 组织机构树 -->
@@ -179,6 +188,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showAffirm: {
+      type: Boolean,
+      default: false
+    },
     showConfirm: {
       type: Boolean,
       default: false

src/pages/processCenter/pages/creatProcess/bzdy/step1.vue

@@ -436,6 +436,8 @@ export default {
           message: response.message,
           type: 'success'
         })
+      } else {
+        this.$message.error('程序异常，上传失败')
       }
     },
     importFileSuccess2 (response, file) {
@@ -456,6 +458,8 @@ export default {
           message: response.message,
           type: 'success'
         })
+      } else {
+        this.$message.error('程序异常，上传失败')
       }
     },
     fileUpload () {

src/pages/processCenter/pages/creatProcess/bzdy/step3.vue

@@ -84,6 +84,7 @@
                                     <div v-else>
                                         <el-button
                                                 type="primary"
+                                                :disabled="acceptShow"
                                                 class="common-button-primary"
                                                 @click="fileUpload"
                                                 size="mini">
@@ -94,6 +95,7 @@
                                 <el-form-item label="回执说明" prop="dyhz" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.dyhz"
+                                            :disabled="acceptShow"
                                             style="height: 150px"
                                             type="textarea"
                                             :autosize="{ minRows: 1, maxRows: 5}"
@@ -185,10 +187,13 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                :show-submit="submitShow"
+                :show-confirm="acceptShow"
                 show-transfer
                 @transfer="handleTransfer"
                 @save="handleSave"
                 @submit="handleSubmit"
+                @accept="handleAccept"
         >
         </ProcessFooter>
         <Role-tree
@@ -223,7 +228,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew,execTask} from 'api/process'
     import axios from "axios";
 
     export default {
@@ -239,6 +244,9 @@
                 active: '1', // 默认显示
                 isSubmit: false,
                 saveLoading: false,
+                submitShow: false,
+                acceptShow: false,
+                todoId: '',
                 form: {
                     dyhz: '',
                     title: '', // 调研标题
@@ -374,6 +382,19 @@
                     this.saveLoading = false
                 })
             },
+            // 接受按钮
+            handleAccept(){
+                this.isSubmit = true
+                execTask({
+                    todoId: this.todoId // 当前节点ID
+                }).then(res => {
+                    if (res.sign && res.sign === '0') {
+                        this.$message.success('接收成功')
+                        this.$router.push('/processCenter')
+                    }
+                    this.isSubmit = false
+                })
+            },
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
@@ -406,6 +427,15 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        let commitStatus = res.commitStatus
+                        if(commitStatus && commitStatus > 0){
+                            this.acceptShow = true
+                            this.submitShow = false
+                        }else {
+                            this.acceptShow = false
+                            this.submitShow = true
+                        }
+                        this.todoId = res.id
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -73,6 +73,14 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                          v-model="form.endTime"
+                          type="date"
+                          placeholder="请选择截止日期"
+                          value-format="yyyy-MM-dd">
+                  </el-date-picker>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -471,6 +479,7 @@ export default {
         id: '',
         itemsNum: '',
         itemsName: '',
+        endTime: '',
         standId: '',
         statusId: '',
         itemsNum1: '',
@@ -484,6 +493,9 @@ export default {
         itemsName: [
           {required: true, message: '请输入标准名称/政策名称', trigger: 'change'},
         ],
+        endTime: [
+          {required: true, message: '请输入截止时间', trigger: 'change'},
+        ],
       },
       // 标准征求意见数据可库
       standCommonlySearch: {

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -128,7 +128,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
+                <el-button type="primary" :disabled="acceptShow" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
             </div>
             <el-table border
                       ref="selection"
@@ -177,6 +177,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        :disabled="acceptShow"
                         prop="changePoint"
                         width="150"
                         v-if="form.itemsNum1"
@@ -184,7 +185,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">
+                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">
                         </div>
                     </template>
                 </el-table-column>
@@ -196,7 +197,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >
+                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >
                         </div>
                     </template>
                 </el-table-column>
@@ -206,7 +207,7 @@
                         label="符合项状态"
                         align="center">
                     <template slot-scope="scope">
-                        <My-select v-model="scope.row.complianceRequir" :options="fhList"></My-select>
+                        <My-select :disabled="acceptShow" v-model="scope.row.complianceRequir" :options="fhList"></My-select>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -216,7 +217,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">
+                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">
                         </div>
                     </template>
                 </el-table-column>
@@ -227,6 +228,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <el-date-picker
+                                :disabled="acceptShow"
                                 v-model.lazy="scope.row.newData"
                                 type="date"
                                 placeholder="选择新车型实施日期">
@@ -240,6 +242,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <el-date-picker
+                                :disabled="acceptShow"
                                 v-model.lazy="scope.row.onlineData"
                                 type="date"
                                 placeholder="选择新车型实施日期">
@@ -252,7 +255,7 @@
                         label="适用车型"
                         align="center">
                     <template slot-scope="scope">
-                        <My-select v-model="scope.row.applyArctic" :options="cxList"></My-select>
+                        <My-select :disabled="acceptShow" v-model="scope.row.applyArctic" :options="cxList"></My-select>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -342,14 +345,17 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
+                :show-save="submitShow"
                 show-submit
+                :show-submit="submitShow"
+                :show-confirm="acceptShow"
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
-                show-transfer
+                :show-transfer="submitShow"
                 @transfer="handleTransfer"
                 @save="handleSave"
                 @submit="handleSubmit"
+                @accept="handleAccept"
         >
         </ProcessFooter>
         <Role-tree
@@ -444,7 +450,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew,execTask} from 'api/process'
     import axios from "axios";
 
     export default {
@@ -488,6 +494,9 @@
                 active: '1', // 默认显示
                 isSubmit: false,
                 saveLoading: false,
+                submitShow: false,
+                acceptShow: false,
+                todoId: '',
                 form: {
                     itemsNum: '',
                     itemsName: '',
@@ -614,6 +623,19 @@
                     this.saveLoading = false
                 })
             },
+            // 接受按钮
+            handleAccept(){
+                this.isSubmit = true
+                execTask({
+                    todoId: this.todoId // 当前节点ID
+                }).then(res => {
+                    if (res.sign && res.sign === '0') {
+                        this.$message.success('接收成功')
+                        this.$router.push('/processCenter')
+                    }
+                    this.isSubmit = false
+                })
+            },
             handleSubmit() {
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
@@ -691,6 +713,15 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        let commitStatus = res.commitStatus
+                        if(commitStatus && commitStatus > 0){
+                            this.acceptShow = true
+                            this.submitShow = false
+                        }else {
+                            this.acceptShow = false
+                            this.submitShow = true
+                        }
+                        this.todoId = res.id
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         if (data.form) {

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -1,5 +1,4 @@
-<template>
+<template><div class="bzrkStep1">
-    <div class="bzrkStep1">
         <!--        标准入库流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准入库流程</template>
@@ -221,14 +220,14 @@
                     <div class="prc-content-border" v-show="verifySarStandard">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item v-show="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
+                              <el-form-item v-show="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
                                             v-model="form.xgdName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="form.xgdName">
+                                    <div v-if="xgdFileList.length>0">
 <!--                                        {{ form.xgdName }}-->
                                         <el-button
                                                 type="primary"
@@ -251,14 +250,14 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                              <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
                                             v-model="form.fbgbjbdName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="form.fbgbjbdName">
+                                    <div v-if="FBGBJBDFileList.length>0">
 <!--                                        {{ form.fbgbjbdName }}-->
                                         <el-button
                                                 type="primary"
@@ -288,7 +287,7 @@
                                     v-model="form.ssgName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.ssgName">
+                                <div v-if="ssgFileList.length>0">
                                   <!--                                        {{ form.ssgName }}-->
                                   <el-button
                                       type="primary"
@@ -318,7 +317,7 @@
                                     v-model="form.caName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.caName">
+                                <div v-if="caFileList.length>0">
                                   <!--                                        {{ form.caName }}-->
                                   <el-button
                                       type="primary"
@@ -341,14 +340,14 @@
                                   </el-button>
                                 </div>
                               </el-form-item>
-                                <el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
+                              <el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
                                             v-model="form.zbjbdName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="form.zbjbdName">
+                                    <div v-if="zbjbdFileList.length>0">
 <!--                                        {{ form.zbjbdName }}-->
                                         <el-button
                                                 type="primary"
@@ -373,14 +372,14 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item v-show="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
+                              <el-form-item v-show="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
                                             v-model="form.kwjName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="form.kwjName">
+                                    <div v-if="kwjFileList.length>0">
 <!--                                        {{ form.kwjName }}-->
                                         <el-button
                                                 type="primary"
@@ -410,7 +409,7 @@
                                     v-model="form.jdwjName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.jdwjName">
+                                <div v-if="jdwjFileList.length>0">
                                   <!--                                        {{ form.jdwjName }}-->
                                   <el-button
                                       type="primary"
@@ -440,7 +439,7 @@
                                     v-model="form.bpgName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.bpgName">
+                                <div v-if="bpgFileList.length>0">
                                   <!--                                        {{ form.bpgName }}-->
                                   <el-button
                                       type="primary"
@@ -470,7 +469,7 @@
                                     v-model="form.zqyjgName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.zqyjgName">
+                                <div v-if="zqyjgFileList.length>0">
                                   <!--                                        {{ form.zqyjgName }}-->
                                   <el-button
                                       type="primary"
@@ -910,6 +909,7 @@
                     accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
+                    :on-remove="removeOneFile"
                     :show-file-list="true"
             >
                 <div style="padding: 20px 0">
@@ -1269,7 +1269,7 @@
               jdwjFileList: [],
               zbjbdFileList: [],
               kwjFileList: [],
-              qlwjFileList: [],
+              glwjFileList: [],
               filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
@@ -1726,7 +1726,7 @@
             data.forEach(item => {
               this.$set(this.textStatusMap, item.value, item.label)
             })
-      
+
           },
             clearFormData(data){
                 this.form = {
@@ -1817,7 +1817,7 @@
                             const bringData = this.standardCheckedList[0]
                             bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
                             bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
-             
+
                             const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                             this.form = JSON.parse(JSON.stringify(json))
 
@@ -1847,6 +1847,15 @@
                             this.busVsFunc()
                             this.modelFunc()
                             this.$forceUpdate()
+
+                          console.log("this.form",this.form);
+                          // 遍历对象初始化文件信息
+                          for(const p in this.form) {
+                            if (typeof (this.form[p]) != "function") {
+                              this.initializeFileList(p,this.form[p]);
+                            }
+                          }
+
                         } else if (this.standardCheckedList.length > 1) {
                             this.$message.warning('最多可以带入一条标准信息')
                         } else {
@@ -1860,7 +1869,63 @@
                         this.standardDrawer = false
                         break
                 }
-            },
+            },initializeFileList(property ,value){
+            switch (property){
+              case 'xgd':
+                this.getFileList(value,this.xgdFileList);
+                break;
+              case 'fbgbjbd':
+                this.getFileList(value,this.FBGBJBDFileList);
+                break;
+              case 'ssg':
+                this.getFileList(value,this.ssgFileList);
+                break;
+              case 'ca':
+                this.getFileList(value,this.caFileList);
+                break;
+              case 'zbjbd':
+                this.getFileList(value,this.zbjbdFileList);
+                break;
+              case 'kwj':
+                this.getFileList(value,this.kwjFileList);
+                break;
+              case 'jdwj':
+                debugger
+                this.getFileList(value,this.jdwjFileList);
+                break;
+              case 'bpg':
+                this.getFileList(value,this.bpgFileList);
+                break;
+              case 'zqyjg':
+                this.getFileList(value,this.zqyjgFileList);
+                break;
+              default: ;
+            }
+          },getFileList(fileIds,defaultFileList){
+
+            // 对象为引用传递
+            this.$http.get('att/attFile/getMultiFileInfos', {
+              fileIds: fileIds
+            }, {
+              _this: this
+            }, res => {
+              debugger
+              let fileList = res.data
+              if (fileList != null && fileList.length > 0) {
+                for (let i = 0; i < fileList.length; i++) {
+                  let obj = {name: '', response: {}}
+                  obj.name = fileList[i].oldFileName
+                  obj.response.data = fileList[i]
+
+
+                  //根据以‘，’分割的id查询到的文件信息，放入对应的文件list中
+                  defaultFileList.push(obj)
+                  console.log("defaultFileList",defaultFileList);
+                }
+              }
+            }, e => {
+            })
+          },
             handleStandardPageChange (page) {
                 this.standardSearchForm.page = page
                 this.handleSearchStandard()
@@ -2219,83 +2284,122 @@
                 if (response.ok) {
                     // this.fileMadel = false
                     // this.fileList = []
-                    if(this.fileType === 'fbgbjbd'){
+                    // if(this.fileType === 'fbgbjbd'){
-                        this.FBGBJBDFileList=fileList;
+                    //     this.FBGBJBDFileList=fileList;
-                        this.form.fbgbjbd += response.data.id+',';
+                    //
-                        if( this.form.fbgbjbdName=== undefined){
+                    //
-                            this.form.fbgbjbdName=''
+                    //     this.form.fbgbjbd += response.data.id+',';
-                        }
+                    //     if( this.form.fbgbjbdName=== undefined){
-                        this.form.fbgbjbdName += response.data.name+',';
+                    //         this.form.fbgbjbdName=''
-                    }else if(this.fileType === 'xgd'){
+                    //     }
-                        this.xgdFileList=fileList;
+                    //     this.form.fbgbjbdName += response.data.name+',';
-                        this.form.xgd += response.data.id+',';
+                    // }else if(this.fileType === 'xgd'){
-                           if( this.form.xgdName=== undefined){
+                    //     this.xgdFileList=fileList;
-                            this.form.xgdName=''
-                        }
-                        this.form.xgdName += response.data.name+',';
-                    }else if(this.fileType === 'bpg'){
-                      this.bpgFileList=fileList;
-                        this.form.bpg += response.data.id+',';
-                             if( this.form.bpgName=== undefined){
-                            this.form.bpgName=''
-                        }
-                        this.form.bpgName += response.data.name+',';
-                    }else if(this.fileType === 'ssg'){
-                      this.ssgFileList=fileList;
-                        this.form.ssg += response.data.id+',';
-                             if( this.form.ssgName=== undefined){
-                            this.form.ssgName=''
-                        }
-                        this.form.ssgName += response.data.name+',';
-                    }else if(this.fileType === 'zqyjg'){
-                      this.zqyjgFileList=fileList;
-                        this.form.zqyjg += response.data.id+',';    
-                         if( this.form.zqyjgName=== undefined){
-                            this.form.zqyjgName=''
-                        }
-                        this.form.zqyjgName += response.data.name+',';
-                    }else if(this.fileType === 'jdwj'){
-                      this.jdwjFileList=fileList;
-                        this.form.jdwj += response.data.id+',';
-                             if( this.form.jdwjName=== undefined){
-                            this.form.jdwjName=''
-                        }
-                        this.form.jdwjName += response.data.name+',';
-                    }else if(this.fileType === 'kwj'){
-                      this.kwjFileList=fileList;
-                        this.form.kwj += response.data.id+',';
-                             if( this.form.kwjName=== undefined){
-                            this.form.kwjName=''
-                        }
-                        this.form.kwjName += response.data.name+',';
-                    }
-                    // else if(this.fileType === 'xgd'){
-                    //   this.xgdFileList=fileList;
                     //     this.form.xgd += response.data.id+',';
+                    //        if( this.form.xgdName=== undefined){
+                    //         this.form.xgdName=''
+                    //     }
                     //     this.form.xgdName += response.data.name+',';
+                    // }else if(this.fileType === 'bpg'){
+                    //   this.bpgFileList=fileList;
+                    //     this.form.bpg += response.data.id+',';
+                    //          if( this.form.bpgName=== undefined){
+                    //         this.form.bpgName=''
+                    //     }
+                    //     this.form.bpgName += response.data.name+',';
+                    // }else if(this.fileType === 'ssg'){
+                    //   this.ssgFileList=fileList;
+                    //     this.form.ssg += response.data.id+',';
+                    //          if( this.form.ssgName=== undefined){
+                    //         this.form.ssgName=''
+                    //     }
+                    //     this.form.ssgName += response.data.name+',';
+                    // }else if(this.fileType === 'zqyjg'){
+                    //   this.zqyjgFileList=fileList;
+                    //     this.form.zqyjg += response.data.id+',';
+                    //      if( this.form.zqyjgName=== undefined){
+                    //         this.form.zqyjgName=''
+                    //     }
+                    //     this.form.zqyjgName += response.data.name+',';
+                    // }else if(this.fileType === 'jdwj'){
+                    //   this.jdwjFileList=fileList;
+                    //     this.form.jdwj += response.data.id+',';
+                    //          if( this.form.jdwjName=== undefined){
+                    //         this.form.jdwjName=''
+                    //     }
+                    //     this.form.jdwjName += response.data.name+',';
+                    // }else if(this.fileType === 'kwj'){
+                    //   this.kwjFileList=fileList;
+                    //     this.form.kwj += response.data.id+',';
+                    //          if( this.form.kwjName=== undefined){
+                    //         this.form.kwjName=''
+                    //     }
+                    //     this.form.kwjName += response.data.name+',';
                     // }
-                    else if(this.fileType === 'glwj'){
+                    // // else if(this.fileType === 'xgd'){
-                      this.qlwjFileList=fileList;
+                    // //   this.xgdFileList=fileList;
-                        this.form.glwj += response.data.id+',';
+                    // //     this.form.xgd += response.data.id+',';
-                             if( this.form.glwjName=== undefined){
+                    // //     this.form.xgdName += response.data.name+',';
-                            this.form.glwjName=''
+                    // // }
-                        }
+                    // else if(this.fileType === 'glwj'){
-                        this.form.glwjName += response.data.name+',';
+                    //   this.qlwjFileList=fileList;
-                    }else if(this.fileType === 'ca'){
+                    //     this.form.glwj += response.data.id+',';
+                    //          if( this.form.glwjName=== undefined){
+                    //         this.form.glwjName=''
+                    //     }
+                    //     this.form.glwjName += response.data.name+',';
+                    // }else if(this.fileType === 'ca'){
+                    //   this.caFileList=fileList;
+                    //   console.log(this.caFieList)
+                    //     this.form.ca += response.data.id+',';
+                    //          if( this.form.caName=== undefined){
+                    //         this.form.caName=''
+                    //     }
+                    //     this.form.caName += response.data.name+',';
+                    // }else if(this.fileType === 'zbjbd'){
+                    //   this.zbjbdFileList=fileList;
+                    //     this.form.zbjbd += response.data.id+',';
+                    //          if( this.form.zbjbdName=== undefined){
+                    //         this.form.zbjbdName=''
+                    //     }
+                    //     this.form.zbjbdName += response.data.name+',';
+                    // }
+
+
+                  switch (this.fileType){
+                    case 'fbgbjbd':
+                      this.FBGBJBDFileList=fileList;
+                      console.log("FBGJBDFileList",this.FBGBJBDFileList);
+                      break;
+                    case 'xgd' :
+                      this.xgdFileList=fileList;
+                      break;
+                    case 'bpg':
+                      this.bpgFileList=fileList;
+                      break;
+                    case 'ssg':
+                      this.ssgFileList=fileList;
+                      break;
+                    case 'zqyjg':
+                      this.zqyjgFileList=fileList;
+                      break;
+                    case 'jdwj':
+                      this.jdwjFileList=fileList;
+                      break;
+                    case 'kwj':
+                      this.kwjFileList=fileList;
+                      break;
+                    case 'ca':
                       this.caFileList=fileList;
-                        this.form.ca += response.data.id+',';
+                      break;
-                             if( this.form.caName=== undefined){
+                    case 'zbjbd':
-                            this.form.caName=''
+                      this.zbjbdFileList=fileList
-                        }
+                      break;
-                        this.form.caName += response.data.name+',';
+                    case 'glwj':
-                    }else if(this.fileType === 'zbjbd'){
+                      this.glwjFileList=fileList
-                      this.zbjbdFileList=fileList;
+                      break
-                        this.form.zbjbd += response.data.id+',';
+                    default : ;
-                             if( this.form.zbjbdName=== undefined){
+                  }
-                            this.form.zbjbdName=''
-                        }
-                        this.form.zbjbdName += response.data.name+',';
-                    }
                   this.$message({
                         showClose: true,
                         message: response.message,
@@ -2308,30 +2412,101 @@
                 // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
 
                 this.fileType = type;
-                if (type==='ca'){
+                // if (type==='ca'){
-                  this.fileList=this.caFileList;
+                //   this.fileList=this.caFileList;
-                }else if (type==='fbgbjbd'){
+                // }else if (type==='fbgbjbd'){
-                  this.fileList=this.FBGBJBDFileList;
+                //   this.fileList=this.FBGBJBDFileList;
-                }else if (type==='xgd'){
+                // }else if (type==='xgd'){
-                  this.fileList=this.xgdFileList;
+                //   this.fileList=this.xgdFileList;
-                }else if(type==='bpg'){
+                // }else if(type==='bpg'){
-                  this.fileList=this.bpgFileList;
+                //   this.fileList=this.bpgFileList;
-                }else if (type==='ssg'){
+                // }else if (type==='ssg'){
-                  this.fileList=this.ssgFileList;
+                //   this.fileList=this.ssgFileList;
-                }else if (type==='zqyjg'){
+                // }else if (type==='zqyjg'){
-                  this.fileList=this.zqyjgFileList;
+                //   this.fileList=this.zqyjgFileList;
-                }else if (type==='jdwj'){
+                // }else if (type==='jdwj'){
-                  this.fileList=this.jdwjFileList;
+                //   this.fileList=this.jdwjFileList;
-                }else if (type==='zbjbd'){
+                // }else if (type==='zbjbd'){
+                //   this.fileList=this.zbjbdFileList;
+                // }else if (type==='kwj'){
+                //   this.fileList=this.kwjFileList;
+                // }else if (type==='glwj'){
+                //   this.fileList=this.qlwjFileList;
+                // }
+
+
+
+              switch (this.fileType){
+                case 'fbgbjbd':
+                  this.fileList=this.FBGBJBDFileList
+                  break;
+                case 'xgd' :
+                  this.fileList=this.xgdFileList
+                  break;
+                case 'bpg':
+                  this.fileList=this.bpgFileList
+                  break;
+                case 'ssg':
+                  this.fileList=this.ssgFileList
+                  break;
+                case 'zqyjg':
+                  this.fileList=this.zqyjgFileList
+                  break;
+                case 'jdwj':
+                  this.fileList=this.jdwjFileList
+                case 'kwj':
+                  this.fileList=this.kwjFileList
+                  break;
+                case 'ca':
+                  this.fileList=this.caFileList
+                  break;
+                case 'zbjbd':
                   this.fileList=this.zbjbdFileList;
-                }else if (type==='kwj'){
+                  break;
-                  this.fileList=this.kwjFileList;
+                case 'glwj':
-                }else if (type==='glwj'){
+                  this.fileList=this.glwjFileList;
-                  this.fileList=this.qlwjFileList;
+                  break
-                }
+                default : ;
+              }
               this.fileMadel = true;
 
             },
+          removeOneFile(file, fileList) {
+
+            switch (this.fileType){
+              case 'fbgbjbd':
+                this.FBGBJBDFileList=fileList;
+                break;
+              case 'xgd' :
+                this.xgdFileList=fileList;
+                break;
+              case 'bpg':
+                this.bpgFileList=fileList;
+                break;
+              case 'ssg':
+                this.ssgFileList=fileList;
+                break;
+              case 'zqyjg':
+                this.zqyjgFileList=fileList;
+                break;
+              case 'jdwj':
+                this.jdwjFileList=fileList;
+                break;
+              case 'kwj':
+                this.kwjFileList=fileList;
+                break;
+              case 'ca':
+                this.caFileList=fileList;
+                break;
+              case 'zbjbd':
+                this.zbjbdFileList=fileList
+                break;
+              case 'glwj':
+                this.glwjFileList=fileList
+                break
+              default : ;
+            }
+          },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if(checkedData.length > 0 && checkedData.length != 0){
@@ -2444,12 +2619,48 @@
                     this.saveLoading = false
                 })
             },
+          fileInfoHandle(){
+
+            //拼接文件名和id 提交到流程Activity
+            this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",")
+            this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.response.data.name).join(",")
+
+            this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",")
+            this.form.xgdName=this.xgdFileList.map(item => item.response.data.name).join(",")
+
+            this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",")
+            this.form.bpgName=this.bpgFileList.map(item => item.response.data.name).join(",")
+
+            this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",")
+            this.form.ssgName=this.ssgFileList.map(item => item.response.data.name).join(",")
+
+            this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",")
+            this.form.zqyjgName=this.zqyjgFileList.map(item => item.response.data.name).join(",")
+
+            this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",")
+            this.form.jdwjName=this.jdwjFileList.map(item => item.response.data.name).join(",")
+
+            this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",")
+            this.form.kwjName=this.kwjFileList.map(item => item.response.data.name).join(",")
+
+            this.form.ca=this.caFileList.map(item => item.response.data.id).join(",")
+            this.form.caName=this.caFileList.map(item => item.response.data.name).join(",")
+
+            this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",")
+            this.form.zbjbdName=this.zbjbdFileList.map(item => item.response.data.name).join(",")
+
+            this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",")
+            this.form.glwjName=this.glwjFileList.map(item => item.response.data.name).join(",")
+
+
+          },
             handleSubmit() {
               // this.form.country=this.countryArr;
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
                         this.$refs['userForm'].validate((valid) => {
                             if (valid) {
+                                this.fileInfoHandle()
                                 this.isSubmit = true
                                 this.form.country=this.countryArr;
                                 var json = Object.assign(this.form, this.roleForm)

src/pages/processCenter/pages/creatProcess/bzrk/step3.vue

@@ -211,40 +211,41 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                  <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
+                  <div  v-if="xgdFileMap.length>0" v-for="(value,index)  in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile('xgd',value.id)">
-                    {{ form.xgdName }}
+                    <!-- {{ value.name }} -->
+                    {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
-                  <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
+                  <div v-if="form.fbgbjbdName" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
-                    {{ form.fbgbjbdName }}
+                   {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
+                  <div  v-if="form.zbjbdName"  v-for="(value,index)  in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
-                    {{ form.zbjbdName }}
+                   {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+                  <div v-if="form.ssgName"  v-for="(value,index)  in this.ssgFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
-                    {{ form.ssgName }}
+                    {{value.name}}
                   </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')">
+                  <div v-if="form.caName" v-for="(value,index)  in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
-                    {{ form.caName }}
+                     {{value.name}}
                   </div>
                   <div v-else>
                     - -
@@ -253,32 +254,32 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
+                  <div v-if="form.kwjName" v-for="(value,index)  in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
-                    {{ form.kwjName }}
+                    {{value.name}}
                   </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">
-                  <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
+                  <div v-if="form.jdwjName" v-for="(value,index)  in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
-                    {{ form.jdwjName }}
+                 {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </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')">
+                  <div v-if="form.bpgName" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
-                    {{ form.bpgName }}
+                       {{value.name}}
                   </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')">
+                  <div v-if="form.zqyjgName" v-for="(value,index)  in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
-                    {{ form.zqyjgName }}
+                      {{value.name}}
                   </div>
                   <div v-else>
                     - -
@@ -693,6 +694,17 @@ export default {
   name: "bzrkStep3",
   data () {
     return {
+      xgdFileMap: [],
+      fbgbjbdFileMap: [],
+      bpgFileMap: [],
+      ssgFileMap: [],
+      zqyjgFileMap: [],
+      jdwjFileMap: [],
+      kwjFileMap: [],
+      glwjFileMap: [],
+      caFileMap: [],
+      zbjbdFileMap: [],
+
       xgdFileId: '',
       fbgbjbdFileId: '',
       bpgFileId: '',
@@ -883,28 +895,28 @@ export default {
         }
       })
     },
-    downloadFile (fileType) {
+    downloadFile (fileType,fileId) {
       if(fileType === 'fbgbjbd'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
       }else if(fileType === 'xgd'){
 
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'bpg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'ssg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'zqyjg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'jdwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'kwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'glwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'ca'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'zbjbd'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }
     },
     popoverHide (checkedIds, checkedData) {
@@ -960,6 +972,19 @@ export default {
         this.detailData = res
       }, e => {})
     },
+    assemble(ids,names){
+        console.log("name",names)
+        console.log("id",ids)
+        let list= new Array();
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        console.log("idarray",idArray);
+        for(var i=0;i<idArray.length;i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+
+        return list;
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -978,6 +1003,35 @@ export default {
             this.glwjFileId = processForm.glwj
             this.caFileId = processForm.ca
             this.zbjbdFileId = processForm.zbjbd
+
+
+
+      this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
+      console.log("xgdName",this.xgdFileMap);
+
+      this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
+      // fbgbjbdFileMap: {},
+      this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName);
+      // bpgFileMap: {},
+      this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName);
+      // ssgFileMap: {},
+      this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName);
+      // zqyjgFileMap: {},
+      this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwj);
+      // jdwjFileMap: {},
+      this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName);
+      // kwjFileMap: {},
+      this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName);
+      // glwjFileMap: {},
+      this.caFileMap=this.assemble(processForm.ca,processForm.caName);
+      // caFileMap: {},
+      this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName);
+      // zbjbdFileMap: {},
+
+
+
+
+
             this.getFormFieldList(processForm)
           }
         }).catch(e => {

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -222,10 +222,11 @@
               :show-confirm="acceptShow"
               :submitLoading="isSubmit"
               :saveLoading="saveLoading"
+              :show-save="submitShow"
+              :show-transfer="submitShow"
               @save="handleSave"
               @submit="handleSubmit"
               @accept="handleAccept"
-              show-transfer
               @transfer="handleTransfer"
       >
       </ProcessFooter>

src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue

@@ -110,6 +110,7 @@
           <el-table-column  label="佐证材料"  align="center" width="150">
             <template slot-scope="scope">
               <el-upload
+                  :disabled="acceptShow"
                   multiple
                   ref="uploadFile"
                   :action="uploadPath"
@@ -122,6 +123,7 @@
                   :on-success="handleOnsuccess"
                 >
                 <el-button
+                  :disabled="acceptShow"
                   type="primary"
                   class="common-button-primary"
                   @click="uploadFile(scope.row)"
@@ -218,12 +220,15 @@
       show-save
       show-submit
       show-transfer
+      :show-submit="submitShow"
+      :show-confirm="acceptShow"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :transferLoading="turnLoading"
       @transfer="handleTurnTo"
       @save="handleSave"
       @submit="handleSubmit"
+      @accept="handleAccept"
     >
     </ProcessFooter>
     <Role-tree
@@ -240,7 +245,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew} from "@/api/process"
+import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew,execTask} from "@/api/process"
 
 export default {
   name: "wfhxzgStep4",
@@ -262,6 +267,9 @@ export default {
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
+      submitShow: false,
+      acceptShow: false,
+      todoId: '',
       turnLoading: false,
       dataList: [],
       taskIds: this.$route.query.taskIds,
@@ -316,6 +324,15 @@ export default {
       }
       inboundLiaisonDetail(params).then(res => {
         const processForm = JSON.parse(res.mesg)
+        let commitStatus = res.commitStatus
+        if(commitStatus && commitStatus > 0){
+          this.acceptShow = true
+          this.submitShow = false
+        }else {
+          this.acceptShow = false
+          this.submitShow = true
+        }
+        this.todoId = res.id
         this.getFormFieldList(processForm)
       })
     },
@@ -481,6 +498,19 @@ export default {
         this.saveLoading = false
       })
     },
+    // 接受按钮
+    handleAccept(){
+      this.isSubmit = true
+      execTask({
+        todoId: this.todoId // 当前节点ID
+      }).then(res => {
+        if (res.sign && res.sign === '0') {
+          this.$message.success('接收成功')
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      })
+    },
     // 提交按钮
     handleSubmit() {
       this.isSubmit = true

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -61,6 +61,14 @@
                     placeholder="请输入标准名称"
                 ></el-input>
               </el-form-item>
+              <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                <el-date-picker
+                        v-model="listForm.endTime"
+                        type="date"
+                        placeholder="请选择截止日期"
+                        value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.certifiedEngineerName"
@@ -521,6 +529,9 @@ export default {
         standNumber: [
           { required: true, message: "请填写标准编号", trigger: "change" }
         ],
+        endTime: [
+          {required: true, message: '请输入截止时间', trigger: 'change'},
+        ],
         qualityEngineer: [
           { required: true, message: "请选择质量工程师", trigger: "change" }
         ],
@@ -554,6 +565,7 @@ export default {
       listForm: {
         standNumber: "", //标准编号
         standName: "",//标准名称
+        endTime:'',
         standType: "", //标准类型
         XCXSSRQ: "", //新车型实施日期
         ZCCSSRQ: "", //在产车实施日期

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -493,15 +493,18 @@
     </div>
 
     <ProcessFooter
-      show-save
+      :show-save="submitShow"
-      show-transfer
+      :show-transfer="submitShow"
       show-submit
+      :show-submit="submitShow"
+      :show-confirm="acceptShow"
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
       @transfer="handleTransfer"
       @submit="handleSubmit"
+      @accept="handleAccept"
     >
     </ProcessFooter>
     <!-- 福田全公司选人解决方案 -->
@@ -520,7 +523,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import Moment from 'moment';
-import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew,execTask } from "api/process";
 
 export default {
   name: "xmpgStep4",
@@ -551,6 +554,9 @@ export default {
       listType: "country",  //选择的清单类型
       isSubmit: false,
       saveLoading: false,
+      submitShow: false,
+      acceptShow: false,
+      todoId: '',
       tabValue: "listOfCountries",
       selectedList: [],  //选择清单的选择框
       selectList: [], //选择标准的选择框
@@ -689,6 +695,15 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg);
+            let commitStatus = res.commitStatus
+            if(commitStatus && commitStatus > 0){
+              this.acceptShow = true
+              this.submitShow = false
+            }else {
+              this.acceptShow = false
+              this.submitShow = true
+            }
+            this.todoId = res.id
             this.getFormFieldList(processForm);
           }
         }).catch(e => {
@@ -758,6 +773,19 @@ export default {
         this.saveLoading = false;
       });
     },
+    // 接受按钮
+    handleAccept(){
+      this.isSubmit = true
+      execTask({
+        todoId: this.todoId // 当前节点ID
+      }).then(res => {
+        if (res.sign && res.sign === '0') {
+          this.$message.success('接收成功')
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      })
+    },
     //提交事件
     handleSubmit() {
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;

src/pages/processCenter/pages/creatProcess/xmpg/step6.vue

@@ -593,12 +593,11 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
-        this.dataList = item.step3DTOS
+        this.dataList = item.dataList
         this.listForm.id = item.step3DTOS[0].id
         this.listForm.standName = item.step3DTOS[0].standName
         this.listForm.standNumber = item.step3DTOS[0].standNumber

src/pages/processCenter/pages/creatProcess/xmpg/step7.vue

@@ -4,7 +4,7 @@
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程</template>
       <template slot="proNode">标准法规部领导审批</template>
-    </ProcessHeader>xmpgStep7
+    </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>

src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue

@@ -42,6 +42,14 @@
                   clearable
                 ></el-input>
               </el-form-item>
+              <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                <el-date-picker
+                        v-model="listForm.endTime"
+                        type="date"
+                        placeholder="请选择截止日期"
+                        value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -374,6 +382,7 @@ export default {
       listForm: {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
+        endTime: '',
         dataList: [], //项目下的标准数据
         breakdownList: [] //标准下的分解单数据
       },
@@ -386,7 +395,10 @@ export default {
         ],
         projectName: [
           { required: true, message: "请填写项目名称", trigger: "change" }
-        ]
+        ],
+        endTime: [
+          {required: true, message: '请输入截止时间', trigger: 'change'},
+        ],
       },
       //选人的验证
       roleFormRules: {

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -425,12 +425,15 @@
       show-save
       show-submit
       show-transfer
+      :show-submit="submitShow"
+      :show-confirm="acceptShow"
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
       @transfer="handleTransfer"
       @submit="handleSubmit"
+      @accept="handleAccept"
     >
     </ProcessFooter>
     <!-- 福田全公司选人解决方案 -->
@@ -518,7 +521,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "api/process";
+import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew, execTask} from "api/process";
 
 export default {
   name: "xmpg2Step6",
@@ -564,6 +567,9 @@ export default {
       processType: 1,
       isSubmit: false,
       saveLoading: false,
+      submitShow: false,
+      acceptShow: false,
+      todoId: '',
       showColumn: true,
       drawerTitle: "", //drawer标题
       modalshowflag: false, // drawer开关
@@ -785,6 +791,15 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg);
+            let commitStatus = res.commitStatus
+            if(commitStatus && commitStatus > 0){
+              this.acceptShow = true
+              this.submitShow = false
+            }else {
+              this.acceptShow = false
+              this.submitShow = true
+            }
+            this.todoId = res.id
             this.getFormFieldList(processForm);
           }
         }).catch(e => {
@@ -840,6 +855,19 @@ export default {
         this.saveLoading = false;
       });
     },
+    // 接受按钮
+    handleAccept(){
+      this.isSubmit = true
+      execTask({
+        todoId: this.todoId // 当前节点ID
+      }).then(res => {
+        if (res.sign && res.sign === '0') {
+          this.$message.success('接收成功')
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      })
+    },
     //提交事件
     handleSubmit() {
       this.isSubmit = true;

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -57,6 +57,14 @@
                   ></el-input>
                 </el-form-item>
                 <el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceList">选择清单</el-button>
+                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                          v-model="qdform.endTime"
+                          type="date"
+                          placeholder="请选择截止日期"
+                          value-format="yyyy-MM-dd">
+                  </el-date-picker>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -424,7 +432,8 @@ export default {
       qdform: {
         projectNumber: "",
         projectName: "",
-        detailedListName: ""
+        detailedListName: "",
+        endTime:'',
       },
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
@@ -444,7 +453,10 @@ export default {
         ],
         detailedListName: [
           { required: true, message: "请输入清单名称", trigger: "change" }
-        ]
+        ],
+        endTime: [
+          {required: true, message: '请输入截止时间', trigger: 'change'},
+        ],
       },
       // 角色验证
       roleFormRules: {

src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

@@ -384,13 +384,17 @@
     <ProcessFooter
       show-save
       show-transfer
+      show-affirm
       show-confirm
+      :show-submit="submitShow"
+      :show-confirm="acceptShow"
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @submit="handleSubmit"
       @transfer="handleTransfer"
       @save="handleSave"
+      @accept="handleAccept"
       :approval="true"
     >
     </ProcessFooter>
@@ -431,6 +435,9 @@ export default {
       processType: 1,
       isSubmit: false,
       saveLoading: false,
+      submitShow: false,
+      acceptShow: false,
+      todoId: '',
       projectId: "",
       detailedId: "",
       standModel: false,
@@ -568,6 +575,15 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg);
+            let commitStatus = res.commitStatus
+            if(commitStatus && commitStatus > 0){
+              this.acceptShow = true
+              this.submitShow = false
+            }else {
+              this.acceptShow = false
+              this.submitShow = true
+            }
+            this.todoId = res.id
             this.getFormFieldList(processForm);
           }
         }).catch(e => {
@@ -617,6 +633,19 @@ export default {
     //     });
     //   });
     // },
+    // 接受按钮
+    handleAccept(){
+      this.isSubmit = true
+      execTask({
+        todoId: this.todoId // 当前节点ID
+      }).then(res => {
+        if (res.sign && res.sign === '0') {
+          this.$message.success('接收成功')
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      })
+    },
     //保存事件
     handleSave() {
       this.saveLoading = true;

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1072,7 +1072,7 @@
         width="500"
         :data="standSystemOptions"
         :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-        :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+        :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -2406,6 +2406,9 @@ export default {
       this.modalShowFlag1 = false
       this.$forceUpdate()
     },
+    popoverHideCancel(){
+      this.modalShowFlag1  = false
+    },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -882,7 +882,8 @@
                       class="add-form-item"
                     >
                       <template slot="label">关联模块--乘用车VPPS编码</template>
-                      <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
+                      <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
+                                @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'KCCVPPSBM'">
@@ -1422,7 +1423,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-        :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+        :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -1433,7 +1434,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-        :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
+        :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"  @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -1444,7 +1445,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
+        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
       <!-- 导入失败 -->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -2220,7 +2221,6 @@ export default {
       this.urlChild = "sarModelTree/childByList"
     },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      debugger
       if (checkedData) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
@@ -2233,6 +2233,9 @@ export default {
       this.modalShowFlag2 = false
       this.$forceUpdate()
     },
+    popoverHideBusVsCancel(){
+      this.modalShowFlag2 = false
+    },
     popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData) {
         if (checkedData.length > 0) {
@@ -2245,6 +2248,8 @@ export default {
       }
       this.modalShowFlag3 = false
       this.$forceUpdate()
+    },popoverHideCarVsCancel(){
+      this.modalShowFlag3 = false
     },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData) {
@@ -2258,6 +2263,8 @@ export default {
       }
       this.modalShowFlag4 = false
       this.$forceUpdate()
+    },popoverHideModelCancel(){
+      this.modalShowFlag4 = false
     },
     // 将文本状态的id与name对应
     setMap(data) {