入会流程

2021-12-03 11:24:04 +08:00
parent 1cc9edc022
commit 691f139158
6 changed files with 451 additions and 314 deletions
@@ -67,7 +67,7 @@
                      v-for="item in comityRoleOptions"
                      :key="item.value"
                      :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                  </el-select>
                </el-form-item>
              </el-col>
@@ -80,7 +80,7 @@
                      v-for="item in comityStateOptions"
                      :key="item.value"
                      :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                  </el-select>
                </el-form-item>
              </el-col>
@@ -93,7 +93,7 @@
                      v-for="item in comityKindOptions"
                      :key="item.value"
                      :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                  </el-select>
                </el-form-item>
              </el-col>
@@ -161,7 +161,7 @@
              </el-form>
            </el-form-item>
            <el-form-item  class="add-form-item"  label="工作方向:" prop="workPath">
-              <el-input v-model="rh_pageData.workPath" type="textarea"/>
+              <el-input v-model="rh_pageData.workPath" type="textarea" placeholder="请填写工作方向"/>
            </el-form-item>
            <el-form-item  class="add-form-item"  label="协会外部联系方式:" style="margin-bottom: 50px">
              <div class="comityTel_btn">
@@ -196,7 +196,7 @@
                  align="center"
                  label="联络人">
                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_name"/>
+                    <el-input v-model="scope.row.tel_name" placeholder="请填写联络人"/>
                  </template>
                </el-table-column>
                <el-table-column
@@ -204,7 +204,7 @@
                  align="center"
                  label="单位">
                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_unit"/>
+                    <el-input v-model="scope.row.tel_unit" placeholder="请填写单位"/>
                  </template>
                </el-table-column>
                <el-table-column
@@ -212,7 +212,7 @@
                  align="center"
                  label="电话">
                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_phone"/>
+                    <el-input v-model="scope.row.tel_phone" placeholder="请填写单位"/>
                  </template>
                </el-table-column>
                <el-table-column
@@ -220,7 +220,7 @@
                  align="center"
                  label="邮箱">
                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_mail"/>
+                    <el-input v-model="scope.row.tel_mail" placeholder="请填写邮箱"/>
                  </template>
                </el-table-column>
              </el-table>
@@ -228,6 +228,19 @@
          </el-form>
        </div>
      </div>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
    </div>
    <div class="content" v-show="active === '2'">
      <div class="block" style="padding-top: 20px;">
@@ -469,6 +482,8 @@ export default {
      nodeListOne: [],
      isSubmit: false,
      saveLoading: false,
+
+      commentText: '',
    }
  },

@@ -530,6 +545,7 @@ export default {
          this.fileTextList.splice(index, 1)
        }
      })
+      this.rh_pageData.infoSources = this.fileTextList
    },
    // 文件上传成功
    handleOnsuccess(res, file, fileList) {
@@ -547,6 +563,7 @@ export default {
          })
        }
        this.fileListData.fileText = this.newDataList
