From d7d5068f4f94d4acce7a06153ebd8803fca55e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 26 Aug 2021 13:50:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzzqyj/step1-9.vue     | 406 ++++++++++++++++++
 .../pages/processDetail/index.vue             |   3 +
 src/router/index.js                           |   9 +
 3 files changed, 418 insertions(+)
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
new file mode 100644
index 000000000..ee4045a82
--- /dev/null
+++ b/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>
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 61c5784cd..ec904a42a 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -225,6 +225,9 @@ export default {
           //标准调研流程
         }else if(prcType === '2'){
           this.toProcessDetail('bzdyStep1-9',row)
+        }else if(prcType === '3'){
+          //标准征求意见
+          this.toProcessDetail('bzzqyjStep1-9',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')
diff --git a/src/router/index.js b/src/router/index.js
index 5669438e8..27c5a2d7f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -745,6 +745,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',

From 98a08f62b657cf72b867baba3850577dd9271a85 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 26 Aug 2021 14:25:33 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E7=9A=84=E8=B7=B3=E8=BD=AC=EF=BC=8C=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E5=BF=83=E7=9A=84=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/wfhxzg/step1.vue    | 5 ++++-
 .../processCenter/pages/creatProcess/wfhxzg/step4.vue    | 9 +++++----
 .../processCenter/pages/creatProcess/wfhxzg/step5.vue    | 5 +++++
 .../processList/tabComponents/processCenter/index.vue    | 8 +++++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index a974c66a6..286b3a83d 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/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() {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 1e94a8294..58698f842 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/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 (listJSON.length !== undefined) {
-          this.dataList = listJSON[0].standardInfoList
-        } else {
+        if (item.responUserList !== undefined) {
+          let listJSON = JSON.parse(JSON.stringify(item.responUserList))
           this.dataList = [listJSON][0].standardInfoList
+        } else {
+          let listJSONInfo = item.info
+          this.dataList = [listJSONInfo]
         }
         this.dataList.forEach(item => {
           if (item.fileText.length !== 0) {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index 19ce38b54..49fecb77b 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -196,6 +196,7 @@
       </div>
     </div>
     <ProcessFooter
+      v-if="taskInfo !== '批准'"
       show-submit
       show-back
       approval
@@ -247,6 +248,7 @@ export default {
       backLoading: false,
       dataList: [],
       json: {},
+      taskInfo: this.$route.query.taskInfo,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       // 当前页数
@@ -342,6 +344,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', {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index b7e8c8ef4..40c7f5a42 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/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"

From 1f8829c06aaa5e3ae608f7507873147873805858 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 26 Aug 2021 14:37:27 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B2=20=E6=89=B9=E9=87=8F=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BAstep5=20uname=3D>userName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index 690d3e50f..a4b8cd042 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/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) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 65545af80..7ad7547ab 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/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) {

From 801555fc0b17a8f8e00545b1f0527d6218ceaefa Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 26 Aug 2021 15:14:08 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=20=E9=93=BE=E6=8E=A5=E7=AE=A1=E7=90=86--?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E9=93=BE=E6=8E=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=EF=BC=8C=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E8=AF=A5=E9=93=BE=E6=8E=A5=E7=9A=84=E5=90=8D=E7=A7=B0=E4=BC=9A?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home1/components/empennage/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/home1/components/empennage/index.vue b/src/pages/home1/components/empennage/index.vue
index fc4e71fc0..f330a0010 100644
--- a/src/pages/home1/components/empennage/index.vue
+++ b/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>