外部标准化协会流程

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue

@@ -16,36 +16,36 @@
         <div class="content_form">
           <el-form ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="120px">
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="标委会:">
                   {{ hh_pageData.associaName || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="分标委:">
                   {{ hh_pageData.associaNameOne || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="工作组:">
                   {{ hh_pageData.associaNameTwo || '-' }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="参会人:">
                   {{ hh_pageData.partPeople || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="参会时间:">
                   {{ hh_pageData.meetingStartTime || '-' }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="会议名称:">
                   {{ hh_pageData.meetingName || '-' }}
                 </el-form-item>
@@ -79,28 +79,12 @@
                 </el-table-column>
                 <el-table-column prop="material" label="资料" align="center">
                   <template slot-scope="scope">
-                    <el-upload
-                      :disabled="acceptShow"
-                      multiple
-                      ref="uploadFile"
-                      :action="actionPath"
-                      name="file"
-                      :file-list="scope.row.fileTextList"
-                      accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
-                      :before-upload="handleBeforeUpload"
-                      :before-remove="handleBeforeRemove"
-                      :on-success="handleOnsuccess"
-                    >
-                      <el-button type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
-                    </el-upload>
+                    <el-button type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
                   </template>
                 </el-table-column>
               </el-table>
             </el-form-item>
             <el-form-item>
-              <div style="text-align: right">
-                <el-button type="primary" size="small" @click="otherAdd">添加(测试用)</el-button>
-              </div>
               <el-table
                 :data="hh_pageData.themeTable"
                 border
@@ -110,27 +94,10 @@
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
                 <el-table-column type="index" label="序号" align="center" width="50"/>
-                <el-table-column label="议题" align="center" prop="meetingTheme">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.meetingTheme"></el-input>
-                  </template>
-                </el-table-column>
+                <el-table-column label="议题" align="center" prop="meetingTheme"/>
                 <el-table-column label="资料" align="center" prop="meetingFile" width="200">
                   <template slot-scope="scope">
-                    <el-upload
-                      :action="actionPath"
-                      :disabled="acceptShow"
-                      multiple
-                      ref="uploadThemeFile"
-                      name="themeFile"
-                      :file-list="scope.row.themeFileList"
-                      accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
-                      :before-upload="beforeUploadTheme"
-                      :before-remove="beforeRemoveTheme"
-                      :on-success="onsuccessTheme"
-                    >
-                      <el-button type="primary" size="mini" @click="uploadThemeTable(scope.row)">点击上传</el-button>
-                    </el-upload>
+                    <el-button type="primary" size="mini" @click="uploadThemeTable(scope.row)">点击上传</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -138,18 +105,17 @@
             <el-form-item label="其他资料:" prop="otherFile">
               <el-upload
                 :action="actionPath"
-                :disabled="acceptShow"
                 multiple
                 style="width: 30%"
                 ref="uploadOtherFile"
-                name="otherFile"
-                :file-list="otherFileList"
+                name="file"
+                :file-list="upOtherData"
                 accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                 :before-upload="beforeUploadOther"
                 :before-remove="beforeRemoveOther"
                 :on-success="onsuccessOther"
               >
-                <el-button type="primary" size="small" @click="otherBtn">点击上传</el-button>
+                <el-button type="primary" size="small">点击上传</el-button>
               </el-upload>
             </el-form-item>
           </el-form>
@@ -164,13 +130,13 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="参会人填写信息" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
+                  <h4>参会人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input>
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="参会人"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -207,6 +173,48 @@
       :nodeList="nodeListOne"
       @checkedRole="drawerCheckOne"
     />
+    <!--  标准号table上传弹框  -->
+    <el-dialog
+      :visible.sync="upDialog"
+      width="30%"
+      :before-close="handleClose">
+      <el-upload
+        :disabled="acceptShow"
+        multiple
+        ref="uploadFile"
+        :action="actionPath"
+        name="file"
+        :file-list="reData"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        :before-upload="handleBeforeUpload"
+        :before-remove="handleBeforeRemove"
+        :on-success="handleOnsuccess"
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em style="color: #0c91e5">点击上传</em></div>
+      </el-upload>
+    </el-dialog>
+    <!--  议题table上传弹框  -->
+    <el-dialog
+      :visible.sync="upThemeDialog"
+      width="30%"
+      :before-close="handleClose">
+      <el-upload
+        :disabled="acceptShow"
+        multiple
+        ref="uploadFile"
+        :action="actionPath"
+        name="file"
+        :file-list="themeData"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        :before-upload="beforeUploadTheme"
+        :before-remove="beforeRemoveTheme"
+        :on-success="onsuccessTheme"
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em style="color: #0c91e5">点击上传</em></div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -214,7 +222,8 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {startProcess, saveTaskFirst, completeTask, queryTaskFirst, inboundLiaisonDetail} from '@/api/process.js'
+import { saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
+
 export default {
   components: {
     ProcessHeader,
@@ -237,6 +246,7 @@ export default {
         partPeople: '',
         standardTable: [],
         themeTable: [],
+        otherFileList: [],
       },
       hh_rules: {},
       deleteDataList: [],
@@ -246,15 +256,13 @@ export default {
       nodeListOne: [],
 
       // 上传文件储存
-      fileTextList: [],
-      newDataList: [],
+      reData: [],
 
-      themeFileList: [],
-      newThemeFile: [],
+      themeData: [],
 
-      otherFileList: [],
-      newOtherFile: [],
+      upOtherData: [],
 
+      unqualidiedData: [],
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
@@ -263,6 +271,8 @@ export default {
       },
       roleFormRules: {},
 
+      upDialog: false,
+      upThemeDialog: false,
       isSubmit: false,
       saveLoading: false
     }
@@ -283,30 +293,36 @@ 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)
       })
     },
-    getFormFieldList (item) {
+    getFormFieldList(item) {
       this.$nextTick(() => {
-        let listJSON = JSON.parse(JSON.stringify(item)).hh_pageData
+        let formList = JSON.parse(JSON.stringify(item)).ch_pageData
+        if (formList === undefined) {
+          this.hh_pageData = JSON.parse(JSON.stringify(item)).hh_pageData
+          this.upOtherData = this.hh_pageData.otherFileList
+        } else {
+          this.hh_pageData.associaName = formList.associaName
+          this.hh_pageData.associaNameOne = formList.associaNameOne
+          this.hh_pageData.associaNameTwo = formList.associaNameTwo
+          this.hh_pageData.meetingStartTime = formList.meetingStartTime
+          this.hh_pageData.meetingName = formList.meetingName
+          this.hh_pageData.themeTable = formList.meetingTable
+          this.hh_pageData.themeTable.forEach(item=>{
+            this.$set(item,'meetingFile','')
+          })
+          this.hh_pageData.partPeople = this.$store.getters.userInfo.userName
+        }
       })
     },
 
     // 添加按钮
     table_add() {
       var list = {
-        standardId: this.standardId,
-        standardName: this.standardName,
-        material: this.material,
+        standardId: this.standardId = '',
+        standardName: this.standardName = '',
+        material: this.material = [],
       }
       this.hh_pageData.standardTable.push(list)
     },
@@ -341,39 +357,36 @@ export default {
       }
     },
 
-    otherAdd() {
-      var list = {
-        meetingTheme: this.meetingTheme,
-        meetingFile: this.meetingFile,
-      }
-      this.hh_pageData.themeTable.push(list)
-    },
     /** 标准号的表格上传 */
     // 标准号的表格上传按钮
     uploadTable(val) {
       this.fileListData = val
+      this.reData = this.fileListData.material
+      this.upDialog = true
     },
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {
-        if (this.fileTextList !== null) {
-          this.newDataList = this.fileTextList
-          this.newDataList.push({
-            id: res.data.attId,
-            name: res.data.standName
+        if (this.reData !== undefined) {
+          this.newDataList = this.reData
+            this.newDataList.push({
+              id: res.data.attId,
+              name: res.data.standName
           })
         } else {
-          this.newDataList.push({
-            id: res.data.attId,
-            name: res.data.standName
-          })
+            this.newDataList.push({
+              id: res.data.attId,
+              name: res.data.standName
+            })
         }
-        this.fileListData.fileText = this.newDataList
+
+        this.fileListData.material = this.newDataList
         this.$message({
           showClose: true,
           message: res.message,
           type: 'success'
         })
+        this.newDataList = []
         this.fileMadel = false
       }
     },
@@ -404,12 +417,16 @@ export default {
     },
     // 移除上传的文件
     handleBeforeRemove(file, fileList) {
-      this.fileData = fileList
-      this.fileTextList.forEach((item, index) => {
-        if (item.name === file.name || item.id === file.id ) {
-          this.fileTextList.splice(index,1)
+      this.reData.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.reData.splice(index, 1)
         }
       })
+      this.fileListData.material = this.reData
+    },
+    handleClose() {
+      this.upDialog = false
+      this.upThemeDialog = false
     },
 
 
@@ -417,28 +434,32 @@ export default {
     // 议题列表资料上传按钮
     uploadThemeTable(val) {
       this.themeDataList = val
+      this.upThemeDialog = this.themeDataList.meetingFile
+      this.upThemeDialog = true
+
     },
     // 文件上传成功
     onsuccessTheme(res, file, fileList) {
       if (res.ok) {
-        if (this.themeFileList !== null) {
-          this.newThemeFile = this.themeFileList
+        if (this.themeData !== null) {
+          this.newThemeFile = this.themeData
           this.newThemeFile.push({
             id: res.data.attId,
             name: res.data.standName
           })
         } else {
-          this.newThemeFile.push({
+          this.newDataList.push({
             id: res.data.attId,
             name: res.data.standName
           })
         }
-        this.themeDataList.fileText = this.newThemeFile
+        this.themeDataList.meetingFile = this.newThemeFile
         this.$message({
           showClose: true,
           message: res.message,
           type: 'success'
         })
+        this.newThemeFile = []
         this.fileMadel = false
       }
     },
@@ -469,24 +490,20 @@ export default {
     },
     // 移除上传的文件
     beforeRemoveTheme(file, fileList) {
-      this.fileData = fileList
-      this.themeFileList.forEach((item, index) => {
-        if (item.name === file.name || item.id === file.id ) {
-          this.themeFileList.splice(index,1)
+      this.themeData.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.themeData.splice(index, 1)
         }
       })
+      this.themeDataList.meetingFile = this.themeData
     },
 
     /** 其他资料上传 */
-    // 其他资料上传按钮
-    otherBtn(val) {
-      this.otherDataList = val
-    },
     // 文件上传成功
     onsuccessOther(res, file, fileList) {
       if (res.ok) {
-        if (this.otherFileList !== null) {
-          this.newOtherFile = this.otherFileList
+        if (this.hh_pageData.otherFileList !== null) {
+          this.newOtherFile = this.hh_pageData.otherFileList
           this.newOtherFile.push({
             id: res.data.attId,
             name: res.data.standName
@@ -497,7 +514,7 @@ export default {
             name: res.data.standName
           })
         }
-        this.otherDataList.fileText = this.newOtherFile
+        this.hh_pageData.otherFileList = this.newOtherFile
         this.$message({
           showClose: true,
           message: res.message,
@@ -533,12 +550,12 @@ export default {
     },
     // 移除上传的文件
     beforeRemoveOther(file, fileList) {
-      this.fileData = fileList
-      this.otherFileList.forEach((item, index) => {
-        if (item.name === file.name || item.id === file.id ) {
-          this.otherFileList.splice(index,1)
+      this.upOtherData.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.upOtherData.splice(index, 1)
         }
       })
+      this.hh_pageData.otherFileList = this.upOtherData
     },
 
     /** 法规工程师选择 */
@@ -567,7 +584,7 @@ export default {
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
-      _formData.append('prcType', '20')
+      _formData.append('prcType', '22')
       _formData.append('json', JSON.stringify({
         roleForm: this.roleForm,
         hh_pageData: this.hh_pageData
@@ -583,32 +600,24 @@ export default {
     /** 提交按钮*/
     handleSubmit() {
       let json = {
-        prcCreateUser: this.$store.getters.userInfo.userId,
-        prcCreateUserName: this.$store.getters.userInfo.userName,
         hh_pageData: this.hh_pageData,
-        director: this.roleForm.engineerUserId,
+        // director: this.roleForm.engineerUserId,
       }
       this.$refs['hh_pageData'].validate((valid) => {
         if (valid) {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              const paramsInfo = {
-                type: '22'
-              }
-              startProcess(paramsInfo).then(res => {
-                this.taskID = res.data
-                const params = new FormData();
-                params.set('json', JSON.stringify(json))
-                params.set('userId', this.$store.getters.userInfo.userId)
-                params.set('taskId', this.taskID)
-                completeTask(params).then(res => {
-                  if (res.success === true) {
-                    this.$message.success('提交成功')
-                    this.$router.push("/processCenter");
-                  }
-                  this.isSubmit = false
-                })
+              const params = new FormData();
+              params.set('json', JSON.stringify(json))
+              params.set('userId', this.$store.getters.userInfo.userId)
+              params.set('taskId', this.taskIds)
+              completeTask(params).then(res => {
+                if (res.success === true) {
+                  this.$message.success('提交成功')
+                  this.$router.push("/processCenter");
+                }
+                this.isSubmit = false
               })
             }
           })
@@ -684,16 +693,33 @@ export default {
     }
   }
 
+  /deep/ .el-dialog__body {
+    padding-top: 0;
+    text-align: center;
+
+    .el-upload-list__item:first-child {
+      margin-top: 20px;
+    }
+
+    .el-icon-upload:before {
+      font-size: 60px;
+      color: #7EC4CC;
+    }
+  }
+
   .content_form {
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }
+
     /deep/ .el-input__inner {
       text-align: center;
     }
+
     .table_btn {
       text-align: right;;
     }

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="bzhhStep1">
+  <div class="bzhhStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化会后管理流程</template>
       <template slot="proNode">审批</template>
@@ -16,36 +16,36 @@
         <div class="content_form">
           <el-form ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="120px">
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="标委会:">
                   {{ hh_pageData.associaName || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="分标委:">
                   {{ hh_pageData.associaNameOne || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="工作组:">
                   {{ hh_pageData.associaNameTwo || '-' }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="参会人:">
                   {{ hh_pageData.partPeople || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="参会时间:">
                   {{ hh_pageData.meetingStartTime || '-' }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="会议名称:">
                   {{ hh_pageData.meetingName || '-' }}
                 </el-form-item>
@@ -66,12 +66,7 @@
                 <el-table-column prop="standardName" label="标准名称" align="center"/>
                 <el-table-column prop="material" label="资料" align="center">
                   <template slot-scope="scope">
-                    <el-upload
-                      :action="actionPath"
-                      name="file"
-                      :file-list="scope.row.fileTextList"
-                    >
-                    </el-upload>
+                    <el-button size="mini" type="primary" @click="materialBtn(scope.row)">查看</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -89,21 +84,16 @@
                 <el-table-column label="议题" align="center" prop="meetingTheme"></el-table-column>
                 <el-table-column label="资料" align="center" prop="meetingFile">
                   <template slot-scope="scope">
-                    <el-upload
-                      :action="''"
-                      name="themeFile"
-                      :file-list="scope.row.themeFileList"
-                      :on-preview="onPreviewTheme(scope.row)"
-                    />
+                   <el-button type="primary" size="mini" @click="meetingFileBtn(scope.row)">查看</el-button>
                   </template>
                 </el-table-column>
               </el-table>
             </el-form-item>
             <el-form-item label="其他资料:" prop="otherFile">
               <el-upload
-                :action="actionPath"
-                name="otherFile"
-                :file-list="otherFileList"
+                :action="''"
+                name="name"
+                :file-list="otherFile"
                 :on-preview="onPreviewOther"
               >
               </el-upload>
@@ -192,6 +182,39 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :isSubmitBack="isBack"
+      @back="handleSubmitNo"
+      @submit="handleSubmit"
+    />
+
+    <el-dialog
+      :visible.sync="materialDialog"
+      width="30%"
+      :before-close="handleClose">
+      <el-upload
+        :action="''"
+        name="file"
+        :file-list="fileTextList"
+        :on-preview="handleOnPreview"
+      >
+      </el-upload>
+    </el-dialog>
+    <el-dialog
+      :visible.sync="meetingFileDialog"
+      width="30%"
+      :before-close="handleClose">
+      <el-upload
+        :action="''"
+        name="file"
+        :file-list="themeFileList"
+        :on-preview="onPreviewTheme"
+      >
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -213,6 +236,7 @@ export default {
       actionPath: 'api/att/attFile/upload',
       acceptShow: false,
       active: '1',
+      loading: false,
       hh_pageData: {
         associaName: '',
         associaNameOne: '',
@@ -227,10 +251,17 @@ export default {
 
       fileTextList: [],
       themeFileList: [],
-      otherFileList: [],
+      otherFile: [],
 
+      materialDialog: false,
+      meetingFileDialog: false,
       hh_rules: {},
       detailData: [],
+
+      isBack: false,
+      isSubmit: false,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
     }
   },
   computed: {
@@ -275,11 +306,24 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.hh_pageData = JSON.parse(JSON.stringify(item)).hh_pageData
-        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
-        // this.rh_pageData.comityFileNum = this.fileTextList
+        this.otherFile = this.hh_pageData.otherFileList
       })
     },
 
+    /** 标准号列表查看按钮 */
+    materialBtn(val) {
+      this.fileTextList = val.material
+      this.materialDialog = true
+    },
+    /** 议题列表查看按钮 */
+    meetingFileBtn(val) {
+      this.themeFileList = val.material
+      this.meetingFileDialog = true
+    },
+    handleClose() {
+      this.materialDialog = false
+      this.meetingFileDialog = false
+    },
     // 点击上传的文件进行下载
     handleOnPreview(file) {
       let attId = file.id
@@ -302,6 +346,55 @@ export default {
       }
     },
 
+    // 退回按钮
+    handleSubmitNo() {
+      let json = {
+        passFlag: '0',
+        commentText: this.commentText,
+        hh_pageData: this.hh_pageData,
+      }
+      this.$refs['hh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isBack = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('退回成功')
+              this.$router.push("/processCenter");
+            }
+            this.isBack = false
+          });
+        }
+      })
+    },
+    // 提交按钮
+    handleSubmit() {
+      let json = {
+        passFlag: '1',
+        commentText: this.commentText,
+        ch_pageData: this.ch_pageData,
+      }
+      this.$refs['hh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false
+          });
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -380,6 +473,21 @@ export default {
     /deep/ .el-input__inner {
       text-align: center;
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     .table_btn {
       text-align: right;;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -40,7 +40,7 @@
                       v-for="item in associaNameOptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -53,7 +53,7 @@
                       v-for="item in associaNameOptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -66,7 +66,7 @@
                       v-for="item in associaNameOptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -77,6 +77,7 @@
                   <el-date-picker
                     v-model="ch_pageData.meetingStartTime"
                     type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     placeholder="选择日期时间"
                     align="right">
                   </el-date-picker>
@@ -103,7 +104,7 @@
                       v-for="item in feeKindOptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -112,14 +113,14 @@
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
                   <el-upload
-                    style="width: 30%"
+                    style="width: 70%"
                     class="upload_style"
                     :disabled="acceptShow"
                     multiple
                     ref="uploadFile"
                     :action="uploadPath"
                     name="file"
-                    :file-list="fileTextList"
+                    :file-list="ch_pageData.fileTextList"
                     accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                     :before-upload="handleBeforeUpload"
                     :before-remove="handleBeforeRemove"
@@ -129,7 +130,6 @@
                       :disabled="acceptShow"
                       type="primary"
                       class="common-button-primary"
-                      @click="uploadFile"
                       size="mini">
                       点击上传
                     </el-button>
@@ -345,6 +345,7 @@ export default {
         uploadFile: '',
         sort: '1',
         meetingTable: [],
+        fileTextList: [],
       },
       associaNameOptions: [
         {value: '0', label: '国内法规入库流程'},
@@ -361,7 +362,6 @@ export default {
       // 上传路径
       uploadPath: 'api/att/attFile/upload',
       // 上传所储存文件数组
-      fileTextList: [],
       newDataList: [],
 
       ch_rules: {},
@@ -398,9 +398,9 @@ export default {
     },
 
     //上传按钮
-    uploadFile(val) {
+   /* uploadFile(val) {
       this.fileListData = val
-    },
+    },*/
     // 文件上传限制条件
     handleBeforeUpload(file) {
       var filename = file.name
@@ -429,17 +429,17 @@ export default {
     // 移除上传的文件
     handleBeforeRemove(file, fileList) {
       this.fileData = fileList
-      this.fileTextList.forEach((item, index) => {
+      this.ch_pageData.fileTextList.forEach((item, index) => {
         if (item.name === file.name || item.id === file.id) {
-          this.fileTextList.splice(index, 1)
+          this.ch_pageData.fileTextList.splice(index, 1)
         }
       })
     },
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {
-        if (this.fileTextList !== null) {
-          this.newDataList = this.fileTextList
+        if (this.ch_pageData.fileTextList !== null) {
+          this.newDataList = this.ch_pageData.fileTextList
           this.newDataList.push({
             id: res.data.attId,
             name: res.data.standName
@@ -450,7 +450,7 @@ export default {
             name: res.data.standName
           })
         }
-        this.rh_pageData.infoSources = this.newDataList
+        this.ch_pageData.fileTextList = this.newDataList
         this.$message({
           showClose: true,
           message: res.message,

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -14,7 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -59,7 +59,12 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i></i>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :disabled="acceptShow"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -208,6 +213,7 @@ export default {
     return {
       active: '1',
 
+      acceptShow: false,
       ch_pageData: {},
       ch_rules: {},
       nodeList: [],
@@ -397,6 +403,20 @@ export default {
     /deep/.el-textarea__inner {
       font-family: inherit;
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     /deep/.el-table th {
       padding: 0px;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue

@@ -14,7 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -59,7 +59,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i></i>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -476,6 +480,21 @@ export default {
       font-family: inherit;
     }
 
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     /deep/ .el-table th {
       padding: 0px;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue

@@ -14,7 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -59,7 +59,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i/>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -413,6 +417,21 @@ export default {
     /deep/.el-textarea__inner {
       font-family: inherit;
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     /deep/.el-table th {
       padding: 0px;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue

@@ -14,7 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -59,7 +59,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i/>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -422,6 +426,21 @@ export default {
     /deep/.el-table th {
       padding: 0px;
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     .myPart_btn {
       text-align: right;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue

@@ -17,7 +17,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -62,7 +62,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i/>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -454,6 +458,21 @@ export default {
         text-align: center;
       }
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     /deep/.el-table th {
       padding: 0px;
     }

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -1510,16 +1510,29 @@ export default {
 
           break
         case '22':
-          this.$router.push({
+          if (row.taskInfo === '参会人上传会议资料，填写标准及议题') {
+            this.$router.push({
+              name: 'bzhhStep1',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else {
+            this.$router.push({
             name: 'bzhhStep2',
-            query:{
-              taskIds: row.taskIds,
-              prcId: row.prcId,
-              prcNum: row.prcNum,
-              prcName: row.prcName,
-              prcType: row.prcType
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
             }
           })
+        }
           break
       }
     },

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -518,6 +518,16 @@ export default {
             }
           })
           break
+        case '22':
+          this.$router.push({
+            name: 'bzhhStep1',
+            query: {
+              type: '22',
+              processName: '外部标准化会后管理流程',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),