+        this.rh_pageData.infoSources = this.newDataList
        this.$message({
          showClose: true,
          message: res.message,
@@ -663,7 +680,8 @@ export default {
      _formData.append('prcType', '20')
      _formData.append('json', JSON.stringify({
        roleForm: this.roleForm,
-        rh_pageData: this.rh_pageData
+        rh_pageData: this.rh_pageData,
+        commentText: this.commentText
      }))
      saveTaskFirst(_formData).then(res => {
        this.saveLoading = false
@@ -675,41 +693,46 @@ export default {
    },
    // 提交按钮
    handleSubmit() {
-      let json = {
-        prcCreateUser: this.$store.getters.userInfo.userId,
-        prcCreateUserName: this.$store.getters.userInfo.userName,
-        roleList: this.roleForm,
-        rh_pageData: this.rh_pageData,
-        directorList: this.rh_pageData.comityInRoleId,
-      }
-      this.$refs['rh_pageData'].validate((valid) => {
-        if (valid) {
-          this.$refs['roleForm'].validate((valid) => {
-            if (valid) {
-              this.isSubmit = true
-              const paramsInfo = {
-                type: '20'
-              }
-              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
-                })
-              })
-            } else {
-              this.$message.warning('请完成流程信息的人员选择')
-            }
-          })
+      if (this.commentText === '') {
+        this.$message.warning('请输入回执说明')
+      } else {
+        let json = {
+          prcCreateUser: this.$store.getters.userInfo.userId,
+          prcCreateUserName: this.$store.getters.userInfo.userName,
+          roleList: this.roleForm,
+          rh_pageData: this.rh_pageData,
+          commentText: this.commentText,
+          directorList: this.rh_pageData.comityInRoleId,
        }
-      })
+        this.$refs['rh_pageData'].validate((valid) => {
+          if (valid) {
+            this.$refs['roleForm'].validate((valid) => {
+              if (valid) {
+                this.isSubmit = true
+                const paramsInfo = {
+                  type: '20'
+                }
+                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
+                  })
+                })
+              } else {
+                this.$message.warning('请完成流程信息的人员选择')
+              }
+            })
+          }
+        })
+      }
    }
  }
 }
@@ -15,18 +15,6 @@
        </ProcessTitle>
        <div class="content_form">
          <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="8">
-                <el-form-item  class="add-form-item"  label="文件编号:" prop="comityFileNum">
-                  {{ rh_pageData.comityFileNum || '-' }}
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item  class="add-form-item"  label="文件名称:" prop="comityFileName">
-                  {{ rh_pageData.comityFileName || '-' }}
-                </el-form-item>
-              </el-col>
-            </el-row>
            <el-row>
              <el-col :span="8">
                <el-form-item  class="add-form-item"  label="协会名称:">
@@ -75,8 +63,18 @@
                </el-form-item>
              </el-col>
            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item  class="add-form-item"  label="信息来源:" prop="infoSources">
+                  <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
+                  <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';'}}
+                   </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
            <el-form-item  class="add-form-item"  label="工作方向:" prop="workPath">
-              <el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" style="width: 50%;height: auto"></el-input>
+              <el-input v-model="rh_pageData.workPath" type="textarea" readonly style="width: 50%;height: auto"></el-input>
            </el-form-item>
            <el-form-item  class="add-form-item"  label="协会外部联系方式:">
              <el-table
@@ -108,7 +106,7 @@
        </div>
      </div>
      <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
          <div style="margin: 10px 0;">
            <el-input
              type="textarea"
@@ -257,6 +255,8 @@ export default {

      taskIds: this.$route.query.taskIds,
      pId: this.$route.query.prcId,
+
+      infoSourcesLength: ''
    }
  },
  computed: {
@@ -298,6 +298,7 @@ export default {
        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
        this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName
        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.infoSourcesLength = this.rh_pageData.infoSources.length
        // this.rh_pageData.comityFileNum = this.fileTextList
      })
    },
@@ -305,57 +306,73 @@ export default {
    handleTabs(name) {
      this.active = name
    },
+
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
    // 退回按钮
    handleSubmitNo() {
-      let json = {
-        roleList: this.roleForm,
-        memberId: this.$store.getters.userInfo.userId,
-        passFlag: '0',
-        commentText: this.commentText,
-        rh_pageData: this.rh_pageData,
-      }
-      this.$refs['rh_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
-          });
+      if (this.commentText === '') {
+        this.$message.warning('请输入审批意见')
+      } else {
+        let json = {
+          roleList: this.roleForm,
+          memberId: this.$store.getters.userInfo.userId,
+          passFlag: '0',
+          commentText: this.commentText,
+          rh_pageData: this.rh_pageData,
        }
-      })
+        this.$refs['rh_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 = {
-        roleList: this.roleForm,
-        memberId: this.$store.getters.userInfo.userId,
-        passFlag: '1',
-        commentText: this.commentText,
-        rh_pageData: this.rh_pageData,
-      }
-      this.$refs['rh_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
-          });
+      if (this.commentText === '') {
+        this.$message.warning('请输入审批意见')
+      } else {
+        let json = {
+          roleList: this.roleForm,
+          memberId: this.$store.getters.userInfo.userId,
+          passFlag: '1',
+          commentText: this.commentText,
+          rh_pageData: this.rh_pageData,
        }
-      })
+        this.$refs['rh_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
+            });
+          }
+        })
+      }
    }
  }
 }
