Merge branch 'develop' into 'FOTON'

Develop

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

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

@@ -445,7 +445,8 @@
                 </el-table-column>
                 <el-table-column
                   type="index"
-                  width="55"
+                  label="序号"
+                  width="70"
                   align="center">
                 </el-table-column>
                 <el-table-column
@@ -577,7 +578,7 @@ export default {
         ],
         endTime: [
           { required: true, message: "请输入截止时间", trigger: "change" }
-        ],
+        ]
       },
       roleFormRules: {
         dockUserName: [
@@ -720,15 +721,6 @@ export default {
       this.ListModel = true;
 
     },
-    drawerCheck(data) {
-      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-      if (getlist.length == 1) {
-        this.roleRow = getlist[0];
-      } else {
-        this.$refs.tree.setCheckedKeys([data.id]);
-        this.roleRow = this.$refs.tree.getCheckedNodes()[0];
-      }
-    },
     //导入功能
     leading() {
 
@@ -824,9 +816,9 @@ export default {
        this.dataList.forEach(item => {
          if(!item.distributePerson || !item.projectGroupPeople){
            this.$message.warning('请填写完整的人员信息')
-         }else{
+         }else {
            this.isSubmit = true;
-           this.listForm.dataList = this.dataList
+           this.listForm.dataList = this.dataList;
            this.listForm.commentText = this.commentText;
            let json = Object.assign(this.listForm, this.roleForm);
            console.log(json);
@@ -837,7 +829,7 @@ export default {
                    this.$http.post("lawss/activiti/startProcessRollBack", {
                      createUser: this.$store.getters.userInfo.userId,
                      createUserName: this.$store.getters.userInfo.userName,
-                     type: '5',
+                     type: "5",
                      json: JSON.stringify({
                        taskInfo: "选择已拆分标准",
                        form: this.listForm,

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

@@ -1,4 +1,4 @@
-<!--标准合规评估 业务经理审批-->
+<!--标准合规评估 分发人分发项目-->
 <template>
   <div class="bzpg-step3">
     <ProcessHeader toggle>
@@ -91,6 +91,7 @@
         :data="dataList"
         border
         ref="selection"
+        tooltip-effect="dark"
         height="100%"
         style="width: 100%;"
         @selection-change="selectProjectGroup"
@@ -118,16 +119,24 @@
           label="项目状态"/>
         <el-table-column
           align="center"
+          :show-overflow-tooltip="true"
           prop="projectNumber"
           label="项目编号"/>
         <el-table-column
           align="center"
+          :show-overflow-tooltip="true"
           prop="projectName"
           label="项目名称"/>
         <el-table-column
           align="center"
-          prop="projectManager"
+          prop="uname"
-          label="项目经理"/>
+          label="项目经理">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.unameId" style="display: none;" />
+            <el-input v-model="scope.row.uname" placeholder="请选择项目经理"
+                      @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
+          </template>
+        </el-table-column>
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
@@ -213,7 +222,7 @@
     <!--    添加抽屉-->
     <el-drawer
       title="添加项目"
-      :visible.sync="ProjectModel"
+      :visible.sync="projectModel"
       size="900px"
       custom-class="demo-drawer"
     >
@@ -282,11 +291,12 @@
                   label="项目名称"/>
                 <el-table-column
                   align="center"
+                  width="120"
                   prop="projectStatus"
                   label="项目状态"/>
                 <el-table-column
                   align="center"
-                  prop="projectName"
+                  prop="currentNode"
                   label="当前节点"/>
                 <el-table-column
                   align="center"
@@ -294,7 +304,7 @@
                   label="项目群"/>
                 <el-table-column
                   align="center"
-                  prop="projectManager"
+                  prop="uname"
                   label="项目经理"/>
               </el-table>
             </div>
@@ -314,7 +324,7 @@
       </div>
     </el-drawer>
     <ProcessFooter
-      show-back
+      show-save
       show-transfer
       show-submit
       :transfer-loading="isTransfer"
@@ -322,7 +332,7 @@
       :saveLoading="saveLoading"
       :approval="true"
       @transfer="handleTransfer"
-      @back="beforeBack"
+      @save="handleSave"
       @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -334,6 +344,13 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <!--    选择责任人-->
+    <Role-tree
+      is-title="选择项目经理"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
   </div>
 </template>
 
@@ -341,7 +358,7 @@
 import ProcessHeader from "process/components/ProcessHeader";
 import ProcessFooter from "process/components/ProcessFooter";
 import ProcessTitle from "process/components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub } from "api/process";
 
 export default {
   name: "bzpgStep3",
@@ -352,7 +369,7 @@ export default {
   },
   data(){
     return {
-      active: '1',
+      active: "1",
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       drawerModal: false,
@@ -360,33 +377,49 @@ export default {
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
-      ProjectModel: false,
+      projectModel: false,
+      modalshowflag: false,
       pageNo: 1,
       totalNo: 0,
       pageSizeNo: this.$store.getters.userInfo.configContent,
-      userId:this.$store.getters.userInfo.userId,
+      userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      commentText: '',
+      commentText: "",
-      drawerTitle: '',
+      drawerTitle: "",
-      projectGroup: '',  //用来查询项目
+      projectGroup: "",  //用来查询项目
       listForm: {},
       dataList: [],
+      projectDataList: [],
+      breakdownList: [], //标准下的分解单数据
       detailData: [],
       nodeList: [],
+      nodeList2: [],
       selectProjectList: [],
       selectProjectGroupList: [],
       productData: [], //项目群下的项目
       projectStatus: [], //项目状态下拉框
       projectSearch: {
-        projectStatus: "", //项目状态
+        projectStatus: "" //项目状态
-      },
+      }
     }
   },
   mounted() {
-    this.getData()
+    this.getData();
-    this.processTable()
+    this.processTable();
-    this.getProductData()
+    this.getProductData();
+    /**
+     * 获取项目群筛选项的值
+     */
+    this.$http.post("sarStandProjectLibrary/querySelect", {}, {
+      _this: this
+    }, res => {
+      res.data.statusList.forEach(item => {
+        if (item) {
+          this.projectStatus.push(item);   //项目状态
+        }
+      });
+    });
   },
   methods: {
     getData() {
@@ -406,22 +439,37 @@ export default {
     /**
      * @description: 动态表单读取
      */
-    getFormFieldList (item) {
+    getFormFieldList(item) {
       this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum
+        this.listForm.prcNum = this.prcNum;
-        this.listForm.prcName = this.prcName
+        this.listForm.prcName = this.prcName;
-        this.listForm['id'] = item.id
+        this.listForm["id"] = item.id;
-        this.listForm.dataList = item.dataList
+        this.projectGroup = item.dataList[0].projectGroup;
-        this.dataList = item.dataList
+        this.$http.get('SarStandItems/sar-stand-items/findAllItems', {
-        this.projectGroup = item.dataList[0].projectGroup
+          ids: item.standId,
-        this.dataList.distributePerson = item.dataList[0].distributePerson
+          type: item.fileType
-        this.listForm.breakdownList = item.breakdownList
+        },{
-      })
+          _this: this
+        }, res => {
+           this.breakdownList = res.data
+        })
+      });
+    },
+    choiceZRRS(row, type, index) {
+      this.nodeList2 = [];
+      this.lsIndex = index;
+      this.lsType = type;
+      if (row.unameId) {
+        this.nodeList2 = row.unameId.split(",");
+      } else {
+        this.nodeList2.push(row);
+      }
+      this.modalshowflag = true;
     },
     //查询项目群下的项目
-    getProductData(){
+    getProductData() {
-      this.$http.get('sarStandProjectLibrary/queryProjects',{
+      this.$http.get("sarStandProjectLibrary/queryProjects", {
         projectGroup: this.projectGroup,
         current: this.pageNo,
         PageSize: this.pageSizeNo,
@@ -429,9 +477,9 @@ export default {
       }, {
         _this: this
       }, res => {
-         this.productData = res.data.records
+        this.productData = res.data.records;
-         this.totalNo = res.data.count
+        this.totalNo = res.data.count;
-      })
+      });
     },
     //查询项目按钮
     getProductDataBtn(){
@@ -463,31 +511,85 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-
+        this.selectProjectGroupList.map(item => {
+          let index;
+          index = this.dataList.findIndex(items => {
+            return items.projectNumber === item.projectNumber;
+          });
+          if (index > -1) {
+            this.dataList.splice(index, 1);
+          }
+        });
+        this.selectProjectGroupList = [];
+        this.$refs.selection.clearSelection();
       }).catch(() => {
       });
     }
     },
-    cancelStand(){
+    cancelStand() {
-      this.projectModel = false
+      this.projectModel = false;
     },
-    okProject(){
+    okProject() {
-     if(this.selectProjectList.length){
+      if (this.selectProjectList.length) {
-
+          let addFlag = true;
-     }else{
+          let projectNumbers = "";
-       this.$message.warning('请至少选择一条数据进行添加')
+          this.selectProjectList.forEach(item => {
-     }
+            projectNumbers += item.projectNumber;
+            projectNumbers += ",";
+          });
+          if(this.dataList.length){
+            this.dataList.forEach(item => {
+              if (item.projectNumber === projectNumbers) {
+                addFlag = false;
+              }
+            });
+          }
+          if (addFlag) {
+            this.projectDataList = [];
+            let projectNames = "", projectNumbers = "";
+            this.selectProjectList.forEach(items => {
+              projectNames += items.projectName;
+              projectNames += ",";
+              projectNumbers += items.projectNumber;
+              projectNumbers += ",";
+            });
+            this.$set(this.projectDataList, "projectName", projectNames);
+            this.$set(this.projectDataList, "projectNumber", projectNumbers);
+            this.$set(this.projectDataList, "managementHostName", this.selectProjectList[0].managementHostName);
+            this.$set(this.projectDataList, "developmentHostName", this.selectProjectList[0].developmentHostName);
+            this.$set(this.projectDataList, "categoryName", this.selectProjectList[0].categoryName);
+            this.$set(this.projectDataList, "projectStatus", this.selectProjectList[0].projectStatus);
+            this.$set(this.projectDataList, "uname", this.selectProjectList[0].uname);
+            this.$set(this.projectDataList, "unameId", this.selectProjectList[0].projectManager);
+            this.dataList.push({
+              projectName: this.projectDataList.projectName,
+              projectNumber: this.projectDataList.projectNumber,
+              managementHostName: this.projectDataList.managementHostName,
+              developmentHostName: this.projectDataList.developmentHostName,
+              categoryName: this.projectDataList.categoryName,
+              projectStatus: this.projectDataList.projectStatus,
+              uname: this.projectDataList.uname,
+              unameId: this.projectDataList.unameId,
+            })
+          } else {
+            this.$message.warning("请勿重复添加数据");
+          }
+        this.projectModel = false;
+        this.$refs.projectTable.clearSelection();
+      } else {
+        this.$message.warning("请至少选择一条数据进行添加");
+      }
     },
-    selectProject(data){
+    selectProject(data) {
-      this.selectProjectList = data
+      this.selectProjectList = data;
     },
-    pageChangeNo(page){
+    pageChangeNo(page) {
-      this.pageNo = page
+      this.pageNo = page;
-      this.getProductData()
+      this.getProductData();
     },
-    pageSizeChangeNo(pageSize){
+    pageSizeChangeNo(pageSize) {
-      this.pageSizeNo = pageSize
+      this.pageSizeNo = pageSize;
-      this.getProductData()
+      this.getProductData();
     },
     //tab发生变化
     handleTabs(name) {
@@ -495,7 +597,7 @@ export default {
     },
     //折叠/展开基础信息方法
     foldForm() {
-      this.foldFormFlag = !this.foldFormFlag
+      this.foldFormFlag = !this.foldFormFlag;
     },
     // 点击查看
     handlePreview(item) {
@@ -509,28 +611,74 @@ export default {
       window.open(routeUrl.href, "_blank");
     },
     //提交
-    handleSubmit(){
+    handleSubmit() {
+      if (!this.dataList.length) {
+        this.$message.warning("请添加项目数据");
+      } else if(this.dataList.length > 5) {
+         this.$message.warning('您最多只能选择五条数据')
+      }else{
+        this.listForm.dataList = this.dataList;
+        this.listForm.breakdownList = this.breakdownList
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true;
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
 
     },
-    //驳回
+    //保存
-    beforeBack(){
+    handleSave() {
-
+      this.saveLoading = true;
+      this.listForm.dataList = this.dataList;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "5");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: this.listForm,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    checkedRole2(data) {
+      this.dataList[this.lsIndex].unameId = data[0].id;
+      this.dataList[this.lsIndex].uname = data[0].name;
+      this.modalshowflag = false;
     },
     //确认转办
-    checkedRole (data) {
+    checkedRole(data) {
-      this.assigneeNewLoading = true
+      this.assigneeNewLoading = true;
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
+        this.isTransfer = false;
         if (res.success) {
-          this.drawerModal = false
+          this.drawerModal = false;
-          this.$message.success('调整成功')
+          this.$message.success("调整成功");
           this.$router.push("/processCenter");
-          this.processNum()
+          this.processNum();
         } else {
           this.$message.warning(res.message)
         }

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

@@ -0,0 +1,556 @@
+<!--标准合规评估 项目经理分发标准-->
+<template>
+  <div class="bzpg-step4">
+    <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-show="active === '1'">
+      <div style="overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-collapse-transition>
+          <el-form
+            v-if="!foldFormFlag"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    class="input-jump"
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-input
+                    class="input-jump"
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="--"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="--"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-collapse-transition>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+      </div>
+      <process-title>
+        <template slot="title">填写信息</template>
+      </process-title>
+        <el-table
+          ref="selection"
+          :data="dataList"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
+          height="100%"
+          border
+          highlight-current-row
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"/>
+        <el-table-column
+          align="center"
+          min-width="180"
+          prop="projectGroup"
+          label="项目群"/>
+        <el-table-column
+          align="center"
+          min-width="180"
+          prop="projectNumber"
+          label="项目编号"/>
+        <el-table-column
+          min-width="300"
+          :show-overflow-tooltip="true"
+          align="center"
+          prop="projectName"
+          label="项目名称"/>
+        <el-table-column
+          align="center"
+          min-width="120"
+          prop="itemNum"
+          label="条款号"/>
+        <el-table-column
+          align="center"
+          min-width="150"
+          prop="itemsName"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          prop="itermsConditions"
+          label="条款内容"
+          width="200"
+          show-overflow-tooltip
+          align="center">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">
+              查看条款内容
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="technicalRequir"
+          align="center"
+          width="200px"
+          label="核心技术要求/变化点">
+        </el-table-column>
+        <el-table-column
+          prop="changePoint"
+          align="center"
+          width="200px"
+          label="基于上一版本差异">
+        </el-table-column>
+        <el-table-column
+          prop="xcxssrq"
+          align="center"
+          width="160px"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="zccssrq"
+          align="center"
+          width="160px"
+          label="在产车实施日期">
+        </el-table-column>
+      </el-table>
+      <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" style="height: 100%">
+        <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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
+    <ProcessFooter
+      show-back
+      show-transfer
+      show-submit
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @transfer="handleTransfer"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <el-dialog
+      title="查看条款内容"
+      :visible.sync="itermsConditionsFlag"
+      size="800px">
+      <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "process/components/ProcessHeader";
+import ProcessFooter from "process/components/ProcessFooter";
+import ProcessTitle from "process/components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
+
+export default {
+  name: "bzpgStep4",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
+      drawerModal: false,
+      loading: false,
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      itermsConditionsFlag: false,
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      commentText: '',
+      drawerTitle: '',
+      itermsConditionsTitle: '',
+      listForm: {},
+      dataList: [],
+      detailData: [],
+      nodeList: [],
+    }
+  },
+  mounted() {
+    this.getData()
+    this.processTable()
+  },
+  methods: {
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.listForm.dataList = item.dataList
+        this.dataList = item.dataList
+        this.dataList.distributePerson = item.dataList[0].distributePerson
+        this.listForm.breakdownList = item.breakdownList
+      })
+    },
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.itermsConditionsFlag = true
+      this.itermsConditionsTitle = row.replace(/''/g, '\'')
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //提交
+    handleSubmit(){
+      this.listForm.commentText = this.commentText
+      this.listForm.stepFlag =  '0'
+      const json = JSON.stringify(this.listForm);
+      this.isSubmit = true
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+    //驳回
+    beforeBack(){
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.commentText = this.commentText
+        this.listForm.stepFlag =  '1'
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true
+        this.$http.post('lawss/activiti/completeTask', {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json,
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        }, e => {
+        });
+      }
+    },
+    //确认转办
+    checkedRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    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 => {})
+    },
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.bzpg-step4 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  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;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+    .input-jump {
+      /deep/.el-input__inner{
+        color: #409EFF;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>

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

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "step5"
+};
+</script>
+
+<style scoped>
+
+</style>

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

@@ -94,12 +94,12 @@
         <div class="button-list">
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '汇总单.xls')"
+                     @click="upload(oldData, '汇总单.xlsx')"
                      size="mini">生成汇总单
           </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(data, '上报意见.xls')"
+                     @click="upload(data, '上报意见.xlsx')"
                      size="mini">生成上报意见
           </el-button>
         </div>

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

@@ -86,12 +86,12 @@
         <div class="button-list">
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '汇总单.xls')"
+                     @click="upload(oldData, '汇总单.xlsx')"
                      size="mini">生成汇总单
           </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(data, '上报意见.xls')"
+                     @click="upload(data, '上报意见.xlsx')"
                      size="mini">生成上报意见
           </el-button>
         </div>

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

@@ -86,12 +86,12 @@
         <div class="button-list">
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '汇总单.xls')"
+                     @click="upload(oldData, '汇总单.xlsx')"
                      size="mini">生成汇总单
           </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(data, '上报意见.xls')"
+                     @click="upload(data, '上报意见.xlsx')"
                      size="mini">生成上报意见
           </el-button>
         </div>

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

@@ -86,12 +86,12 @@
         <div class="button-list">
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '汇总单.xls')"
+                     @click="upload(oldData, '汇总单.xlsx')"
                      size="mini">生成汇总单
           </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(data, '上报意见.xls')"
+                     @click="upload(data, '上报意见.xlsx')"
                      size="mini">生成上报意见
           </el-button>
         </div>

src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue

@@ -0,0 +1,181 @@
+<template>
+    <div class="AddFileDetails">
+        <div class="left">
+            <iframe name = "iframeMap" id="iframeMapViewComponent"  v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)"
+                    width="100%" height="100%"
+                    frameborder="0" scrolling="no" ref="iframeDom"
+            ></iframe>
+        </div>
+        <div class="rightDiv">
+            <div class="height">
+                新增意见
+            </div>
+            <div class="search-area">
+                <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
+                    <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
+                        <el-select filterable v-model="opinionContent.partCode" placeholder="请选择条款章节" @change="optionsChange">
+                            <el-option
+                                    v-for="(item,index) in options"
+                                    :key="index"
+                                    :label="item.itemsNum"
+                                    :value="item.itemsNum"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
+                    </el-form-item>
+                    <el-form-item label="修改前" label-width="" class="add-form-item">
+                        <div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
+                    </el-form-item>
+                    <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
+                    </el-form-item>
+                    <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
+                    </el-form-item>
+                    <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div class="demo-drawer-footer">
+                <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
+                    提交
+                </el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "AddFileDetails",
+        data () {
+            return {
+                options: [],
+                opinionContent: { // 抽屉数据
+                    partCode: '',
+                    oldText: '',
+                    newText: '',
+                    reason: '',
+                    chapterName: '',
+                    cause: '',
+                },
+                opinionContentRules: {
+                    partCode: [
+                        {required: true, message: '请输入章节编号', trigger: 'blur'},
+                    ],
+                    oldText: [
+                        {required: true, message: '请输入修改前内容', trigger: 'blur'}
+                    ],
+                    newText: [
+                        {required: true, message: '请输入修改后内容', trigger: 'blur'}
+                    ],
+                    reason: [
+                        {required: true, message: '请输入修改理由', trigger: 'blur'}
+                    ],
+                },
+                isSubmit: false,
+            }
+        },
+        methods: {
+            saveUserInfo () {
+                this.$refs['formAdd'].validate((valid) => {
+                    if (valid) {
+                        this.isSubmit = true
+                        var form = {
+                            ideaId: this.$route.query.ideaId,
+                            cid: this.$route.query.cid,
+                            oldText: this.opinionContent.oldText,
+                            newText: this.opinionContent.newText,
+                            reason: this.opinionContent.reason,
+                            partCode: this.opinionContent.partCode,
+                            chapterName: this.opinionContent.chapterName,
+                            cause: this.opinionContent.cause,
+                            userId: this.$route.query.userId || '',
+                            userName: this.$route.query.userName || '',
+                            deptName: this.$route.query.institutionName || '',
+                            deptId: this.$route.query.institutionId || '',
+                        }
+                        this.$http.post('slrs/sar-public-idea-all/insetStand', form, {
+                            _this: this
+                        }, res => {
+                            if (res.respCode === '200') {
+                                localStorage.setItem('freshClueNum', new Date().getTime())
+                                this.isSubmit = false
+                                this.opinionContent.partCode = ''
+                                this.opinionContent.reason = ''
+                                this.opinionContent.oldText = ''
+                                this.opinionContent.newText = ''
+                                this.opinionContent.cause = ''
+                                this.opinionContent.chapterName = ''
+                            }
+                        })
+                    }
+                })
+            },
+            optionsChange (data) {
+                for  (let a = 0; a < this.options.length; a++) {
+                    if (data === this.options[a].itemsNum) {
+                        this.opinionContent.oldText = this.options[a].termsConditions
+                        this.opinionContent.chapterName = this.options[a].itemsName
+                    }
+                }
+            },
+        },
+        mounted() {
+            console.log(this.$route.query);
+            this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+                standId: this.$route.query.standId,
+                fileType: this.$route.query.fileType,
+                pageSize: 9999,
+                page: 1
+            }, {}, res => {
+                if (res.ok) {
+                    this.options = res.data.list
+                }
+            }, e => {
+            })
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/mixins';
+    @import '~@/assets/styles/style';
+    .AddFileDetails {
+        height: 100%;
+        display: flex;
+        .left {
+            width: 60%;
+            height: 100%;
+        }
+        .rightDiv {
+            background: #fff;
+            width: 40%;
+            height: 100%;
+            .height {
+                margin-bottom: 0;
+                padding: 10px 20px;
+                font-size: 18px;
+                font-weight: bold;
+                color: #333333;
+                border-bottom: 1px solid #e5e5e5;
+            }
+            .search-area {
+                height: calc(~'100% - 90px');
+                overflow: auto;
+            }
+            .demo-drawer-footer {
+                width: 100%;
+                padding: 0 20px;
+                height: 50px;
+                line-height: 50px;
+                border-top: 1px solid #e8e8e8;
+                text-align: right;
+                background: #fff;
+                z-index: 999;
+            }
+        }
+    }
+</style>

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -250,6 +250,7 @@ export default {
   name: 'consultationDetails',
   data() {
     return {
+        freshClueNum: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
       options: [],
@@ -385,7 +386,7 @@ export default {
     },
     //编辑
     selectStandardPro(type, row) {
-      this.type = type
+        this.type = type
       if (type === 'edit') {
         this.id = row.id
         this.opiniontitle = '编辑意见内容'
@@ -394,16 +395,34 @@ export default {
         this.opinionContent.oldText = row.oldText
         this.opinionContent.newText = row.newText
         this.opinionContent.cause = row.cause
+          this.isDialog = true
       } else {
-        this.id = ''
+          localStorage.setItem('freshClueNum', new Date().getTime())
-        this.opiniontitle = '新增意见'
+          this.freshClueNum = localStorage.getItem('freshClueNum') || '';
-        this.opinionContent.partCode = ''
+          let routeData = this.$router.resolve({
-        this.opinionContent.reason = ''
+              name: "AddFileDetails",
-        this.opinionContent.oldText = ''
+              query: {
-        this.opinionContent.newText = ''
+                  attId: this.fileInfoList[0].attId,
-        this.opinionContent.cause = ''
+                  userId: this.$store.getters.userInfo.userId || '',
+                  userName: this.$store.getters.userInfo.userName || '',
+                  deptName: this.$store.getters.userInfo.institutionName || '',
+                  deptId: this.$store.getters.userInfo.institutionId || '',
+                  standId: JSON.parse(this.$route.query.item.files)[0].standId,
+                  fileType: JSON.parse(this.$route.query.item.files)[0].standFileClassify,
+                  ideaId: this.$route.query.item.id,
+                  cid: this.$route.query.item.cid,
+              }
+          });
+          window.open(routeData.href, '_blank')
+        //   return
+        // this.id = ''
+        // this.opiniontitle = '新增意见'
+        // this.opinionContent.partCode = ''
+        // this.opinionContent.reason = ''
+        // this.opinionContent.oldText = ''
+        // this.opinionContent.newText = ''
+        // this.opinionContent.cause = ''
       }
-      this.isDialog = true
     },
     //删除
     deleteStand(id) {
@@ -449,8 +468,8 @@ export default {
             cause: this.opinionContent.cause,
             userId: this.$store.getters.userInfo.userId || '',
             userName: this.$store.getters.userInfo.userName || '',
-            deptName: this.$store.getters.userInfo.orgName || '',
+              deptName: this.$store.getters.userInfo.institutionName || '',
-            deptId: this.$store.getters.userInfo.orgId || ''
+              deptId: this.$store.getters.userInfo.institutionId || '',
           }
           if (this.type === 'edit') {
             form.id = this.id
@@ -498,6 +517,11 @@ export default {
     }
   },
   mounted() {
+      window.addEventListener("storage", ev => {
+          if(ev.key === 'freshClueNum'){
+              this.getList()
+          }
+      })
     if (JSON.parse(this.$route.query.item.wkfiles).length) {
       this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
     } else {
@@ -522,7 +546,7 @@ export default {
     this.getList()
     this.getIdeaKey()
     this.getFileInfo()
-  }
+  },
 }
 </script>
 

src/router/index.js

@@ -547,6 +547,24 @@ const routes = [
           title: '标准合规评估流程'
         }
       },
+      {
+        path: '/bzpgStep4',
+        name: 'bzpgStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准合规评估流程'
+        }
+      },
+      {
+        path: '/bzpgStep5',
+        name: 'bzpgStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准合规评估流程'
+        }
+      },
       {
         path: '/xmpgStep1',
         name: 'xmpgStep1',
@@ -3720,6 +3738,19 @@ const routes = [
       // menuId: ''
     }
   },
+  {
+    path: '/AddFileDetails',
+    name: 'AddFileDetails',
+    component: () =>
+        import('@/pages/regulatoryRepository/standardForComments/pags/AddFileDetails'),
+    meta: {
+      requireAuth: true,
+      title: '新增',
+      parentPath: '/standardForComments',
+      isBoolean: true,
+      // menuId: ''
+    }
+  },
   {
     path: '/details',
     name: 'Details',