Commit b7f1b640d4f2b426c138fc9253ceb58c24eda1bb

Authored by 273548560@qq.com
1 parent 0d928abb

修复bug

trash-ui/src/views/activiti/taskhistory/index.vue
@@ -51,8 +51,7 @@ @@ -51,8 +51,7 @@
51 <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="600px" append-to-body 51 <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="600px" append-to-body
52 :close-on-click-modal="false"> 52 :close-on-click-modal="false">
53 <handleInfo ref="handleAffairsInfoRef" :idInfo="idInfo" v-if="handleAffairsInfoOpen" :depts="depts" 53 <handleInfo ref="handleAffairsInfoRef" :idInfo="idInfo" v-if="handleAffairsInfoOpen" :depts="depts"
54 - :businessKey="definitionKey"  
55 - :controlId="controlId"/> 54 + :businessKey="businessKey"/>
56 </el-dialog> 55 </el-dialog>
57 56
58 <!-- 线下案卷交办 --> 57 <!-- 线下案卷交办 -->
@@ -203,6 +202,8 @@ export default { @@ -203,6 +202,8 @@ export default {
203 conferenceOpen: false, 202 conferenceOpen: false,
204 construct: false, 203 construct: false,
205 leaveApplicationOpen: false, 204 leaveApplicationOpen: false,
  205 + controlId:null,
  206 + depts: [],
206 company:false, 207 company:false,
207 driver:false, 208 driver:false,
208 vehicle:false, 209 vehicle:false,
@@ -299,7 +300,11 @@ export default { @@ -299,7 +300,11 @@ export default {
299 }) 300 })
300 } 301 }
301 if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey == "yuelanxuexi") { 302 if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey == "yuelanxuexi") {
302 - this.controlId = formData[0].controlId; 303 + if(this.definitionKey == "yuelanxuexi"||this.definitionKey == "yuelan"){
  304 + this.businessKey = 'yuelanxuexi1';
  305 + }else if(this.definitionKey == "gongwenchuli"){
  306 + this.businessKey = 'gongwenchuli';
  307 + }
303 this.idInfo = row.businessKey.split(":")[1]; 308 this.idInfo = row.businessKey.split(":")[1];
304 this.handleAffairsInfoOpen = true; 309 this.handleAffairsInfoOpen = true;
305 return; 310 return;
trash-ui/src/views/office/handle/handleInfo.vue
@@ -169,6 +169,8 @@ export default { @@ -169,6 +169,8 @@ export default {
169 init() { 169 init() {
170 getHandle(this.idInfo).then(response => { 170 getHandle(this.idInfo).then(response => {
171 this.form = response.data.handleAffairs; 171 this.form = response.data.handleAffairs;
  172 + console.log(this.form)
  173 + console.log(this.businessKey)
172 let files = JSON.stringify(response.data.uploadFiles); 174 let files = JSON.stringify(response.data.uploadFiles);
173 this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name")); 175 this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
174 }); 176 });