@@ -15,18 +15,6 @@
        </ProcessTitle>
        <div class="content_form">
          <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px">
-            <el-row>
-              <el-col :span="8">
-                <el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
-                  {{ rh_pageData.comityFileNum || '-' }}
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
-                  {{ rh_pageData.comityFileName || '-' }}
-                </el-form-item>
-              </el-col>
-            </el-row>
            <el-row>
              <el-col :span="8">
                <el-form-item class="add-form-item" label="协会名称:">
@@ -75,6 +63,16 @@
                </el-form-item>
              </el-col>
            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item  class="add-form-item"  label="信息来源:" prop="infoSources">
+                  <span v-if="infoSourcesLength < 1">{{ '-' }}</span>
+                  <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';'}}
+                   </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
            <el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-top: 10px">
              <el-table
                :data="rh_pageData.comityTel"
@@ -158,6 +156,7 @@
                <el-form-item class="add-form-item" label="参与人部门领导:">
                  <el-input
                    style="width: 100%"
+                    readonly
                    placeholder="请填写"
                    v-model="rh_pageData.fillLeader"
                    @click.native="choiceZRR"
@@ -177,6 +176,19 @@
          </el-form>
        </div>
      </div>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
    </div>
    <div class="content" v-show="active === '3'">
      <div class="flow-list">
@@ -303,6 +315,7 @@ export default {
        workPath: '',
        comityTel: [],
        fillPeople: '',
+        fillPeopleId: '',
        fillUnit: '',
        fillDept: '',
        fillPost: '',
@@ -324,6 +337,8 @@ export default {

      taskIds: this.$route.query.taskIds,
      pId: this.$route.query.prcId,
+      commentText: '',
+      infoSourcesLength: ''
    }
  },
  computed: {
@@ -364,7 +379,9 @@ export default {
      this.$nextTick(() => {
        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
        this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
+        this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.infoSourcesLength = this.rh_pageData.infoSources.length
        // this.rh_pageData.comityFileNum = this.fileTextList
      })
    },
@@ -409,29 +426,41 @@ export default {
    },
    // 提交按钮
    handleSubmit() {
-      let json = {
-        roleList: this.roleForm,
-        selfUser: this.$store.getters.userInfo.userId,
-        charge: this.rh_pageData.fillLeaderId,
-        rh_pageData: this.rh_pageData,
-      }
-      this.$refs['rh_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
-          });
+      if (this.commentText === '') {
+        this.$message.warning('请输入回执说明')
+      } else {
+        let json = {
+          roleList: this.roleForm,
+          selfUser: this.$store.getters.userInfo.userId,
+          charge: this.rh_pageData.fillLeaderId,
+          rh_pageData: this.rh_pageData,
        }
-      })
-    }
+        this.$refs['rh_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
+            });
+          }
+        })
+      }
+
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
  }
 }
 </script>
@@ -15,18 +15,6 @@
        </ProcessTitle>
        <div class="content_form">
          <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="8">
-                <el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
-                  {{ rh_pageData.comityFileNum || '-' }}
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
-                  {{ rh_pageData.comityFileName || '-' }}
-                </el-form-item>
-              </el-col>
-            </el-row>
            <el-row>
              <el-col :span="8">
                <el-form-item class="add-form-item" label="协会名称:">
@@ -75,6 +63,16 @@
                </el-form-item>
              </el-col>
            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item  class="add-form-item"  label="信息来源:" prop="infoSources">
