Merge remote-tracking branch 'origin/develop' into develop

src/pages/home1/components/empennage/index.vue

@@ -3,7 +3,10 @@
   <div class="link">
     <ul>
       <li v-for="(link, index) in linkList" v-if="index<5" :key="index">
-        <a @click="openLinkUrl(link.url)" v-html="link.name"></a>
+        <a v-if="link.name.length>15" @click="openLinkUrl(link.url)" v-html="link.name.substring(0,15)+'...'" :title="link.name"></a>
+        <a v-else @click="openLinkUrl(link.url)" v-html="link.name" :title="link.name"></a>
+
+
       </li>
       <li>
         <router-link to="/linkManage">更多链接></router-link>

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -686,6 +686,7 @@ export default {
   },
   data () {
     return {
+      editFlag: '',
       splitStatus: this.$route.query.splitStatus,
       auditFlag: this.$route.query.auditFlag,
       splitCheckDialog: false,
@@ -769,6 +770,7 @@ export default {
         busStandCover: '',
         fileType: '',
         ZRBM: '',
+        editFlag: ''
       },
       standItemEOBlank: {
         id: '',
@@ -802,6 +804,7 @@ export default {
       },
       showItemInfoModal: false,
       selectedList: [], // 选中的table数据的ID
+      selectedList1: [],
       selectedAllList: [], // 选中的table数据
       infoId: '',
       itemsPage: 1,
@@ -1137,7 +1140,7 @@ export default {
       this.selectedList = []
       this.selectedAllList = data
       for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id)
+        this.selectedList.push(data[i].id,data[i].editFlag)
       }
     },
     // 分页点击后方法
@@ -1403,9 +1406,9 @@ export default {
           roundButton: false
         }).then(() => {
           this.deleteItemsModal = false
-
           this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', {
-            ids: this.selectedList.join(',')
+            ids: this.selectedList.join(','),
+            editFlag: this.selectedList1.join(','),
           }, {
             _this: this
           }, res => {
@@ -2069,6 +2072,7 @@ export default {
         case '删除':
           this.selectedList = []
           this.selectedList.push(command[0].id)
+          this.selectedList1.push(command[0].editFlag)
           this.judgebatchDeleteItem()
           break
         // case '内容简介':

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue

@@ -0,0 +1,406 @@
+<template>
+  <div class="bzdyStep9">
+    <!--    标准调研流程-->
+    <ProcessHeader toggle>
+      <template slot="proName">标准征求意见流程</template>
+      <template slot="proNode">工程研究总院院长批准</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto;">
+        <el-form
+          ref="bzzqyjForm"
+          :model="form"
+          :rules="formRules"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border">
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.cid"
+                    placeholder="请输入标准编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.cname"
+                    placeholder="请输入标准名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                    disabled
+                    v-model="form.endTime"
+                    type="date"
+                    placeholder="请选择结束日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <ProcessTitle>
+          <template slot="title">征求意见列表</template>
+        </ProcessTitle>
+        <div class="button-list">
+          <el-button type="primary"
+                     class="common-button-primary add-button"
+                     @click="upload(data, '汇总单.xls')"
+                     size="mini">导出汇总单</el-button>
+          <el-button type="primary"
+                     class="common-button-primary add-button"
+                     @click="upload(oldData, '征求意见搞.xls')"
+                     size="mini">导出征求意见搞</el-button>
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="data"
+          tooltip-effect="dark"
+          border
+          style="width: 100%; flex: auto;"
+          class="drag-table"
+          :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="index"
+            label="序号"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="chapterNumber"
+            label="章条编号"
+            width="170px">
+          </el-table-column>
+          <el-table-column
+            prop="chapterName"
+            label="章节名称">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="commentText"
+            label="修改意见内容（包括理由或依据）">
+            <el-table-column
+              prop="oldText"
+              align="center"
+              label="修改前">
+            </el-table-column>
+            <el-table-column
+              prop="newText"
+              align="center"
+              label="修改后">
+            </el-table-column>
+            <el-table-column
+              prop="reason"
+              align="center"
+              label="修改理由">
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            prop="department"
+            label="提出部门">
+          </el-table-column>
+          <el-table-column
+            prop="responUserName"
+            label="提出人">
+          </el-table-column>
+          <el-table-column
+            prop="state"
+            label="处理意见">
+            <template slot-scope="scope">
+              <div>{{ stateText(scope.row.state) }}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-collapse accordion>
+        <el-collapse-item title="意见填写">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <el-table
+        height="100%"
+        ref="selection"
+        :data="histortData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        row-key="id"
+        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+        <el-table-column
+          prop="name"
+          label="任务步骤"
+          align="center"
+          sortable="custom"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="assignee"
+          label="任务受理人"
+          align="center"
+          sortable="custom"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          sortable="custom"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="endTime"
+          label="完成时间"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="comment"
+          label="审批意见"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.commentText }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="completeFlag"
+          label="状态"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from '../../components/ProcessHeader'
+import ProcessFooter from '../../components/ProcessFooter'
+import ProcessTitle from '../../components/ProcessTitle'
+import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+
+export default {
+  name: "bzzqyjStep1-9",
+  data() {
+    return {
+      histortData: [],
+      oldData: [],
+      data: [],
+      commentText: '',
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      roleRow: {},
+      nodeList: [],
+      type: '',
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      treeData: [], // 人员数据
+      modalshowflag: false, // drawer开关
+      drawerTitle: '', //drawer标题
+      textarea: '', // 意见
+      ListModel: false, // 新增编辑抽屉开关
+      active: '1', // 默认显示
+      isSubmit: false,
+      saveLoading: false,
+      form: {
+        cid: '', // 编号
+        endTime: '', // 结束日期
+        cname: '', // 名称
+      },
+      formRules: {
+        responUserList: [
+          { required: true, message: '请选择责任人', trigger: 'change' },
+        ]
+      },
+      json: {}
+    }
+  },
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  methods: {
+    getHistoryData () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+      }, {}, res => {
+        this.histortData = res
+      }, e => {})
+    },
+    upload (row, title) {
+      var params = {
+        columnName: {
+          chapterNumber : '章条编号',
+          chapterName : '章节名称',
+          commentText: '修改意见内容（包括理由或依据）',
+          department: '提出部门',
+          responUserName: '提出人',
+          stateText: '处理意见'
+        },
+        dataList: []
+      }
+      params.dataList = JSON.parse(JSON.stringify(row))
+      params.dataList.forEach(item => {
+        if (item.state === '1') {
+          item.stateText = '上报'
+        } else if (item.state === '2') {
+          item.stateText = '处理后上报'
+        } else {
+          item.stateText = '不上报'
+        }
+      })
+      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
+    },
+    stateText (row) {
+      if (row === '1') {
+        return '上报'
+      } else if (row === '2') {
+        return '处理后上报'
+      }
+    },
+    handleTabs(name) {
+      this.active = name
+    },
+    handleSubmitNo() {
+      if (this.commentText) {
+        this.isSubmit = true
+        var json = this.json
+        json.actionFlag = 1
+        json.commentText = this.commentText
+        this.$http.post('lawss/activiti/completeTask', {
+          json: JSON.stringify(json),
+          taskIds: this.taskIds,
+          userId: this.$store.getters.userInfo.userId
+        }, {}, res => {
+          if (res.success) {
+            this.$message.success('驳回成功')
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        })
+      } else {
+        this.$message.warning('请输入反馈意见')
+      }
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          let data = JSON.parse(res.mesg)
+          this.form.cid = data.cid
+          this.form.endTime = data.endTime
+          this.form.cname = data.cname
+          var arr = []
+          data.summaryList.forEach( item => {
+            if (item.state != '3') {
+              arr.push(item)
+            }
+          })
+          this.json = data
+          this.data = arr
+          this.oldData = data.oldinfo
+        }).catch(e => {
+        })
+      })
+    },
+  },
+  mounted () {
+    this.getHistoryData()
+    this.getData()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.bzdyStep9 {
+  /deep/.el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+  .fileClass {
+    cursor: pointer;
+  }
+  .fileClass:hover{
+    color: #0c91e5;
+  }
+  position: relative;
+  height: 100%;
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+}
+</style>

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

@@ -1,337 +1,376 @@
 <template>
-    <div class="bzdyStep2">
+  <div class="bzdyStep2">
-        <!--    标准调研流程-->
+    <!--    标准调研流程-->
-        <ProcessHeader toggle>
+    <ProcessHeader toggle>
-            <template slot="proName">标准征求意见流程</template>
+      <template slot="proName">标准征求意见流程</template>
-            <template slot="proNode">对接人选择责任人</template>
+      <template slot="proNode">对接人选择责任人</template>
-        </ProcessHeader>
+    </ProcessHeader>
-        <div class="headerTabs">
+    <div class="headerTabs">
-            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
-        </div>
-        <div class="content" v-show="active === '1'">
-            <div style="flex: auto; overflow: auto;">
-                <el-form
-                        ref="bzzqyjForm"
-                        :model="form"
-                        :rules="formRules"
-                        class="label-input-form"
-                        label-width="210px"
-                >
-                    <ProcessTitle>
-                        <template slot="title">基础信息</template>
-                    </ProcessTitle>
-                    <div class="prc-content-border">
-                        <el-row :gutter="24">
-                            <el-col :span="24">
-                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cid"
-                                            placeholder="请输入标准编号"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.endTime"
-                                            type="date"
-                                            placeholder="请选择结束日期">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.responUserList"
-                                            style="display: none;"
-                                            clearable
-                                    ></el-input>
-                                    <el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </div>
-                </el-form>
-            </div>
-            <el-collapse accordion>
-                <el-collapse-item title="意见填写">
-                    <div style="margin: 10px 0;">
-                        <el-input
-                                type="textarea"
-                                :rows="3"
-                                resize="none"
-                                placeholder="请输入意见"
-                                v-model="commentText">
-                        </el-input>
-                    </div>
-                </el-collapse-item>
-            </el-collapse>
-        </div>
-        <div class="content" v-show="active === '2'">
-            <el-table
-                    height="100%"
-                    ref="selection"
-                    :data="histortData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                    border
-                    row-key="id"
-                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-                <el-table-column
-                        prop="name"
-                        label="任务步骤"
-                        align="center"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        sortable="custom"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="endTime"
-                        label="完成时间"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="comment"
-                        label="审批意见"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.commentText }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="completeFlag"
-                        label="状态"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <ProcessFooter
-                show-submit
-                :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                @save="handleSave"
-                @submit="handleSubmit"
-        >
-        </ProcessFooter>
-        <Role-tree
-                is-title="选择责任部门对接人"
-                :is-visible.sync="modalshowflag"
-                @checkedRole="checkedRole2"
-                :nodeList="nodeList"
-        ></Role-tree>
     </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto;">
