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

src/components/FinancialModule/BasicDocuments.vue

@@ -3669,6 +3669,7 @@
           if (res.data.resultCode == 1) {
             let data = res.data.data;
             this.benMoney = 0
+            this.AuditOrRefundMsg.KingdeeInvoice=data.KingdeeInvoice+"";
             data.DetailList.forEach(x => {
               x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
               x.Money = Math.round(x.Money * 100) / 100

src/components/FinancialModule/addFinancialDocuments.vue

@@ -907,6 +907,45 @@
               </div>
             </div>
           </div>
+
+          <div v-if="$route.query.Type==2||msg.Type==2">
+            <p>上传发票附件<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span><span class="_addUpload_tips" style="color:red;">此单如暂无发票 请忽略</span></p>
+            <!-- <el-upload
+                               :http-request="uploadFileBtn"
+                               :multiple="true"  :show-file-list="false"  action="">
+                           <el-button size="small" type="danger" icon="el-icon-upload2">上传</el-button>
+                       </el-upload> -->
+            <div class="_addUpload_box clearfix">
+              <template v-for="(file,fIndex) in saveMsgInvoice">
+                <div v-if="file.Type==3">
+                  <div style="width:100%;height:100%;overflow: hidden;">
+                    <img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)">
+                  </div>
+                  <span class="iconfont icon-guanbi1" @click="deleteInvoiceUploadFile(fIndex)"></span>
+                </div>
+                <div v-if="file.Type==1">
+                  <div class="iconfont "
+                    :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
+                    @click="showUpLoadFile(file)">
+
+                  </div>
+                  <span class="iconfont icon-guanbi1" @click="deleteInvoiceUploadFile(fIndex)"></span>
+                </div>
+                <div v-if="file.Type==2">
+                  <div class="iconfont icon-excel" @click="showUpLoadFile(file)">
+
+                  </div>
+                  <span class="iconfont icon-guanbi1" @click="deleteInvoiceUploadFile(fIndex)"></span>
+                </div>
+              </template>
+              <div class="_pic_upload">
+                <el-upload drag :http-request="uploadFileInvoiceBtn" :multiple="true" :show-file-list="false" action="">
+                  <i class="el-icon-plus avatar-uploader-icon"></i>
+                  <div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
+                </el-upload>
+              </div>
+            </div>
+          </div>
           <div class="_submit">
             <div class="chosenNextBox">
               <div
@@ -930,6 +969,11 @@
             <button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button>
           </div>
         </div>
+
+
+
+
+        
         <div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]">
           <div
             style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;">
@@ -987,6 +1031,7 @@
           Status: 1,
           URL: this.$route.query.path,
           vorcherInos: [],
+          InvoiceVoucherInfo:[],
           IsPublic: '',
           Cmd: '',
           emList: [],
@@ -1066,6 +1111,7 @@
           'Content-Type': 'application/octet-stream'
         },
         saveMsg: [],
+        saveMsgInvoice:[],
         picIsShow: false,
         picObj: [],
         initialIndex: 0,
@@ -1472,6 +1518,50 @@
           }
         }
       },
+      deleteInvoiceUploadFile(i) { // 删除上传文件
+        this.saveMsgInvoice.splice(i, 1);
+      },
+
+      uploadFileInvoiceBtn(file) { //上传
+        if (file.file.size > 1024 * 1024 * 10) {
+          this.$message.warning(this.$t('tips.wjdxbncgsz'))
+          return
+        }
+        //  1 文档  2 数据 3 图片
+        let typeArr = [{
+            stringArr: 'GIF|JPG|JPEG|PNG|BMP',
+            type: 3
+          },
+          {
+            stringArr: 'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',
+            type: 1
+          },
+        ]
+        let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
+        let fileTypeNumber = 2;
+        let typeOk = false;
+        typeArr.forEach(x => {
+          if (x.stringArr.indexOf(ft) != '-1') {
+            fileTypeNumber = x.type;
+            typeOk = true;
+          }
+        })
+        if (!typeOk) return this.$message.error(this.$t('tips.qscWEfile'));
+        let newArr = [];
+        newArr.push(file.file)
+        let path = "/Upload/Temporary/"
+        this.$message.info(this.$t('tips.shangchuanzhong'))
+        this.UploadSelfFileT(path, newArr, x => {
+          let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
+          this.saveMsgInvoice.push({
+            Content: x.data.FilePath,
+            ID: 0,
+            Type: fileTypeNumber,
+            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
+          })
+          this.$message.success(this.$t('tips.scchenggong'))
+        }, 1);
+      },
       deleteUploadFile(i) { // 删除上传文件
         this.saveMsg.splice(i, 1);
       },
@@ -1599,6 +1689,7 @@
         delete this.msg.DetailList;
         delete this.msg.VorcherInos;
         this.msg.vorcherInos = this.saveMsg;
+        this.msg.InvoiceVoucherInfo=this.saveMsgInvoice;
         this.msg.emList = this.chosenPeople;
         if (this.orderObj) {
           this.msg.VisaIds = this.orderObj.VisaIds ? this.orderObj.VisaIds : '';
@@ -2199,6 +2290,7 @@
           TempId: tempId,
           TCIDList: (this.orderObj && this.orderObj.TCIDList) ? this.orderObj.TCIDList : []
         }, res => {
+          console.log("Financial_post_Get",res.data.data);
           if (res.data.resultCode == 1) {
             let data = res.data.data;
 
@@ -2371,6 +2463,14 @@
                 this.saveMsg.push(x);
               })
             }
+
+            console.log("InvoiceVoucherInfo",data.InvoiceVoucherInfo);
+            if (data.InvoiceVoucherInfo) {
+              data.InvoiceVoucherInfo.forEach(x => {
+                x.Url = x.Content;
+                this.saveMsgInvoice.push(x);
+              })
+            }
             if (this.msg.TCIDAndTCNUMList == null) {
               this.msg.TCIDAndTCNUMList = [];
             }