+                  <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
+                  <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';'}}
+                   </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
            <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
              <el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" style="width: 50%;height: auto"></el-input>
            </el-form-item>
@@ -116,7 +114,7 @@
        </div>
      </div>
      <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
          <div style="margin: 10px 0;">
            <el-input
              type="textarea"
@@ -250,6 +248,7 @@ export default {
        workPath: '',
        comityTel: [],
        fillPeople: '',
+        fillPeopleId: '',
        fillUnit: '',
        fillDept: '',
        fillPost: '',
@@ -271,6 +270,8 @@ export default {

      taskIds: this.$route.query.taskIds,
      pId: this.$route.query.prcId,
+
+      infoSourcesLength: ''
    }
  },
  computed: {
@@ -314,7 +315,9 @@ export default {
    getFormFieldList (item) {
      this.$nextTick(() => {
        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.infoSourcesLength = this.rh_pageData.infoSources.length
        this.rh_pageData.myPartRole = [{
+          fillPeopleId: this.rh_pageData.fillPeopleId,
          fillPeople: this.rh_pageData.fillPeople,
          fillUnit: this.rh_pageData.fillUnit,
          fillDept: this.rh_pageData.fillDept,
@@ -331,57 +334,73 @@ export default {

    // 退回按钮
    handleSubmitNo() {
-      let json = {
-        member: this.selfUser,
-        passFlag: '0',
-        roleList: this.roleForm,
-        commentText: this.textarea,
-        rh_pageData: this.rh_pageData,
-      }
-      this.$refs['rh_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
-          });
+      if(this.textarea === '') {
+        this.$message.warning('请输入审批意见')
+      } else {
+        let json = {
+          member: this.selfUser,
+          passFlag: '0',
+          roleList: this.roleForm,
+          commentText: this.textarea,
+          rh_pageData: this.rh_pageData,
        }
-      })
+        this.$refs['rh_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 = {
-        member: this.selfUser,
-        passFlag: '1',
-        engineerSum: this.roleForm.startUser,
-        roleList: this.roleForm,
-        commentText: this.textarea,
-        rh_pageData: this.rh_pageData,
-      }
-      this.$refs['rh_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
-          });
+      if(this.textarea === '') {
+        this.$message.warning('请输入审批意见')
+      } else {
+        let json = {
+          member: this.selfUser,
+          passFlag: '1',
+          engineerSum: this.roleForm.startUser,
+          roleList: this.roleForm,
+          commentText: this.textarea,
+          rh_pageData: this.rh_pageData,
        }
-      })
-    }
+        this.$refs['rh_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
+            });
+          }
+        })
+      }
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
  }
 }
 </script>
@@ -15,18 +15,6 @@
        </ProcessTitle>
        <div class="content_form">
          <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="8">
-                <el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
-                  {{ rh_pageData.comityFileNum || '-' }}
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
-                  {{ rh_pageData.comityFileName || '-' }}
-                </el-form-item>
-              </el-col>
-            </el-row>
            <el-row>
              <el-col :span="8">
                <el-form-item class="add-form-item" label="协会名称:">
@@ -75,6 +63,16 @@
                </el-form-item>
              </el-col>
            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item  class="add-form-item"  label="信息来源:" prop="infoSources">
+                  <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
+                  <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';'}}
+                   </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
            <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
              <el-input v-model="rh_pageData.workPath" type="textarea" style="width: 50%;height: auto"></el-input>
            </el-form-item>
@@ -154,6 +152,19 @@
          </el-form>
        </div>
      </div>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
    </div>
    <div class="content" v-show="active === '3'">
      <div class="flow-list">
