Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

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

@@ -407,7 +407,7 @@ export default {
       this.modalshowflag = true
     },
     drawerCheck (data) {
-      this.roleForm.dockUserName = data[0].id
+      this.roleForm.dockUser = data[0].id
       this.roleForm.dockUserName = data[0].name
       this.modalshowflag = false
     },

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

@@ -193,7 +193,6 @@ export default {
   },
   created() {
     this.getData()
-    this.getTree()
   },
   methods: {
     getData() {
@@ -293,8 +292,8 @@ export default {
     drawerCheck (data) {
       this.roleForm = data[0]
       // 选择责任人时input框内值
-      this.newDataList.dutyPeople = this.roleRow.name
-      this.newDataList.dutyPeopleId = this.roleRow.id
+      this.newDataList.dutyPeople = this.roleForm.name
+      this.newDataList.dutyPeopleId = this.roleForm.id
       this.lastDataList = this.dataList
       this.modalshowflag = false
     },

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

@@ -94,7 +94,7 @@
           <el-table-column prop="dutyEngineer" label="负责人"/>
           <el-table-column label="佐证材料" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-button  type="text" @click="download" >{{scope.row.fileText}}</el-button>
+              <el-button  type="text" @click="download(scope.row)" >{{scope.row.fileText}}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -187,9 +187,7 @@ export default {
     },
     getFormFieldList (item) {
       this.$nextTick(() => {
-        console.log(item)
         this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
-        console.log(this.dataList)
       })
     },
 
@@ -266,14 +264,8 @@ export default {
       this.getData()
     },
     download(row) {
-      // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
-      var name = row.fileText;
-      var url = row.fileTextPath;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
-      a.click()
+      let attId = row.fileTextId
+      window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
     },
     // 分页事件
     pageChange (page) {