Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/invoicesManager.vue

@@ -150,7 +150,7 @@
         </li>
       </ul>
     </div>
-    <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
+    <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
       <tr>
         <th width="180">团号</th>
         <th>订单号</th>
@@ -191,7 +191,7 @@
             </el-tooltip>
           </td>
         </tr>
-        <tr v-for="(item2, index2) in item.InvoiceApplyList" :key="index2" v-if="index2!==0">
+        <tr v-for="(item2, index2) in item.InvoiceApplyList"  v-if="index2!==0">
           <td>{{item2.CreateDate.replace('T', ' ')}}</td>
           <td>
             <span v-if="item2.InvoiceApplyState === 1" class="status_Application">申请中</span>
@@ -293,11 +293,12 @@ export default {
         this.msg.OrderId = 0
       }
       this.apipost('InvoiceApply_get_GetGroupByInvoiceApplyList', this.msg, res=>{
+        this.loading = false
         if (res.data.resultCode == 1) {
           this.total = res.data.data.count;
           this.dataList = res.data.data.pageData
         }
-        this.loading = false
+        
         if (this.msg.OrderId === 0) {
           this.msg.OrderId = ''
         }

src/components/FinancialModule/invoicesManagerAdd.vue

@@ -288,6 +288,7 @@ export default {
         CustomerId: 0,
         IsDefaultInfo: 1,
         ApplyPics: [],
+        ID: 0,
       },
       DepartName: "",
       emName: "",
@@ -313,7 +314,7 @@ export default {
       this.$viewer = viewer
     },
     showImg(src){
-      src = this.domainManager().ViittoFileUrl + src;
+      src = src.indexOf('http') != -1 ? src : this.domainManager().ViittoFileUrl + src;
       let isExsit=false
       this.images.forEach(x=>{
           if(x==src)
@@ -468,7 +469,30 @@ export default {
         },
         null
       );
-    }
+    },
+    getDetail: function (id) { // 获取详情
+      this.apipost('InvoiceApply_get_GetDetails', {ID: id}, res=>{
+        if (res.data.resultCode == 1) {
+          let detail = res.data.data
+          console.log(detail)
+          if(detail.ApplyPics && detail.ApplyPics.length>0){
+            detail.ApplyPics.forEach(x=>{
+              console.log(x,'1111111')
+              if(x.Type==='3'){
+                this.saveMsg.push({
+                  Type: x.Type,
+                  Url: x.Url
+                });
+                this.images.push(x.Url)
+              }
+            })
+          }
+          this.detail = detail
+          this.getOrderDetail();
+        }
+        this.loading = false
+      }, null)
+    },
   },
   mounted() {
     let userInfo = this.getLocalStorage();
@@ -480,6 +504,10 @@ export default {
     this.getAccountList();
     this.getOrderDetail();
     this.getCustomerInvoiceList();
+    if (this.$route.query.edit) {
+      this.msg.ID = this.$route.query.id
+      this.getDetail(this.$route.query.id)
+    }
   }
 };
 </script>

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -346,6 +346,9 @@
       </div>
     </el-dialog>
     <div style="padding:20px 0">
+      <el-row v-if="detail.InvoiceApplyState === 4">
+        拒绝说明：{{detail.RefuseRemarks}}
+      </el-row>
       <el-row v-if="detail.InvoiceNo">
         {{$t('ios.shuihao2')}}{{detail.InvoiceNo}}
       </el-row>
@@ -358,6 +361,8 @@
       <button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>
     </div>
     <div class="imd_img_box">
+       <!-- v-show="EmployeeId === detail.CreateById && detail.InvoiceApplyState === 4" -->
+      <button class="normalBtn" v-show="EmployeeId === detail.CreateById && detail.InvoiceApplyState === 4" @click="goEdit()">修改</button>
       <div class="_fujian_box" >
         <div v-if="detail.ApplyPics&&detail.ApplyPics.length>0">
           <div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">
@@ -388,7 +393,7 @@
             </div>
           </div>
         </div>
-        <div v-else-if="!detail.ApplyPics && EmployeeId === detail.CreateBy">
+        <div v-else-if="!detail.ApplyPics && EmployeeId === detail.CreateById">
           <div class="_addUpload_box _addUpload_box_btm clearfix" >
             <template v-for="(file,fIndex) in saveMsg">
               <div v-if="file.Type==3">
@@ -417,7 +422,7 @@
             </div>
             <div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
           </div>
-        </div>
+        </div> 
         <div class="querenhan">
           <p >确认函</p>
           <div style="width:100%;" >
@@ -483,6 +488,10 @@ export default {
     };
   },
   methods: {
+    // 修改
+    goEdit: function () {
+       this.$router.push({ name: 'invoicesManagerAdd', query:{id: this.detail.ID, OrderId: this.detail.OrderId, TCID: this.detail.TCID, CustomerId: this.detail.CustomerId, edit: 1, blank:'y', tab:'修改发票单据'} })
+    },
     uploadFileBtn(file) { //上传
       if(file.file.size > 1024 * 1024 * 10) {
         this.$message.warning('文件大小不能超过10M！')