@@ -294,6 +305,10 @@ export default {

      taskIds: this.$route.query.taskIds,
      pId: this.$route.query.prcId,
+      deleteDataList: [],
+
+      infoSourcesLength: '',
+      commentText: ''
    }
  },
  computed: {
@@ -338,6 +353,7 @@ export default {
      this.$nextTick(() => {
        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.infoSourcesLength = this.rh_pageData.infoSources.length
        // this.rh_pageData.comityFileNum = this.fileTextList
      })
    },
@@ -356,7 +372,7 @@ export default {
          this.deleteDataList.map(item => {
            let index;
            index = this.rh_pageData.myPartRole.findIndex(items => {
-              return items.id === item;
+              return items === item;
            });
            if (index > -1) {
              this.rh_pageData.myPartRole.splice(index, 1);
@@ -374,13 +390,32 @@ export default {
    },
    // 保存按钮
    handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('taskIds', this.taskIds)
+      _formData.append('json', JSON.stringify({
+        rh_pageData: this.rh_pageData,
+        roleList: this.roleForm,
+        commentText: this.commentText
+      }))
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
    },
    // 提交按钮
    handleSubmit() {
+      if (this.commentText === '') {
+        this.$message.warning('请输入回执说明')
+      } else {
        let json = {
          leader: this.roleForm.leaderUserId,
          rh_pageData: this.rh_pageData,
          roleList: this.roleForm,
+          commentText: this.commentText
        }
        this.$refs['rh_pageData'].validate((valid) => {
          if (valid) {
@@ -398,7 +433,17 @@ export default {
            });
          }
        })
-    }
+      }
+
+    },
+
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
  }
 }
 </script>
@@ -18,18 +18,6 @@
        </ProcessTitle>
        <div class="content_form">
          <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="8">
-                <el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
-                  {{ rh_pageData.comityFileNum || '-' }}
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
-                  {{ rh_pageData.comityFileName || '-' }}
-                </el-form-item>
-              </el-col>
-            </el-row>
            <el-row>
              <el-col :span="8">
                <el-form-item class="add-form-item" label="协会名称:">
@@ -78,8 +66,18 @@
                </el-form-item>
              </el-col>
            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item  class="add-form-item"  label="信息来源:" prop="infoSources">
+                  <span v-if="infoSourcesLength < 1">{{ '-' }}</span>
+                  <span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';'}}
+                   </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
            <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
-              <el-input v-model="rh_pageData.workPath" type="textarea" style="width: 50%;height: auto"></el-input>
+              <el-input v-model="rh_pageData.workPath" readonly type="textarea" style="width: 50%;height: auto"></el-input>
            </el-form-item>
            <el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-top: 10px">
              <el-table
@@ -98,15 +96,6 @@
              </el-table>
            </el-form-item>
            <el-form-item class="add-form-item" label="我司参与人员:" style="margin-top: 10px">
-              <div class="myPart_btn">
-                <el-button
-                  type="danger"
-                  size="small"
-                  icon="el-icon-delete"
-                  @click="del_paryForm">
-                  批量删除
-                </el-button>
-              </div>
              <el-table
                :data="rh_pageData.myPartRole"
                border
@@ -129,6 +118,19 @@
          </el-form>
        </div>
      </div>
+      <el-collapse accordion>
+        <el-collapse-item :title="textTitle">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              :placeholder="textHolder"
+              v-model="textarea">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
    </div>
    <div class="content" v-show="active === '3'">
      <div class="flow-list">
