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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1121,17 +1121,42 @@
             <template v-if="true">
               <div style="border-top: 1px solid #dedede;margin-top: 10px;
           padding: 0 0 10px 0;"
-          v-if="GetDetail.KingdeeInvoice&&(GetDetail.KingdeeInvoice==1||GetDetail.KingdeeInvoice==3)&&(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)&&GetDetail.InvoiceState!=2">
+          v-if="GetDetail.KingdeeInvoice&&(GetDetail.KingdeeInvoice==1||GetDetail.KingdeeInvoice==3)
+          &&(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)">
             <p
             style="margin-top: 10px;">
               <span style="color: red;">发票凭证</span>
+              <span style="color: #33B3FF;margin-left: 10px;">
+                <template v-if="GetDetail.InvoiceState==2">已审核</template>
+                <template v-if="GetDetail.InvoiceState==1">待审核</template>
+              </span>
             </p>
-            <div class="_addUpload_box _addUpload_box_btm clearfix" v-if="InvoiceVoucherList.length>0">
-              <template v-for="(file,fIndex) in InvoiceVoucherList">
+            <div class="_addUpload_box _addUpload_box_btm clearfix">
+              <template v-if="GetDetail.InvoiceVoucherInfo&&GetDetail.InvoiceVoucherInfo.length>0"
+                v-for="(file,fIndex) in GetDetail.InvoiceVoucherInfo">
                 <div v-if="file.Type==3">
                   <div style="width:100%;height:100%;overflow: hidden;">
                     <el-image
-                    style="width: 100%; height: auto"
+                    style="width: 100%; height: 100%"
+                    :src="file.Url?file.Url:file.Content"
+                    :preview-src-list="[file.Url?file.Url:file.Content]">
+                  </el-image>
+                  </div>
+                </div>
+                <div v-if="file.Type==1">
+                  <div class="iconfont _wenjian_P"
+                  style="line-height: 80px;"
+                    :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
+                    @click="showUpLoadFileT(file)">
+                  </div>
+                </div>
+              </template>
+              <template v-if="InvoiceVoucherList.length>0"
+                v-for="(file,fIndex) in InvoiceVoucherList">
+                <div v-if="file.Type==3">
+                  <div style="width:100%;height:100%;overflow: hidden;">
+                    <el-image
+                    style="width: 100%; height: 100%"
                     :src="file.Url?file.Url:file.Content"
                     :preview-src-list="[file.Url?file.Url:file.Content]">
                   </el-image>
@@ -1143,6 +1168,7 @@
                 </div>
                 <div v-if="file.Type==1">
                   <div class="iconfont _wenjian_P"
+                  style="line-height: 80px;"
                     :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
                     @click="showUpLoadFileT(file)">
                   </div>
@@ -2686,9 +2712,6 @@
             this.FrID = this.GetDetail.FrID;
             this.SourceID = this.GetDetail.SourceID;
             this.Callback = this.GetDetail.Callback;
-            if(this.GetDetail.InvoiceVoucherInfo&&this.GetDetail.InvoiceVoucherInfo.length>0){
-              this.InvoiceVoucherList = JSON.parse(JSON.stringify((this.GetDetail.InvoiceVoucherInfo)))
-            }
             if (this.GetDetail.DetailList.length > 0) {
               this.GetDetail.DetailList.forEach(item => {
                 if (item.CostTypeName == "差旅费") {