+        <el-form
+          ref="bzzqyjForm"
+          :model="form"
+          :rules="formRules"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border">
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.cid"
+                    placeholder="请输入标准编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.cname"
+                    placeholder="请输入标准名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                    disabled
+                    v-model="form.endTime"
+                    type="date"
+                    placeholder="请选择结束日期">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-model="form.responUserList"
+                    style="display: none;"
+                    clearable
+                  ></el-input>
+                  <el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </div>
+      <el-collapse accordion>
+        <el-collapse-item title="意见填写">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <el-table
+        height="100%"
+        ref="selection"
+        :data="histortData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        row-key="id"
+        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+        <el-table-column
+          prop="name"
+          label="任务步骤"
+          align="center"
+          sortable="custom"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="assignee"
+          label="任务受理人"
+          align="center"
+          sortable="custom"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          sortable="custom"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="endTime"
+          label="完成时间"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="comment"
+          label="审批意见"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.commentText }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="completeFlag"
+          label="状态"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <ProcessFooter
+      show-submit
+      show-save
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
 </template>
 
 <script>
-    import ProcessHeader from '../../components/ProcessHeader'
+import ProcessHeader from "../../components/ProcessHeader";
-    import ProcessFooter from '../../components/ProcessFooter'
+import ProcessFooter from "../../components/ProcessFooter";
-    import ProcessTitle from '../../components/ProcessTitle'
+import ProcessTitle from "../../components/ProcessTitle";
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process";
 
