修改bug

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue

@@ -37,18 +37,19 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="listForm.model">
+                <div class="file-box" v-if="fileList.length > 0">
-                  <p> {{ listForm.modelName }}
+                  <p v-for="item in fileList"
+                     :key="item.id"> {{ item.name }}
                     <i
                       title="下载"
-                      @click="downloadFile(listForm.model)"
+                      @click="downloadFile(item.id)"
                       class="icon-download"
                       v-btn-permission="''"
                     />
                     <i
                       title="下载带水印"
-                      @click="downloadFileByWater(listForm.model,listForm.modelName)"
+                      @click="downloadFileByWater(item.id, item.name)"
                       class="icon-download2"
                       v-btn-permission="''"
                     />
@@ -204,6 +205,15 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -211,7 +221,8 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail } from "api/process";
+import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
+
 export default {
   name: "bzqdfbStep1-4",
   components: {
@@ -221,6 +232,11 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      isTransfer: false,
+      drawerTitle:'',
+      // 调整处理人抽屉状态
+      drawerModal: false,
       detailData: [],
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -236,10 +252,12 @@ export default {
       selectList: [], //选择标准的选择框
       bringData: [],
       commentText: "", //填写会签意见
+      fileList:[],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
+        fileIds: '',
         listType: "", //区分是哪个清单
         listName: "", //清单名称
         descriptionList: "", //清单说明
@@ -274,6 +292,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    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,
@@ -337,6 +396,15 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
+        let filesId = []
+        item.fileName.forEach(itemIds =>{
+          filesId.push(itemIds.id)
+        })
+        this.listForm.fileId = filesId.join(',')
+        item.fileName.forEach(itemId => {
+          this.fileIds = itemId.id
+          this.getFileInfo();
+        })
       });
     },
     // 请求上传的文件信息
@@ -346,11 +414,15 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res);
         this.$nextTick(() => {
           res.data.map(item => {
-            this.listForm.modelName = item.oldFileName;
+            // 赋值要回显的上传文件内容
-            this.listForm.model = item.id;
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
           });
         });
       }, e => {
@@ -378,18 +450,13 @@ export default {
         }
       }
     },
-    //驳回事件
+    // 驳回事件
     beforeBack() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+      if(!this.commentText){
-        this.$message.warning("请填写审批意见");
+        this.$message.warning('请填写审批意见')
-      } else {
+      }else{
         this.listForm.approvalOpinion = "1";
-        this.handleSubmit();
+        this.saveLoading = true
-      }
-    },
-    //提交事件
-    handleSubmit() {
-        this.isSubmit = true
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.$http.post("lawss/activiti/completeTask", {
@@ -403,8 +470,29 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
-          this.isSubmit = false
+          this.saveLoading = false
         });
+      }/**/
+    },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true;
+      this.listForm.approvalOpinion = "2";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      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
+      });
     },
     //选择标准取消事件
     closeDrawer() {
@@ -465,6 +553,31 @@ export default {
       padding: 0 20px 0;
     }
   }
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
 
   .choiceBtn {
     .el-button--primary {

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

@@ -191,7 +191,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectProjectChange"
@@ -499,7 +499,6 @@ export default {
       }, res => {
         this.ProjectDatas = res.data.total.records;
         this.total = res.data.total.total;
-        this.page = 1;
       }, e => {
 
       });
@@ -840,6 +839,10 @@ export default {
       }
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 

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

@@ -59,6 +59,7 @@
                 <el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceList">选择清单</el-button>
                 <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
+                         :picker-options="pickerOptions"
                           v-model="qdform.endTime"
                           type="date"
                           placeholder="请选择截止日期"
@@ -198,7 +199,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectProjectChange"
@@ -398,6 +399,11 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
       multipleSelection: [],
       active: "1", //默认显示
       commentText: "",
@@ -503,7 +509,6 @@ export default {
       }, res => {
         this.ProjectDatas = res.data.total.records;
         this.total = res.data.total.total;
-        this.page = 1;
       }, e => {
 
       });
@@ -834,6 +839,10 @@ export default {
       }
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 

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

@@ -137,7 +137,7 @@
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="回执说明">
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -6,23 +6,27 @@
         <el-form :modal="nonConformitySearch" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
             <el-input v-model="nonConformitySearch.standSerialNumber"
-                      placeholder="请输入"
+                      placeholder="根据标准号/标准名称查询"
                       clearable
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="项目名称" class="search-item">
             <el-input v-model="nonConformitySearch.productName"
-                      placeholder="请输入"
+                      placeholder="根据项目名称查询"
                       clearable
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
+            <el-input v-model="nonConformitySearch.responsibleUnit"
-              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                      placeholder="根据责任部门查询"
-                         :label="opt.label">
+                      clearable
-                {{ opt.label }}
+                      :maxlength="100"></el-input>
-              </el-option>
+<!--            <el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>-->
-            </el-select>
+<!--              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
+<!--                         :label="opt.label">-->
+<!--                {{ opt.label }}-->
+<!--              </el-option>-->
+<!--            </el-select>-->
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button