财务备注

src/assets/common/lang/zhCN/fill.js

@@ -7546,6 +7546,8 @@ export const obj = {
     chegou: '车购',
     jindianmenp: '景点门票',
     chengbenxiaz: '成本下载',
+    caiwnbubeiz: '财务内部备注',
+    xinzbji: '新增/编辑',
   },
   //#endregion
 }

src/assets/common/lang/zhTW/fill.js

@@ -7546,6 +7546,8 @@ export const obj = {
     chegou: '車購',
     jindianmenp: '景點門票',
     chengbenxiaz: '成本下載',
+    caiwnbubeiz: '財務內部備注',
+    xinzbji: '新增/編輯',
   }
   //#endregion
 }

src/components/FinancialModule/BasicDocuments.vue

@@ -2185,7 +2185,8 @@ class="w135 _border_b_1">
   :clientData="clientData" @ClosePopup="isReceivablesAccount=false"></OrderReceivablesAccount>
   <!--供应商信息-->
   <ClientBankAccount v-if="isClientBankAccount" :GetDetail="GetDetail"
-  :clientBankAccountData="clientBankAccountData" @ClosePopup="isClientBankAccount=false"></ClientBankAccount>
+  :clientBankAccountData="clientBankAccountData" @ClosePopup="isClientBankAccount=false"
+  @success="Financial_post_GetDetail(ID)"></ClientBankAccount>
     <!--代收/代付公司-->
     <HelpBranch v-if="GetDetail.HelpBranchId>-1"
   :helpBranchData="helpBranchData" ></HelpBranch>

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1587,7 +1587,8 @@
     <HelpBranch v-if="GetDetail.HelpBranchId>-1" :helpBranchData="helpBranchData"></HelpBranch>
     <!--供应商信息-->
     <ClientBankAccount v-if="isClientBankAccount" :GetDetail="GetDetail" :clientBankAccountData="clientBankAccountData"
-      :ClientBankAccountTop="ClientBankAccountTop" @ClosePopup="isClientBankAccount=false"></ClientBankAccount>
+      :ClientBankAccountTop="ClientBankAccountTop" @ClosePopup="isClientBankAccount=false"
+      @success="Financial_post_GetDetail(ID)"></ClientBankAccount>
 
   </div>
 </template>

src/components/FinancialModule/components/ClientBankAccount.vue

@@ -154,6 +154,12 @@
   right: -7px;
   top: 18px;
 }
+/deep/.page_fdd ._pic_upload .el-upload--text.el-upload{
+  width: 121px;
+}
+/deep/.page_fdd .el-upload-dragger{
+  width: 121px !important;
+}
 </style>
 
 <template>
@@ -326,6 +332,64 @@
         </el-table>
       </div>
     </template>
+    <template v-if="isFinance_ExpenseType">
+    <div class="border-b"></div>
+      <div class="OrderReceivablesAccount-title" style="display: flex;flex-direction: row;justify-content: space-between;">
+        <span>{{$t('objFill.v101.caiwnbubeiz')}}/{{$t('objFill.fj')}}</span>
+        <div>
+          <el-button v-if="!idEditFinNote" size="mini" round @click="idEditFinNote=true">{{$t('objFill.v101.xinzbji')}}</el-button>
+          <template v-else>
+            <el-button size="mini" round icon="el-icon-close" @click="closeFinNote"></el-button>
+            <el-button type="primary" size="mini" round @click="saveFinNote">{{$t('pub.saveBtn')}}</el-button>
+          </template>
+
+        </div>
+      </div>
+      <div class="OrderReceivablesAccount-center" style="margin-bottom: 10px;">
+        <div v-if="!idEditFinNote">
+          {{$t('fnc.beizhu')}}{{saveMsg.Remark}}
+        </div>
+        <div v-else>
+          <el-input
+          type="textarea"
+          :rows="2"
+          :placeholder="$t('objFill.qingshurbzxx')"
+          v-model="saveMsg.Remark">
+        </el-input>
+        </div>
+      </div>
+      <!-- <div class="OrderReceivablesAccount-title">
+        {{$t('objFill.fj')}}
+      </div> -->
+      <div class="OrderReceivablesAccount-center page_fdd" style="display: flex;flex-direction: row;flex-wrap: wrap;">
+        <div class="_pic_upload" v-if="idEditFinNote">
+          <!--<div class="_pic_upload" v-if="saveMsg.length!==5 && ((saveMsg.length + GetDetail.VorcherInos.length) < 5)">-->
+          <el-upload drag :http-request="uploadFileBtn" :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 class="_pic_upload" v-for="(item,index) in saveMsg.Voucher" style="display: flex;flex-direction: row;flex-wrap: wrap;">
+          <div style="margin-left: 5px;width: 80px;height: 80px;border-radius: 3px; overflow: hidden;position: relative;">
+            <el-image v-if="item.Type==3"
+            style="width: 80px; height: 80px"
+            :src="item.Content"
+            :initial-index="index"
+            :preview-src-list="srcList"
+            fit="cover">
+          </el-image>
+          <div v-if="item.Type==1" style="width: 80px; height: 80px;text-align: center;line-height: 80px;background: #eee;">
+            <div class="iconfont _wenjian_P"
+              :class="item.Content.substring(item.Content.lastIndexOf('.')+1,item.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
+              @click="showUpLoadFile(item.Content)">
+
+            </div>
+          </div>
+            <i type="primary" v-if="idEditFinNote" class="cursor-p el-icon-circle-close circleData" @click="cancelFinNoteImg(index)" style="top: 0;right: 0;"></i>
+          </div>
+        </div>
+      </div>
+    </template>
   </div>
 
 </template>
