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

src/pages/config/pages/linkManage/index.vue

@@ -50,7 +50,10 @@
                 <el-table-column
                         label="链接">
                   <template slot-scope="scope" >
-                    <span @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">{{ scope.row.url }}</span>
+                    <span v-if="scope.row.url.slice(0,7) === 'http://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
+                      {{ scope.row.url }}
+                    </span>
+                    <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">{{ scope.row.url }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -92,8 +95,8 @@
                 </el-form-item>
                 <el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
                     <el-input v-model="sarStandardsInfoEO.url"
-                              placeholder="请输入链接"
+                              placeholder="请输入链接">
-                              clearable></el-input>
+                    </el-input>
                 </el-form-item>
             </el-form>
             <span slot="footer" class="demo-drawer-footer">

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

@@ -37,18 +37,40 @@
                   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">-->
-                <div class="file-box" v-if="listForm.model">
+<!--                <div class="file-box" v-if="listForm.model">-->
-                  <p> {{ listForm.modelName }}
+<!--                  <p> {{ listForm.modelName }}-->
+<!--                    <i-->
+<!--                      title="下载"-->
+<!--                      @click="downloadFile(listForm.model)"-->
+<!--                      class="icon-download"-->
+<!--                      v-btn-permission="''"-->
+<!--                    />-->
+<!--                    <i-->
+<!--                      title="下载带水印"-->
+<!--                      @click="downloadFileByWater(listForm.model,listForm.modelName)"-->
+<!--                      class="icon-download2"-->
+<!--                      v-btn-permission="''"-->
+<!--                    />-->
+<!--                  </p>-->
+<!--                </div>-->
+<!--                <div v-else>-->
+<!--                  暂无数据-->
+<!--                </div>-->
+<!--              </el-form-item>-->
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+                <div class="file-box" v-if="fileList.length > 0">
+                  <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="''"
                     />
@@ -255,6 +277,7 @@ export default {
       selectList: [], //选择标准的选择框
       bringData: [],
       commentText: "", //填写会签意见
+      fileList:[],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -356,6 +379,9 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
+        this.fileIds = item.fileId;
+        console.log(this.fileIds);
+        this.getFileInfo();
       });
     },
     // 请求上传的文件信息
@@ -365,11 +391,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 => {
@@ -399,8 +429,27 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.approvalOpinion = "1";
+      if(!this.commentText){
-      this.handleSubmit();
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.approvalOpinion = "1";
+        this.saveLoading = true
+        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.saveLoading = false
+        });
+      }/**/
     },
     //提交事件
     handleSubmit() {
@@ -480,6 +529,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/xmpg2/step3.vue

@@ -282,7 +282,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      console.log(item)
+      console.log(item);
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
@@ -304,14 +304,14 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
+          if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", "");
-            this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", "");
-          }else{
+          } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -354,7 +354,10 @@ export default {
     },
     //提交事件
     handleSubmit() {
-        this.isSubmit = true
+      if (!this.listForm.jgUser) {
+        this.$message.warning("请选择架构经理");
+      } else {
+        this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.$http.post("lawss/activiti/completeTask", {
@@ -368,9 +371,10 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
-          this.isSubmit = false
+          this.isSubmit = false;
         }, e => {
         });
+      }
     },
     choiceZRR(scope, type, title, id) {
       if (scope != null) {

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

@@ -108,12 +108,12 @@
           >
           </el-table-column>
           <el-table-column
-            label="责任人"
+            label="分发责任人"
             width="170"
             align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.liablePeopleId" style="display: none;"/>
-              <el-input v-model="scope.row.liablePeople" placeholder="请选择落实人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/>
+              <el-input v-model="scope.row.liablePeople" placeholder="请选择分发责任人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -370,6 +370,7 @@ export default {
       if(this.peopleFlag === true){
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        console.log(json)
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -430,6 +431,7 @@ export default {
       if (this.type === 1) {
         this.dataList[this.zrIndex].liablePeopleId = data[0].id
         this.dataList[this.zrIndex].liablePeople = data[0].name
+        this.$forceUpdate()
       } else if(this.type === 2) {
         this.dataList.forEach( item => {
           this.selectList.forEach( items => {
@@ -437,6 +439,7 @@ export default {
               item.liablePeopleId = data[0].id
               item.liablePeople = data[0].name
             }
+            this.$forceUpdate()
           })
         })
       }
@@ -451,6 +454,14 @@ export default {
       return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
     }
   },
+  watch: {
+    // dataList: {
+    //   deep: true,
+    //   handler (val) {
+    //     console.log('dataList update', val)
+    //   }
+    // }
+  },
   mounted() {
     this.processTable();
     this.getData();

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

@@ -315,6 +315,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg)
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -189,7 +189,7 @@
           align="center"
           label="项目经理">
         </el-table-column>
-        <el-table-column label="" fixed="right" width="50" :resizable="false">
+        <el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
           <template slot-scope="scope">
             <div @click.stop style="display: inline-block">
               <el-dropdown trigger="click" @command="handleCommand">