Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -20,7 +20,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward']
 let devModules = ['all']
-// let devModules = ['index','sale']
+//let devModules = ['index','sale']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
 //  let devModules = ['index','WMS','appoint','TMS','inward','statisticalReport','sale']

src/views/sale/components/transport_excute/tms-offsite/receiptResult.vue

@@ -310,6 +310,15 @@ export default {
           if(res.data.resultReceiveNotePhoto!=null){
              this.srcList.push(res.data.resultReceiveNotePhoto);
           }
+          if(res.data.otherPhoto1!=null){
+             this.srcList.push(res.data.otherPhoto1);
+          }
+          if(res.data.otherPhoto2!=null){
+             this.srcList.push(res.data.otherPhoto2);
+          }
+          if(res.data.otherPhoto3!=null){
+             this.srcList.push(res.data.otherPhoto3);
+          }
        });
        
     },