-    export default {
+export default {
-        name: "bzzqyjStep2",
+  name: "bzzqyjStep2",
-        data() {
+  data() {
-            return {
+    return {
-                histortData: [],
+      histortData: [],
-                commentText: '',
+      commentText: "",
-                taskIds: this.$route.query.taskIds,
+      taskIds: this.$route.query.taskIds,
-                pId: this.$route.query.prcId,
+      pId: this.$route.query.prcId,
-                nodeList: [],
+      nodeList: [],
-                type: '',
+      type: "",
-                modalshowflag: false, // drawer开关
+      modalshowflag: false, // drawer开关
-                drawerTitle: '', //drawer标题
+      drawerTitle: "", //drawer标题
-                textarea: '', // 意见
+      textarea: "", // 意见
-                ListModel: false, // 新增编辑抽屉开关
+      ListModel: false, // 新增编辑抽屉开关
-                active: '1', // 默认显示
+      active: "1", // 默认显示
-                isSubmit: false,
+      isSubmit: false,
-                saveLoading: false,
+      saveLoading: false,
-                form: {
+      form: {
-                    cid: '', // 编号
+        cid: "", // 编号
-                    endTime: '', // 结束日期
+        endTime: "", // 结束日期
-                    cname: '', // 名称
+        cname: "", // 名称
-                    responUserList: '',
+        responUserList: "",
-                    responUserListName: ''
+        responUserListName: ""
-                },
+      },
-                formRules: {
+      formRules: {
-                    responUserList: [
+        responUserList: [
-                        { required: true, message: '请选择责任人', trigger: 'change' },
+          { required: true, message: "请选择责任人", trigger: "change" }
-                    ]
+        ]
-                },
+      },
-                json: {}
+      json: {}
-            }
+    };
-        },
+  },
-        components: {
+  components: {
-            ProcessHeader,
+    ProcessHeader,
-            ProcessFooter,
+    ProcessFooter,
-            ProcessTitle
+    ProcessTitle
-        },
+  },
-        methods: {
+  methods: {
-            getHistoryData () {
+    getHistoryData() {
-                this.$http.get('lawss/activiti/get_list_by_instance', {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-                    prcNum: this.$route.query.prcNum,
+        prcNum: this.$route.query.prcNum
-                }, {}, res => {
+      }, {}, res => {
-                    this.histortData = res
+        this.histortData = res;
-                }, e => {})
+      }, e => {
-            },
+      });
-            checkedRole2 (data) {
+    },
-                var idList = ''
+    checkedRole2(data) {
-                var nameList = ''
+      var idList = "";
-                data.forEach( item => {
+      var nameList = "";
-                    if (nameList.length > 0) {
+      data.forEach(item => {
-                        nameList += ','
+        if (nameList.length > 0) {
-                        idList += ','
+          nameList += ",";
-                    }
+          idList += ",";
-                    idList += item.id
-                    nameList += item.name
-                })
-                this.form.responUserList = idList
-                this.form.responUserListName = nameList
-
-            },
-            choiceZRR () {
-                this.nodeList = []
-                if (this.form.responUserList.length > 0) {
-                    this.nodeList = this.form.responUserList.split(',')
-                }
-                this.modalshowflag = true
-            },
-            handleTabs(name) {
-                this.active = name
-            },
-            handleSave() {},
-            handleSubmit() {
-                this.$refs['bzzqyjForm'].validate((valid) => {
-                    if (valid) {
-                        this.isSubmit = true
-                        var json = this.json
-                        json.commentText = this.commentText
-                        json.responUserList = this.form.responUserList
-                        json.responUserListName = this.form.responUserListName
-                        json.introduce = false
-                        this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
-                        }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                        })
-                    } else {
-                        return this.$message.warning('请完善基础信息')
-                    }
-                })
-            },
-            getData() {
-                return new Promise((resolve, reject) => {
-                    inboundLiaisonDetail({
-                        taskIds: this.taskIds,
-                        pId: this.pId
-                    }).then(res => {
-                        let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
-                        this.form.endTime = data.endTime
-                        this.form.cname = data.cname
-                        this.json = data
-                    }).catch(e => {
-                    })
-                })
-            },
-        },
-        mounted () {
-            this.getHistoryData()
-            this.getData()
         }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.form.responUserList = idList;
+      this.form.responUserListName = nameList;
+
+    },
+    choiceZRR() {
+      this.nodeList = [];
+      if (this.form.responUserList.length > 0) {
+        this.nodeList = this.form.responUserList.split(",");
+      }
+      this.modalshowflag = true;
+    },
+    handleTabs(name) {
+      this.active = name;
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "3");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: this.form,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    handleSubmit() {
+      this.$refs["bzzqyjForm"].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true;
+          var json = this.json;
+          json.commentText = this.commentText;
+          json.responUserList = this.form.responUserList;
+          json.responUserListName = this.form.responUserListName;
+          json.introduce = false;
+          this.$http.post("lawss/activiti/completeTask", {
+            json: JSON.stringify(json),
+            taskId: this.taskIds,
+            userId: this.$store.getters.userInfo.userId
+          }, {}, res => {
+            if (res.success) {
+              this.$message.success("提交成功");
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          });
+        } else {
+          return this.$message.warning("请完善基础信息");
+        }
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          let data = JSON.parse(res.mesg);
+          if (data.form === undefined) {
+            this.form.cid = data.cid;
+            this.form.endTime = data.endTime;
+            this.form.cname = data.cname;
+            this.json = data;
+          } else {
+            this.form = data.form
+            this.form.cid = data.form.cid;
+            this.form.endTime = data.form.endTime;
+            this.form.cname = data.form.cname;
+            this.json = data.form;
+          }
+
+        }).catch(e => {
+        });
+      });
     }
