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

src/components/FinancialModule/invoicesManager.vue

@@ -407,7 +407,7 @@ export default {
     goIisDetail: function (id) {
       this.$router.push({
         name: 'invoicesManagerDetail',
-        query: { id: id,InvoiceApplyType:this.msg.InvoiceApplyType,blank: "y",}
+        query: { id: id,InvoiceApplyType:this.msg.InvoiceApplyType,IsDetail:1,blank: "y",}
       });
     },
     setStatus: function (id, type) {

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -448,7 +448,7 @@
             </div>
           </div>
         </div>
-        <div v-else-if="!detail.ApplyPics && EmployeeId === detail.CreateById">
+        <div v-if="(!detail.ApplyPics && EmployeeId === detail.CreateById)||(IsDetail==1&&detail.InvoiceApplyState === 1)">
           <div class="_addUpload_box _addUpload_box_btm clearfix">
             <template v-for="(file,fIndex) in saveMsg">
               <div v-if="file.Type==3" :key="fIndex+30000">
@@ -476,6 +476,9 @@
             <div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
           </div>
         </div>
+
+
+
         <div class="querenhan">
           <p>确认函</p>
           <div style="width:100%;">
@@ -543,6 +546,7 @@
         fujianShow: true,
         saveMsg: [],
         F_GeneralManager: false,
+        IsDetail:0,
       };
     },
     methods: {
@@ -757,6 +761,9 @@
           InvoiceApplyType: this.InvoiceApplyType?this.InvoiceApplyType:1
         }, res => {
           if (res.data.resultCode == 1) {
+            this.saveMsg=[];
+            this.FuImgList=[];
+            this.images=[];
             let detail = res.data.data
             if (detail.ApplyPics && detail.ApplyPics.length > 0) {
               detail.ApplyPics.forEach(x => {
@@ -764,6 +771,11 @@
                   this.FuImgList.push(x.Url);
                   this.images.push(x.Url)
                 }
+                this.saveMsg.push({
+            Type: x.Type,
+            Content: x.Url.replace("http://192.168.5.46:8130",""),
+            Url: x.Url,
+          });
               })
             }
             this.detail = detail
@@ -775,6 +787,9 @@
       closeChangeMachie(done) { //  转交窗口关闭
         done();
       },
+      deleteUploadFile(i) { // 删除上传文件
+        this.saveMsg.splice(i, 1);
+      },
       getOrderDetail: function () { // 获取交易信息详情
         // let OrderResource = this.InvoiceApplyType ? 10 : 8
         let OrderResource = 8 //团队订
@@ -831,6 +846,14 @@
         this.InvoiceApplyType = this.crmOrderObj.InvoiceApplyType
         id = this.crmOrderObj.id
       }
+      if(this.$route.query.crmOrderObj){
+        this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+        this.InvoiceApplyType = this.crmOrderObj.InvoiceApplyType
+        id = this.crmOrderObj.id
+      }
+      if(this.$route.query.IsDetail){
+        this.IsDetail = this.$route.query.IsDetail
+      }
       //是否显示审核按钮
       this.noDetail = this.$route.query.noDetail ? true : false
       this.msg.ID = id