@@ -350,7 +414,15 @@
        },
        activeIndx: null,
        FDList: [],
-       IsExpensesMonthlyShare:false
+       IsExpensesMonthlyShare:false,
+       saveMsg: {
+        FrId: 0,
+        Remark: '',
+        Voucher: []
+       },
+       srcList: [],
+       idEditFinNote: false,
+       isFinance_ExpenseType: false,
       }
     },
     watch: {
@@ -360,7 +432,20 @@
         },
         deep: true,
         immediate: false
-      }
+      },
+      GetDetail:{
+        handler(val, oldVal){
+          // this.saveMsg.Voucher = val.FInnerVoucher
+          this.msg.BaseFinanceId = this.GetDetail.FrID
+          this.saveMsg.FrId = this.GetDetail.FrID
+          this.saveMsg.Voucher = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?JSON.parse(JSON.stringify(this.GetDetail.FInnerVoucher)):[]
+          this.saveMsg.Remark = this.GetDetail.FInnerRemark
+          this.srcList = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?this.GetDetail.FInnerVoucher.map(x=>{return x.Content}):[]
+        },
+        deep: true,
+        immediate: false
+      },
+
     },
     created() {
       let userInfo = this.getLocalStorage();
@@ -368,11 +453,90 @@
       if (ActionMenuCode.indexOf('Finance_ExpenseType') != -1) {
         this.IsExpensesMonthlyShare=true;
       }
+      if (ActionMenuCode.indexOf('Finance_ExpenseType') != -1) {
+        this.isFinance_ExpenseType=true;
+      }
 
       this.msg.BaseFinanceId = this.GetDetail.FrID
+      this.saveMsg.FrId = this.GetDetail.FrID
+      this.saveMsg.Voucher = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?JSON.parse(JSON.stringify(this.GetDetail.FInnerVoucher)):[]
+      this.saveMsg.Remark = this.GetDetail.FInnerRemark
+      this.srcList = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?this.GetDetail.FInnerVoucher.map(x=>{return x.Content}):[]
       if(this.GetDetail.SpecialType==11) this.GetExpensesMonthlyShare()
     },
     methods: {
+      showUpLoadFile(i) { // 预览上传文件
+          if (i.Content.substring(i.Content.lastIndexOf('.') + 1, i.Content.length).toUpperCase() == 'PDF') {
+            this.previewPDF(i.Content)
+          } else {
+            let dom = document.querySelector("#groupTourOrder_DownLoad");
+            dom.href = i.Content;
+            dom.click();
+            window.open("https://view.officeapps.live.com/op/view.aspx?src=" + i.Content)
+          }
+      },
+      closeFinNote(){
+        this.idEditFinNote = false
+        this.saveMsg.Voucher = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?JSON.parse(JSON.stringify(this.GetDetail.FInnerVoucher)):[]
+        this.saveMsg.Remark = this.GetDetail.FInnerRemark
+      },
+      cancelFinNoteImg(index){
+        this.saveMsg.Voucher.splice(index,1)
+      },
+      saveFinNote(){
+        let msg = this.saveMsg
+        if(!msg.Remark||msg.Remark=='') return this.$message.warning(this.$t('objFill.qingshurbzxx'))
+        this.apipost('Financial_post_SetFinanceInnerRemark', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.idEditFinNote = false
+            this.$message.success(res.data.message);
+            this.$emit('success')
+          } else {
+            this.$message.error(res.data.message);
+          }
+        }, err => {})
+
+      },
+      uploadFileBtn(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.saveMsg.Voucher.push({
+            Type: fileTypeNumber,
+            Content: this.domainManager().ViittoFileUrl+x.data.FilePath,
+            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
+          });
+          this.srcList = this.saveMsg.Voucher.map(x=>{return x.Content})
+          this.$message.success(this.$t('tips.scchenggong'));
+        });
+      },
       getCostType(){
         let obj = this.GetDetail.DetailList.filter(x=>{return x.ID==this.msg.RelevanceFrId})
         this.msg.RelevanceFrId = obj[0].ID