@@ -277,6 +279,11 @@ export default {
      taskInfo: this.$route.query.taskInfo,
      taskIds: this.$route.query.taskIds,
      pId: this.$route.query.prcId,
+
+      infoSourcesLength: '',
+
+      textTitle: '审批意见',
+      textHolder: '请输入审批意见'
    }
  },
  computed: {
@@ -308,6 +315,10 @@ export default {
    },

    getData() {
+      if (this.taskInfo === '标准法规工程师汇总修订完毕') {
+        this.textTitle = '回执说明'
+        this.textHolder = '请输入回执说明'
+      }
      const params = {
        taskIds: this.taskIds,
        pId: this.pId,
@@ -321,114 +332,107 @@ export default {
      this.$nextTick(() => {
        this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.infoSourcesLength = this.rh_pageData.infoSources.length
        // this.rh_pageData.comityFileNum = this.fileTextList
      })
    },
-    /** 批量删除 */
-    del_paryForm() {
-      if (this.deleteDataList.length < 1) {
-        this.$message.warning("请选择一条数据进行删除");
-      } else {
-        this.$confirm("您确认删除这些数据?", "提示", {
-          confirmButtonText: "确认",
-          confirmButtonClass: "common-button-primary",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          let exits = [];
-          this.deleteDataList.map(item => {
-            let index;
-            index = this.rh_pageData.myPartRole.findIndex(items => {
-              return items.id === item;
-            });
-            if (index > -1) {
-              this.rh_pageData.myPartRole.splice(index, 1);
-            }
-            exits.push(item);
-          });
-          this.deleteDataList = [];
-        }).catch(() => {
-        });
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
      }
    },
-
    selectedDelete(val) {
      this.deleteDataList = val
    },
    // 退回按钮
    handleSubmitNo() {
-      let json = {
-        passFlag:  '0',
-        rh_pageData: this.rh_pageData,
-        roleList: this.roleForm
-      }
-      if (this.taskInfo === '标准法规部主管领导审核') {
-        json.manageDepartmentList = this.roleForm.feeUserId
-      } else if (this.taskInfo === '费用管理部门会签') {
-        json.manageDepartment = this.$store.getters.userInfo.userId
-        json.president = this.roleForm.engineerUserId
-      } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
-        json.engineerSumDone = this.roleForm.startUser
+      if (this.textarea === '') {
+        this.$message.warning('请输入反馈意见')
      } else {
-        json = {
+        let json = {
+          passFlag:  '0',
          rh_pageData: this.rh_pageData,
          roleList: this.roleForm
        }
-      }
-      this.$refs['rh_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
-          });
+        if (this.taskInfo === '标准法规部主管领导审核') {
+          json.manageDepartmentList = this.roleForm.feeUserId
+        } else if (this.taskInfo === '费用管理部门会签') {
+          json.manageDepartment = this.$store.getters.userInfo.userId
+          json.president = this.roleForm.engineerUserId
+        } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+          json.engineerSumDone = this.roleForm.startUser
+        } else {
+          json = {
+            rh_pageData: this.rh_pageData,
+            roleList: this.roleForm
+          }
        }
-      })
+        this.$refs['rh_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',
-        rh_pageData: this.rh_pageData,
-        roleList: this.roleForm
-      }
-      if (this.taskInfo === '标准法规部主管领导审核') {
-        json.manageDepartmentList = this.roleForm.feeUserId
-      } else if (this.taskInfo === '费用管理部门会签') {
-        json.manageDepartment = this.$store.getters.userInfo.userId
-        json.president = this.roleForm.engineerUserId
-      } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
-        json.engineerSumDone = this.roleForm.startUser
+      if (this.textarea === '') {
+        if (this.taskInfo === '标准法规工程师汇总修订完毕') {
+          this.$message.warning('请输入回执说明')
+        } else {
+          this.$message.warning('请输入反馈意见')
+        }
      } else {
-        json = {
+        let json = {
+          passFlag: '1',
          rh_pageData: this.rh_pageData,
+          commentText: this.textarea,
          roleList: this.roleForm
        }
-      }
-      this.$refs['rh_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
-          });
+        if (this.taskInfo === '标准法规部主管领导审核') {
+          json.manageDepartmentList = this.roleForm.feeUserId
+        } else if (this.taskInfo === '费用管理部门会签') {
+          json.manageDepartment = this.$store.getters.userInfo.userId
+          json.president = this.roleForm.engineerUserId
+        } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+          json.engineerSumDone = this.roleForm.startUser
+        } else {
+          json = {
+            rh_pageData: this.rh_pageData,
+            roleList: this.roleForm
+          }
        }
-      })
+        this.$refs['rh_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
+            });
+          }
+        })
+      }
    }
  }
 }