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

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

@@ -800,7 +800,6 @@ export default {
       listForm: {
         listType: "", //区分是哪个清单
         listName: "", //清单名称
-        // applyRegion: "", //适用区域
         descriptionList: "", //清单说明
         fileId: "",
         model: "", // 上传模板
@@ -1097,8 +1096,7 @@ export default {
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
-        // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
+        this.$message.success('上传成功')
-        // this.$message.success('上传成功')
       } else {
         this.$message.error(res.message);
         fileList.pop();
@@ -1110,7 +1108,6 @@ export default {
       var index1 = filename.lastIndexOf(".");
       var index2 = filename.length;
       var fileSuffix = filename.substring(index1, index2);
-      // const fileSuffix = file.name.split('.')[1] // 后缀名
       //把后缀转大写
       if (fileSuffix !== undefined && fileSuffix !== null) {
         fileSuffix = fileSuffix.toUpperCase();
@@ -1260,16 +1257,17 @@ export default {
         }
         this.listForm.standId = bringData[0].id;
         this.listForm.listName = bringData[0].detailedListName;
-        this.listForm.applyRegion = bringData[0].applicationScope;
         this.listForm.descriptionList = bringData[0].remark;
         this.listForm.fileId = bringData[0].fileId;
         this.ListModel = false;
-        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, {
+        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
+          { id: bringData[0].id, page: this.page, Size:this.pageSize}, {
           _this: this
         }, res => {
-          if (res.data == null) {
+            console.log(res.data);
-            res.data = [];
+          // if (res.data == null) {
-          }
+          //   res.data = [];
+          // }
           this.dataList = res.data;
           this.listForm.dataList = res.data;
           let formId = [];

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

@@ -37,19 +37,26 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item  label="附件" prop="modelName" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
-                <el-input
+                <div class="file-box" v-if="listForm.model">
-                        disabled
+                  <p> {{ listForm.modelName }}
-                  v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
+                    <i
-                  placeholder="暂无数据"
+                      title="下载"
-                >
+                      @click="downloadFile(listForm.model)"
-                </el-input>
+                      class="icon-download"
-                <el-input
+                      v-btn-permission="''"
-                        disabled
+                    />
-                  v-else
+                    <i
-                  v-model="listForm.modelName"
+                      title="下载带水印"
-                  placeholder=""
+                      @click="downloadFileByWater(listForm.model,listForm.modelName)"
-                ></el-input>
+                      class="icon-download2"
+                      v-btn-permission="''"
+                    />
+                  </p>
+                </div>
+                <div v-else>
+                  暂无数据
+                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -70,6 +77,10 @@
             prop="code"
             width="180px"
             label="标准号">
+            <template slot-scope="scope">
+              <p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
+              <p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
+            </template>
           </el-table-column>
           <el-table-column
             prop="standName"
@@ -225,6 +236,7 @@ export default {
       selectedList: [],  //选择清单的选择框
       selectList: [], //选择标准的选择框
       bringData: [],
+      fileIds: "",
       commentText: "", //填写会签意见
       page: 1,
       total: 0,
@@ -308,10 +320,49 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
+        this.fileIds = item.fileId
+        this.getFileInfo();
       });
     },
-
+    // 请求上传的文件信息
-
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        console.log(res);
+        this.$nextTick(() => {
+          res.data.map(item => {
+           this.listForm.modelName = item.oldFileName
+            this.listForm.model = item.id
+          });
+        });
+      }, e => {
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    },
     //保存事件
     handleSave() {
 
@@ -356,28 +407,6 @@ export default {
     },
     selectThree() {
 
-    },
-    // 请求上传的文件信息
-    getFileInfo() {
-      // this.$http.get("att/attFile/getMultiFileInfos", {
-      //   fileIds: this.sarAccessEO.fileIds
-      // }, {
-      //   _this: this
-      // }, res => {
-      //   console.log(res);
-      //   this.$nextTick(() => {
-      //     res.data.map(item => {
-      //       // 赋值要回显的上传文件内容
-      //       this.fileInfoList.push({
-      //         name: item.oldFileName,
-      //         uid: item.uid,
-      //         status: item.status,
-      //         id: item.id
-      //       });
-      //     });
-      //   });
-      // }, e => {
-      // });
     },
     pageChange(page) {
       this.page = page;
@@ -397,8 +426,6 @@ export default {
   mounted() {
     this.processTable();
     this.getData();
-    this.getFileInfo();
-    // console.log(this.$store.getters.getHandleInfo);
   }
 };
 </script>
@@ -413,6 +440,36 @@ export default {
       padding: 0 20px 0;
     }
   }
+  .fileClass {
+    cursor: pointer;
+  }
+  .fileClass:hover{
+    color: #0c91e5;
+  }
+  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/bzqdfb/step4.vue

@@ -21,14 +21,6 @@
                 >
                     <el-row :gutter="24">
                         <el-col :span="24">
-                            <!--              <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">-->
-                            <!--                <el-radio-group v-model="listType" @change="selectionList">-->
-                            <!--                  <el-radio label="country">国家/地区清单</el-radio>-->
-                            <!--                  <el-radio label="project">项目清单</el-radio>-->
-                            <!--                  <el-radio label="other">其他清单</el-radio>-->
-                            <!--                </el-radio-group>-->
-                            <!--                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button>-->
-                            <!--              </el-form-item>-->
                             <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
                                 <el-input
                                         disabled
@@ -37,14 +29,6 @@
                                         clearable
                                 ></el-input>
                             </el-form-item>
-                            <!--              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">-->
-                            <!--                <el-input-->
-                            <!--                  disabled-->
-                            <!--                  v-model="listForm.applyRegion"-->
-                            <!--                  placeholder="请输入适用区域"-->
-                            <!--                  clearable-->
-                            <!--                ></el-input>-->
-                            <!--              </el-form-item>-->
                             <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
                                 <el-input
                                         disabled
@@ -53,21 +37,27 @@
                                         clearable
                                 ></el-input>
                             </el-form-item>
-                            <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
+                          <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
-                                <el-input
+                            <div class="file-box" v-if="listForm.model">
-                                        disabled
+                              <p> {{ listForm.modelName }}
-                                        v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
+                                <i
-                                        v-model="listForm.modelName"
+                                  title="下载"
-                                        placeholder="暂无数据"
+                                  @click="downloadFile(listForm.model)"
-                                >
+                                  class="icon-download"
-                                </el-input>
+                                  v-btn-permission="''"
-                                <el-input
+                                />
-                                        disabled
+                                <i
-                                        v-else
+                                  title="下载带水印"
-                                        v-model="listForm.modelName"
+                                  @click="downloadFileByWater(listForm.model,listForm.modelName)"
-                                        placeholder=""
+                                  class="icon-download2"
-                                ></el-input>
+                                  v-btn-permission="''"
-                            </el-form-item>
+                                />
+                              </p>
+                            </div>
+                            <div v-else>
+                              暂无数据
+                            </div>
+                          </el-form-item>
                         </el-col>
                     </el-row>
                 </el-form>
@@ -251,7 +241,6 @@
                 listForm: {
                     listType: "", //区分是哪个清单
                     listName: "", //清单名称
-                    // applyRegion: "", //适用区域
                     descriptionList: "", //清单说明
                     enclosure: "", //附件
                     signFlag: "1",   //是否会签 1为会签 2为不会签
@@ -337,6 +326,45 @@
                     this.listForm.zrUserId = item.zrUserId
                 })
             },
+          // 请求上传的文件信息
+          getFileInfo() {
+            this.$http.get("att/attFile/getMultiFileInfos", {
+              fileIds: this.fileIds
+            }, {
+              _this: this
+            }, res => {
+              console.log(res);
+              this.$nextTick(() => {
+                res.data.map(item => {
+                  this.listForm.modelName = item.oldFileName
+                  this.listForm.model = item.id
+                });
+              });
+            }, e => {
+            });
+          },
+          /**
+           * @Description: 点击下载
+           */
+          downloadFile(attId) {
+            if (attId != null && attId !== "") {
+              window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+            } else {
+              this.$message.error("请选择要下载的文件");
+            }
+          },
+          downloadFileByWater(attId, fileSuffix) {
+            let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+            if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+              this.$message.error("水印下载仅支持PDF,pdf格式文件");
+            } else {
+              if (attId != null && attId !== "") {
+                window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+              } else {
+                this.$message.error("请选择要下载的文件");
+              }
+            }
+          },
             //驳回事件
             beforeBack() {
                 this.listForm.approvalOpinion = '1'

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

@@ -496,17 +496,17 @@ export default {
       } else if (this.type === "qualityEngineer") {
         this.roleForm.qualityEngineer = data[0].id;
         this.roleForm.qualityEngineerName =  data[0].name;
-        this.listForm.qualityEngineer = this.roleForm.qualityEngineer;
+        this.listForm.qualityEngineer = data[0].id;
-        this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName;
+        this.listForm.qualityEngineerName = data[0].name;
       } else if (this.type === "certifiedEngineer") {
         this.roleForm.certifiedEngineer = data[0].id;
         this.roleForm.certifiedEngineerName = data[0].name;
-        this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer;
+        this.listForm.certifiedEngineer =  data[0].id;
-        this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName;
+        this.listForm.certifiedEngineerName =  data[0].name;
       } else if (this.type === "distributePerson") {
         this.listForm.distributePerson = data[0].name;
-        this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
+        this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id
-        this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name
+        this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name
         this.showColumn = false;
         this.$nextTick(() => {
           this.showColumn = true

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

@@ -37,16 +37,16 @@
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
+                  disabled
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
+                  disabled
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
                 ></el-input>
               </el-form-item>
             </el-col>

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -30,11 +30,11 @@
         </div>
       </el-card>
       <div class="action-bar">
-        <el-button plain class="common-button-primary" v-btn-permission="'2c4366e07a5b707bf3d3f4985fb82662'" size="mini" @click="addList">调取</el-button>
+        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="addList">调取</el-button>
-        <el-button plain class="common-button-primary" v-btn-permission="'63d9a5a8f7b6a4095511394a60013eac'" size="mini" @click="deleteList">批量删除</el-button>
+        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除</el-button>
         <el-button class="common-button-default export-button"
                    size="mini" @click="exportStandard"
-                   v-btn-permission="'ec6b73db0edd6a379d3ea90af3849861'"
+                   v-btn-permission="''"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                    icon="export"
         >导出</el-button>