+  },
+  mounted() {
+    this.getHistoryData();
+    this.getData();
+  }
+};
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
-    .bzdyStep2 {
+
-        /deep/.el-drawer__container {
+.bzdyStep2 {
-            .prc-content-border {
+  /deep/ .el-drawer__container {
-                border: none;
+    .prc-content-border {
-                padding: 0 20px 0;
+      border: none;
-            }
+      padding: 0 20px 0;
-        }
-        .fileClass {
-            cursor: pointer;
-        }
-        .fileClass:hover{
-            color: #0c91e5;
-        }
-        position: relative;
-        height: 100%;
-        .headerTabs {
-            height: 52px;
-            display: flex;
-            align-items: center;
-            position: absolute;
-            top: 0;
-            right: 10px;
-            .headerTabsItem {
-                border: 1px solid #c1c1c1;
-                padding: 0 5px;
-                height: 30px;
-                line-height: 30px;
-                cursor: pointer;
-            }
-            .active {
-                border: 1px solid #E6A23C;
-                color: #fff;
-                background: #E6A23C;
-            }
-        }
-        .content {
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            height: calc(~'100% - 103px');
-            overflow: auto;
-            .tableTitle {
-                margin-bottom: 10px;
-                height: 30px;
-                line-height: 30px;
-                position: relative;
-                font-size: 13px;
-                font-weight: bold;
-                .tableButton {
-                    position: absolute;
-                    right: 0;
-                    top: 0;
-                }
-            }
-        }
     }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+}
 </style>

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

@@ -208,6 +208,7 @@
         </div>
         <ProcessFooter
                 show-submit
+                show-save
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
                 @save="handleSave"
@@ -325,20 +326,22 @@
                 this.active = name
             },
             handleSave() {
-                this.saveLoading = true
+              this.saveLoading = true;
-                let _formData = new FormData()
+              let _formData = new FormData();
-                _formData.append('taskIds', this.taskIds)
+              _formData.append("id", this.bpnId || "");
-                _formData.append('json', JSON.stringify({
+              _formData.append("prcType", "3");
-                    form: this.form,
+              _formData.append("taskIds", this.taskIds);
-                    data: this.data,
+              _formData.append("json", JSON.stringify({
-                    commentText: this.commentText,
+                form: this.json,
-                }))
+                commentText: this.commentText
-                saveTaskForPub(_formData).then(res => {
+              }));
-                    this.saveLoading = false
+              saveTaskForPub(_formData).then(res => {
-                    this.$message.success('保存成功')
+                this.saveLoading = false;
-                }).catch(e => {
+                this.$message.success("保存成功");
-                    this.saveLoading = false
+                this.bpnId = res.result;
-                })
+              }).catch(e => {
+                this.saveLoading = false;
+              });
             },
             handleSubmit() {
                 if (this.data.length < 1) {

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

@@ -380,7 +380,10 @@ export default {
     },
     // 批量删除按钮table，选择数据
     selectedDelete(val) {
-      this.deleteDataList = val
+      this.deleteDataList = []
+      for (let i = 0; i < val.length; i++) {
+        this.deleteDataList.push(val[i].id);
+      }
     },
     // 点击批量删除事件
     deleteList() {

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

@@ -308,11 +308,12 @@ export default {
     },
     getFormFieldList (item) {
       this.$nextTick(() => {
-        let listJSON = JSON.parse(JSON.stringify(item.responUserList))
+        if (item.responUserList !== undefined) {
-        if (listJSON.length !== undefined) {
+          let listJSON = JSON.parse(JSON.stringify(item.responUserList))
-          this.dataList = listJSON[0].standardInfoList
-        } else {
           this.dataList = [listJSON][0].standardInfoList
+        } else {
+          let listJSONInfo = item.info
+          this.dataList = [listJSONInfo]
         }
         this.dataList.forEach(item => {
           if (item.fileText.length !== 0) {

src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue

@@ -0,0 +1,480 @@
+<template>
+  <div class="wfhxzgStep5">
+    <ProcessHeader toggle>
+      <template slot="proName">未符合项整改流程</template>
+      <template slot="proNode">分发负责人审核材料</template>
+    </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>
+    </div>
+    <div class="content" v-if="active === '1'">
+      <div style="flex: auto;">
+        <ProcessTitle>
+          <template slot="title">基础信息</template>
+        </ProcessTitle>
+        <!--        <el-form :modal="nonSearch" inline class="label-input-form">
+                  <el-form-item label="标准号/标准名称" class="search-item">
+                    <el-input
+                      size="small"
+                      v-model="nonSearch.standId"
+                      placeholder="请输入"
+                      clearable
+                      :maxlength="100"></el-input>
+                  </el-form-item>
+                  <el-form-item label="项目名称" class="search-item">
+                    <el-input
+                      size="small"
+                      v-model="nonSearch.productName"
+                      placeholder="请输入"
+                      clearable
+                      :maxlength="100"></el-input>
+                  </el-form-item>
+                  <el-form-item label="责任部门" class="search-item">
+                    <el-input v-model="nonSearch.responsibleUnit" v-show="false" />
+                    <el-popover
+                      placement="bottom"
+                      popper-class="user-dept-popper"
+                      trigger="click"
+                      :value="false"
+                    >
+                      <el-input
+                        size="small"
+                        slot="reference"
+                        v-model="nonSearch.responseUnitShow"
+                        placeholder="根据责任部门查找"
+                        readonly
+                        clearable
+                        id="searchResp"
+                      />
+                      <div class="api">
+                        <laws-tree
+                          :zNodes="zNodesSItem"
+                          treeDivId="zNodesSItemSearch"
+                          deptSelect
+                          showRMenu
+                          @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
+                          class="ztree" style="width: 200px;height: 400px;overflow: auto">
+                        </laws-tree>
+                      </div>
+                    </el-popover>
+                  </el-form-item>
+                  <el-form-item class="search-item btn-box">
+                    <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
+                      @click="getTableByPage(nonSearch)">
+                      查询
+                    </el-button>
+                  </el-form-item>
+                  <el-form-item class="search-item btn-box">
+                    <el-button
+                      class="common-button-default"
+                      size="mini"
+                      v-btn-permission="'5905d0743c3504799aee83ac9697f8c5'"
+                      @click="clearAllSearch">
+                      清空
+                    </el-button>
+                  </el-form-item>
+                </el-form>-->
+        <el-table
+          :data="dataList"
+          border
+          height="49%"
+          style="width: 100%"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
+            <template slot-scope="scope">
+              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
+          <el-table-column prop="itemsName" label="条款名称" align="center"/>
+          <el-table-column prop="planCloseTime" label="整改完成时间" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
+          <el-table-column prop="dutyPeople" label="负责人" align="center"/>
+          <el-table-column prop="fileText" label="佐证材料" align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="small" @click="queryFile(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-collapse accordion>
+        <el-collapse-item title="意见填写">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+      <el-upload
+        :action="''"
+        name="file"
+        :file-list="fileTextList"
+        :on-preview="handleOnPreview"
+      >
+      </el-upload>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from '../../components/ProcessHeader'
+import ProcessFooter from '../../components/ProcessFooter'
+import ProcessTitle from '../../components/ProcessTitle'
+import {interfaceUrl} from "@/sysConfig";
+import {inboundLiaisonDetail} from "@/api/process";
+
+export default {
+  name: "wfhxzgStep5-1",
+  data() {
+    return {
+      fileMadel: false,
+      detailData: [],
+      loading: false,
+      commentText: '',
+      title: '', // 新增编辑抽屉标题
+      saveLoading: false,
+      ListModel: false, // 新增编辑抽屉开关
+      nonSearch: {
+        standId: '', // 标准号/名称
+        productName: '', // 项目名称
+        responsibleUnit: '' // 责任部门
+      },
+      fileTextList: [],
+      active: '1', // 默认显示
+      isSubmit: false,
+      backLoading: false,
+      dataList: [],
+      json: {},
+      taskInfo: this.$route.query.taskInfo,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      // 当前页数
+      pageNo: 1,
+      total: 0,
+      myLoading: false,
+      // 责任部门
+      zNodesSItem: [],
+      // 驳回弹窗状态
+      backDialog: false,
+
+    }
+  },
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  created() {
+    this.processTable()
+    this.getData()
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  methods: {
+    queryFile(row) {
+      this.fileTextList = row.fileText
+      this.fileMadel = true
+    },
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      });
+    },
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
+        /*this.dataList.forEach(item => {
+          item.fileText.forEach(item1 => {
+            this.fileTextList.push({
+              id: item1.id,
+              name: item1.name
+            })
+          })
+        })*/
+      })
+    },
+
+    handleTabs(name) {
+      this.active = name
+    },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.standId,
+          // pageType: 'FOREIGN_STAND'
+          pageType: item.standType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
+    // 提交按钮
+    handleSubmit() {
+      this.isSubmit = true
+      var json = this.json
+      json.info = {
+        fileDataList: this.dataList
+      }
+      json.actionFlag = 0
+      json.commentText = this.commentText
+      this.$http.post('lawss/activiti/completeTask', {
+        json: JSON.stringify(json),
+        taskId: this.taskIds,
+        userId: this.$store.getters.userInfo.userId
+      }, {}, res => {
+        if (res.success) {
+          this.$message.success('提交成功')
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      })
+    },
+    handleSubmitNo() {
+      this.backLoading = true
+      if (this.commentText) {
+        var json = {
+          responUserList: {
+            standardInfoList: this.dataList
+          },
+          actionFlag: 1,
+          commentText: this.commentText
+        }
+        this.$http.post('lawss/activiti/completeTask', {
+          json: JSON.stringify(json),
+          taskId: this.taskIds,
+          userId: this.$store.getters.userInfo.userId
+        }, {}, res => {
+          if (res.success) {
+            this.$message.success('驳回成功')
+            this.$router.push('/processCenter')
+            this.backLoading = false
+          }
+        })
+      } else {
+        this.$message.warning('请输入反馈意见')
+        this.backLoading = false
+      }
+    },
+    //未整改项抽屉中的查询按钮
+    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+      this.realList = this.dataList.filter(item => {
+        let matchId = true; // 标准号 筛选
+        let matchName = true; // 项目名称 筛选
+        let matchUnit = true; // 部门 筛选
+
+        if (standId) {
+          const keysId = standId
+            .toUpperCase() // 转大写
+            .replace(' ', '') // 删掉空格
+            .split('') // 切割成 单个字
+          matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
+        }
+        if (productName) {
+          matchName = item.productName === productName;
+        }
+        if (responsibleUnit) {
+          matchUnit = item.responsibleUnit === responsibleUnit;
+        }
+        return matchId && matchName && matchUnit;
+      })
+      this.dataList = this.realList
+    },
+    // 清空 查询条件
+    clearAllSearch (search = true) {
+      this.nonSearch = {
+        standId: '',
+        productName: '',
+        responsibleUnit: ''
+      }
+      this.getData()
+    },
+    download(row) {
+      let attId = row.fileTextId
+      window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+    },
+    // 分页事件
+    pageChange (page) {
+      this.pageNo = page
+      this.getTableByPage()
+    },
+    pageSizeChange () {
+      this.getTableByPage()
+    },
+  }
+}
+</script>
+
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+.wfhxzgStep5 {
+  /deep/.el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+  position: relative;
+  height: 100%;
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+  /deep/.el-upload{
+    display: block;
+  }
+  // 上传信息回显多余隐藏
+  /deep/.el-upload-list__item .el-icon-close {
+    font-size: 0;
+  }
+  /deep/.el-upload-list__item .el-icon-close-tip {
+    font-size: 0;
+  }
+  .content-center {
+    padding: 10px 0px 10px 10px;
+  }
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+  }
+}
+</style>

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

@@ -247,6 +247,7 @@ export default {
       backLoading: false,
       dataList: [],
       json: {},
+      taskInfo: this.$route.query.taskInfo,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       // 当前页数
@@ -342,6 +343,9 @@ export default {
     handleSubmit() {
       this.isSubmit = true
       var json = this.json
+      json.info = {
+        fileDataList: this.dataList
+      }
       json.actionFlag = 0
       json.commentText = this.commentText
       this.$http.post('lawss/activiti/completeTask', {

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

@@ -452,24 +452,24 @@ export default {
     },
 
     //保存事件
-    handleSave() {
+    // handleSave() {
-      this.saveLoading = true;
+    //   this.saveLoading = true;
-      let _formData = new FormData();
+    //   let _formData = new FormData();
-      _formData.append("id", this.bpnId || "");
+    //   _formData.append("id", this.bpnId || "");
-      _formData.append("prcType", "5");
+    //   _formData.append("prcType", "5");
-      _formData.append('taskIds', this.taskIds)
+    //   _formData.append('taskIds', this.taskIds)
-      _formData.append("json", JSON.stringify({
+    //   _formData.append("json", JSON.stringify({
-        form: this.listForm,
+    //     form: this.listForm,
-        commentText: this.commentText
+    //     commentText: this.commentText
-      }));
+    //   }));
-      saveTaskForPub(_formData).then(res => {
+    //   saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
+    //     this.saveLoading = false;
-        this.$message.success("保存成功");
+    //     this.$message.success("保存成功");
-        this.bpnId = res.result;
+    //     this.bpnId = res.result;
-      }).catch(e => {
+    //   }).catch(e => {
-        this.saveLoading = false;
+    //     this.saveLoading = false;
-      });
+    //   });
-    },
+    // },
     //提交事件
     handleSubmit() {
       this.listForm.breakdownList.forEach(item => {

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

@@ -569,7 +569,7 @@ export default {
         this.listForm.commentText = this.commentText;
         var json = Object.assign(this.listForm, this.roleForm);
         json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.uName;
+        json.prcCreateUserName = this.$store.getters.userInfo.userName;
         json.standId = this.listForm.standId;
         this.$refs["listForm"].validate((valid) => {
           if (valid) {

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

@@ -2,7 +2,7 @@
   <div class="xmpg2-step12">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程-项目</template>
-      <template slot="proNode">责任人审核</template>
+      <template slot="proNode">标准法规部长审核</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -570,7 +570,7 @@ export default {
         this.listForm.commentText = this.commentText;
         var json = Object.assign(this.listForm, this.roleForm);
         json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.uName;
+        json.prcCreateUserName = this.$store.getters.userInfo.userName;
         json.standId = this.listForm.standId;
         this.$refs["listForm"].validate((valid) => {
           if (valid) {

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

@@ -42,16 +42,18 @@
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
-        <div class="tableTitle">
+<!--        <div class="tableTitle">-->
-          <div class="tableButton">
+<!--          <div class="tableButton">-->
-            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
+<!--            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人-->
-            </el-button>
+<!--            </el-button>-->
-          </div>
+<!--          </div>-->
-        </div>
+<!--        </div>-->
         <el-table
           :data="dataList"
           style="width: 100%"
           row-key="standId"
+
+          v-if="refreshTable"
           height="70%"
           border
           ref="myTable"
@@ -95,10 +97,20 @@
           >
           </el-table-column>
           <el-table-column label="责任人" prop="workPeople" align="center">
-            <template slot-scope="scope" v-if="scope.row.workPeople">
+            <template slot-scope="scope" >
-              <el-input v-model="scope.row.workPeopleId" style="display: none;" />
+              <div v-if="selectList.length<=1">
-              <el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人"
+                <el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
-                        @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
+                <el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
+                          @click.native="choiceZRRS(scope.row, 1, scope.$index)" readonly/>
+              </div>
+
+              <div v-else>
+                <el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
+                <el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
+                          @click.native="choiceZRRS('', 2, '')" readonly/>
+              </div>
+
+              <el-button style="width: 98%" :loading="buttonLoading" v-if="!scope.row.workPeople" size="small" type="primary" @click="choiceZRRS(scope.row, 3, '')">{{ "批量分发该标准下的责任人" }}</el-button>
             </template>
             <!--            <template slot-scope="scope">-->
             <!--              <div :class="{'fileClass': !scope.row.workPeople}">-->
@@ -226,6 +238,13 @@ export default {
   },
   data() {
     return {
+      workPeopleList:[],
+      //防止按钮点击过快的按钮loading
+      buttonLoading: false,
+      //刷新表格
+      refreshTable: true,
+      //展开表格
+      // tableExpand: false,
       hasChildren: true,
       active: "1",
       loading: false,
@@ -323,7 +342,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -357,7 +375,6 @@ export default {
                 workPeople: "请选择责任人"
               };
               children.push(aa);
-              console.log(children);
             }
           );
           this.dataList.forEach(key => {
@@ -402,7 +419,6 @@ export default {
       this.isSubmit = true;
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
-      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -440,6 +456,24 @@ export default {
           this.$message.warning("请选择要分发的数据");
         }
       }
+      //批量分发某标准下的责任人
+      else if (type === 3){
+
+        //弹出选人框
+        // if (this.tableExpand === false){
+          this.modalshowflag = true;
+          this.drawerTitle = "批量选择责任人";
+        // }
+        //展开表格
+          this.workPeopleList = row
+        // console.log('279',row.children)
+        this.refreshTable = false
+        // this.tableExpand = !this.tableExpand
+        this.$nextTick(() => {
+          this.refreshTable = true
+        });
+
+      }
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -494,6 +528,22 @@ export default {
           });
         });
         this.dataList = JSON.parse(JSON.stringify(this.dataList));
+      }else if (this.type === 3){
+        // console.log("529",this.workPeopleList)
+        for (let i=0;i<this.workPeopleList.children.length;i++){
+
+          this.workPeopleList.children[i].workPeople = data[0].name
+          this.workPeopleList.children[i].workPeopleId = data[0].id
+          // console.log(row.children[i].id)
+          // console.log(row.children[i].workPeople)
+        }
+
+          // items.children.map(childrenItem => {
+          //
+          //     childrenItem.workPeople = data[0].name;
+          //     childrenItem.workPeopleId = data[0].id;
+          //   })
+
       }
       this.modalshowflag = false;
     },

src/pages/processCenter/pages/processDetail/index.vue

@@ -217,14 +217,17 @@ export default {
           }else{
             this.toProcessDetail('xmpg2Step1-2',row)
           }
-          //标准解读流程
         } else if (prcType === '8') {
-          this.toProcessDetail('wfhxzgStep5',row)
+          // 未符合项整改
+          this.toProcessDetail('wfhxzgStep5-1',row)
         } else if(prcType === '9'){
           this.toProcessDetail('bzjdStep1-6',row)
           //标准调研流程
         }else if(prcType === '2'){
           this.toProcessDetail('bzdyStep1-9',row)
+        }else if(prcType === '3'){
+          //标准征求意见
+          this.toProcessDetail('bzzqyjStep1-9',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')

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

@@ -75,6 +75,9 @@
             align="center"
             width="150"
           >
+            <template slot-scope="scope">
+              <a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcNum }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="prcType"
@@ -83,7 +86,7 @@
             width="180"
           >
             <template slot-scope="scope">
-              <span>{{ getPrcName(scope.row.prcType) }}</span>
+              <span @click="dealWith(scope.row)" class="table-jump">{{ getPrcName(scope.row.prcType) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -93,6 +96,9 @@
             align="center"
             min-width="250"
           >
+            <template slot-scope="scope">
+              <a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="creatUserName"

src/pages/searchCenter/pages/standardSearch.vue

@@ -116,7 +116,7 @@
                                                 width="200">
                                             <template slot-scope="scope">
                                                 <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>
-                                                <div v-else>{{ scope.row.standstateshow }}</div>
+                                                <div v-else>{{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
                                             </template>
                                         </el-table-column>
                                         <el-table-column

src/router/index.js

@@ -574,6 +574,15 @@ const routes = [
           title: '未符合项整改/更新流程'
         }
       },
+      {
+        path: '/wfhxzgStep5-1',
+        name: 'wfhxzgStep5-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '未符合项整改/更新流程'
+        }
+      },
       {
         path: '/bzrkStep1',
         name: 'bzrkStep1',
@@ -745,6 +754,15 @@ const routes = [
           title: '标准调研流程'
         }
       },
+      {
+        path: '/bzzqyjStep1-9',
+        name: 'bzzqyjStep1-9',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准调研流程'
+        }
+      },
       {
         path: '/bzdyStep4',
         name: 'bzdyStep4',