doctor-admin-components 1.0.13-beta.62 → 1.0.13-beta.63

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-admin-components",
   "version1": "1.0.11",
-  "version": "1.0.13-beta.62",
+  "version": "1.0.13-beta.63",
   "private": false,
   "main1": "lib/index.umd.min.js",
   "main": "packages/index.js",

package/packages/index.js

@@ -52,6 +52,7 @@ import {
   BizShipmentAdd,
   ContractChangeLog,
   EditBill,
+  CompanyBanks,
 } from "./src";
 // 组件列表
 const components = [
@@ -62,6 +63,7 @@ const components = [
   BizShipmentAdd,
   ContractChangeLog,
   EditBill,
+  CompanyBanks,
 ];
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，那么所有的组件都会被注册
@@ -130,5 +132,6 @@ export default {
   ContractChangeLog,
   EditBill,
   en_JSON,
-  zh_JSON
+  zh_JSON,
+  CompanyBanks,
 };

package/packages/src/api/biz/bizContract.js

@@ -1088,3 +1088,20 @@ export function shipmentConfirmDraftBl({shipmentId}) {
   });
 }
 
+// 根据合同号，添加收款账号
+export function insertCompanyBank(data) {
+  return request({
+    url: "biz/contract/company/savePaymentByContract",
+    method: "post",
+    data: data,
+  });
+}
+
+// 根据合同号，获取收款账号
+export function getCompanyBanks(contractId) {
+  return request({
+    url: `biz/contract/company/paymentAccount/${contractId}`,
+    method: "get",
+    params: {},
+  });
+}

package/packages/src/api/biz/bizInvoice.js

@@ -156,7 +156,7 @@ export function uploadByShipmentId(data) {
   });
 }
 
-// 上传发票
+// 上传尾款发票
 export function uploadFinallyInvoice(data) {
   return request({
     url: "/biz/invoice/uploadFinallyInvoice",

package/packages/src/index.js

@@ -19,6 +19,7 @@ import PurchaseInvoiceUpload from "./views/biz/contractTracing/purchaseInvoiceUp
 import BizShipmentAdd from "./views/biz/bizShipment/add.vue";
 import ContractChangeLog from "./views/biz/contractTracing/contractChangeLog.vue";
 import EditBill from "./views/biz/contractTracing/editBill.vue";
+import CompanyBanks from "./views/biz/contractTracing/companyBanks.vue";
 
 // 为组件提供 install 安装方法，供按需引入
 
@@ -46,6 +47,10 @@ EditBill.install = function (Vue) {
   Vue.component(EditBill.name, EditBill);
 };
 
+CompanyBanks.install = function (Vue) {
+  Vue.component(CompanyBanks.name, CompanyBanks);
+};
+
 // 导出组件
 export {
   EditBill,
@@ -54,4 +59,5 @@ export {
   PurchaseInvoiceUpload,
   BizShipmentAdd,
   ContractChangeLog,
+  CompanyBanks,
 };

package/packages/src/views/biz/bizFileInfo/contract.vue

@@ -1206,7 +1206,9 @@
 
     <gen-shipment ref="genShipment" @refresh="handleRefresh" />
 
-    <purchase-invoice-upload ref="purchaseInvoice" @refresh="handleRefresh"
+    <purchase-invoice-upload ref="purchaseInvoice"
+    :companyId="contract.contractId"
+    @refresh="handleRefresh"
     :purchaseBalanceMoneyProp="purchaseBalanceMoney"
     :getShipmentPurchaseFun="getShipmentPurchase"
     ></purchase-invoice-upload>
@@ -1764,17 +1766,23 @@ export default {
     },
     //定金发票
     getDepositInvoice() {
+      console.log('contract:', this.contract)
       if (this.contract.contractType == 'sale') {
+        // 生成定金发票（销售）
+        console.log('生成定金发票')
         getDepositInvoice(this.contract).then((response) => {
           const data = response.data;
           this.$refs.depositInvoice.handleShow(data);
         });
       } else {
+        // 上传定金发票（采购）
+        console.log('上传定金发票')
         this.$refs.purchaseInvoice.handleUpload(this.contract, 'deposit');
       }
     },
     //上传尾款发票
     uploadFinalInvoice(type, shipmentId) {
+      console.log('上传尾款发票')
       this.$refs.purchaseInvoice.handleUpload(this.contract, type, shipmentId);
     },
     //设置进度
@@ -2146,7 +2154,7 @@ export default {
       let shipmentFileInfo = this.shipmentItemData
       if(shipmentFileInfo?.shipmentId) {
         getPurchaseAmount(shipmentFileInfo.shipmentId).then((res) => {
-          this.purchaseBalanceMoney = (res.data.totalPurchaseAmount - res.data.purchaseDepositAmount).toFixed(2)
+          this.purchaseBalanceMoney = (res.data?.totalPurchaseAmount - res.data?.purchaseDepositAmount).toFixed(2)
           this.shipmentPurchaseAmountMessage =
             `${this.$t('contractDetail.reference_invince')}$` + this.purchaseBalanceMoney
             ;

package/packages/src/views/biz/contractTracing/companyBanks.vue

@@ -0,0 +1,228 @@
+<template>
+  <div class="bank-view-container">
+    <!-- 收款账户信息-展示（业务场景：生成收付款、收付款票据） -->
+    <el-row style="padding-top: 15px; padding-left: 10px">
+      <div style="font-size: 16px; color: #222222">收款账号信息</div>
+      <div style="padding-left: 30px; padding-top: 2px">
+        选择的收款账户信息会提供给财务进行打款/对账
+      </div>
+    </el-row>
+    <!-- 列表数据 -->
+    <div
+      v-for="(bankData, i) in bankList"
+      :key="i"
+      class="bank-container"
+      :class="{ 'bank-container-select': !disableSelect && sellectIndex == i, 'bank-container-unselect': disableSelect || sellectIndex != i }"
+      @click="clickSelct(i)"
+    >
+      <el-row style="padding-bottom: 20px">
+        <el-col :span="24">
+          <div class="bank-item" style="padding-top: 5px">Swift Code：{{ bankData.swiftCode }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item">Bank Name：{{ bankData.bankName }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item" style="padding-bottom: 20px">Bank Address：{{ bankData.bankAddress }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item">Beneficiary Account：{{ bankData.beneficiaryAccount }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item">Beneficiary：{{ bankData.beneficiary }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item">Beneficiary Address：{{ bankData.beneficiaryAddress }}</div>
+        </el-col>
+      </el-row>
+    </div>
+    <!-- 添加入口 -->
+    <div v-if="!bankList || bankList.length == 0" style="padding-left: 30px; padding-top: 10px">
+      <span>未添加收款账户信息，</span>
+      <el-button type="text" size="mini" @click="clickAdd">去添加</el-button>
+    </div>
+    <div v-else-if="bankList && bankList.length < 3" style="padding-left: 30px; padding-top: 10px">
+      <el-button type="text" size="mini" @click="clickAdd">去添加</el-button>
+      <span>收款账户信息</span>
+    </div>
+    <!-- 添加收款账户弹框 -->
+    <el-dialog title="添加收款账户" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="Swift Code" label-width="150px">
+              <el-input maxlength="500" v-model="form.swiftCode" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Bank Name" label-width="150px">
+              <el-input maxlength="500" v-model="form.bankName" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Bank Address" label-width="150px">
+              <el-input maxlength="500" v-model="form.bankAddress" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Beneficiary Account" label-width="150px">
+              <el-input maxlength="500" v-model="form.beneficiaryAccount" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Beneficiary" label-width="150px">
+              <el-input maxlength="500" v-model="form.beneficiary" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Beneficiary Address" label-width="150px">
+              <el-input maxlength="500" v-model="form.beneficiaryAddress" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="clickCancel">取 消</el-button>
+        <el-button type="primary" @click="clickConfirm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { insertCompanyBank, getCompanyBanks } from '../../../api/biz/bizContract'
+
+export default {
+  name: 'CompanyBanks',
+  props: {
+    // 收款账户的公司id（目前是合同contractId）
+    companyId: {
+      type: String | Number,
+      default: null
+    },
+    // 是否禁止选择功能
+    disableSelect: {
+      type: Boolean,
+      default: false
+    },
+    // 之前选择的id
+    accountId: {
+      type: String | Number,
+      default: null
+    }
+  },
+  watch: {
+    companyId: {
+      handler(newVal, oldVal) {
+        console.log('companyId changed:', newVal)
+        this.sellectIndex = -1
+        this.getBankList()
+      }
+    },
+    accountId: {
+      handler(newVal, oldVal) {
+        console.log('accountId changed:', newVal)
+        this.handleCaclSelectIndex()
+      }
+    }
+  },
+  data() {
+    return {
+      open: false,
+      sellectIndex: -1,
+      bankList: null,
+      form: {
+        swiftCode: null,
+        bankName: null,
+        bankAddress: null,
+        beneficiaryAccount: null,
+        beneficiary: null,
+        beneficiaryAddress: null
+      },
+      rules: {}
+    }
+  },
+  created() {
+    // 获取收款账户信息
+    this.getBankList()
+  },
+  methods: {
+    restForm() {
+      this.form = {
+        swiftCode: null,
+        bankName: null,
+        bankAddress: null,
+        beneficiaryAccount: null,
+        beneficiary: null,
+        beneficiaryAddress: null
+      }
+    },
+    handleCaclSelectIndex() {
+      if (!this.disableSelect && this.accountId) {
+        this.sellectIndex = this.bankList.findIndex((item) => item.accountId == this.accountId)
+        if (this.sellectIndex == -1) {
+          console.log('pre accountId invalide')
+          this.$emit('selectBank', null)
+        }
+      }
+    },
+    getBankList() {
+      if (!this.companyId) {
+        return
+      }
+      getCompanyBanks(this.companyId).then((res) => {
+        this.bankList = res.data?.paymentAccountList
+        this.handleCaclSelectIndex()
+      })
+    },
+    clickAdd() {
+      this.restForm()
+      this.open = true
+    },
+    clickSelct(index) {
+      if (this.disableSelect) {
+        console.log('disableSelect')
+        return
+      }
+      this.sellectIndex = index
+      let data = this.bankList[index]
+      console.log('select data', data)
+      this.$emit('selectBank', data)
+    },
+    clickCancel() {
+      this.open = false
+    },
+    clickConfirm() {
+      let e = this.form
+      if (!(e.swiftCode || e.bankName || e.bankAddress || e.beneficiaryAccount || e.beneficiary || e.beneficiaryAddress)) {
+        this.$modal.msgError('请输入内容')
+        return
+      }
+      insertCompanyBank({
+        contractId: this.companyId,
+        paymentAccountList: [e]
+      }).then((res) => {
+        this.getBankList()
+        this.open = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.bank-container {
+  background-color: rgb(240, 240, 240);
+  padding: 20px 10px 5px;
+  margin-top: 10px;
+}
+.bank-container-select {
+  border: 1px solid blue;
+}
+.bank-container-unselect {
+  border: 1px solid rgb(240, 240, 240);
+}
+.bank-item {
+  padding: 2px 40px 2px;
+}
+</style>

package/packages/src/views/biz/contractTracing/purchaseInvoiceUpload.vue

@@ -65,7 +65,23 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item
-              label="金额($)"
+              label="发票金额($)"
+              :prop="'proFormInvoiceList.' + index + '.invoiceAmount'"
+              :rules="[
+                { required: true, message: '不能为空' },
+                { type: 'number', message: '必须为数字值' },
+              ]"
+            >
+              <el-input
+                v-model.number="dt.invoiceAmount"
+                clearable
+                size="small"
+                placeholder="请输入票面金额"
+                type="number"
+              />
+            </el-form-item>
+            <el-form-item
+              label="应付金额($)"
               :prop="'proFormInvoiceList.' + index + '.amount'"
               :rules="[
                 { required: true, message: '不能为空' },
@@ -95,6 +111,7 @@
                 <upload-invoice v-model="dt.invoiceFileList" :limit="20" />
               </el-form-item>
             </el-row>
+            <company-banks ref="companyBanks" :companyId="companyId" @selectBank="(data) => selectBank(index, 'ProForma', data)"></company-banks>
           </el-row>
         </el-card>
         <el-row />
@@ -168,7 +185,23 @@
             </el-form-item>
             <el-row>
               <el-form-item
-                label="金额($)"
+                label="发票金额($)"
+                :prop="'fixedInvoiceList.' + index + '.invoiceAmount'"
+                :rules="[
+                  { required: true, message: '不能为空' },
+                  { type: 'number', message: '必须为数字值' },
+                ]"
+              >
+                <el-input
+                  v-model.number="item.invoiceAmount"
+                  clearable
+                  size="small"
+                  placeholder="请填写票面金额"
+                  type="number"
+                />
+              </el-form-item>
+              <el-form-item
+                label="应付金额($)"
                 :prop="'fixedInvoiceList.' + index + '.amount'"
                 :rules="[
                   { required: true, message: '不能为空' },
@@ -207,6 +240,7 @@
               </el-form-item>
             </el-row>
             <el-divider></el-divider>
+            <company-banks ref="companyBanks" :companyId="companyId" @selectBank="(data) => selectBank(index, 'Fixed', data)"></company-banks>
           </el-row>
         </el-card>
       </el-form>
@@ -252,13 +286,20 @@ import {
   getInvoiceListByShipmentId,
 } from "../../../api/biz/bizInvoice";
 import { getByContractId } from "../../../api/biz/bizShipment";
+import CompanyBanks from './companyBanks.vue';
 
 export default {
   name: "PurchaseInvoiceUpload",
   components: { 
-    UploadInvoice
+    UploadInvoice,
+    CompanyBanks
    },
   props: {
+    // 合同公司id（目前是合同id）
+    companyId: {
+      type: String | Number,
+      default: null,
+    },
     purchaseBalanceMoneyProp: {
       type: Number | String,
       default: '',
@@ -277,7 +318,10 @@ export default {
       // 是否显示弹出层
       open: false,
       // 表单参数
-      form: { proFormInvoiceList: [], fixedInvoiceList: [] },
+      form: { 
+        proFormInvoiceList: [], 
+        fixedInvoiceList: [],
+      },
       //销售合同选项表
       saleContractList: [],
       //采购合同选项表
@@ -288,7 +332,9 @@ export default {
       purchaseBalanceMoney: '',
     };
   },
-  created() {},
+  created() {
+    console.log('companyId:', this.companyId)
+  },
   methods: {
     dialogVisibleCancel() {
       this.submitForm(false);
@@ -306,6 +352,16 @@ export default {
     handleClose() {
       this.dialogVisible = false;
     },
+    // 选择收款账户
+    selectBank(index, fixed, data) {
+      console.log('proFormInvoiceList', this.form.proFormInvoiceList);
+      console.log('fixedInvoiceList', this.form.fixedInvoiceList);
+      if (fixed == 'ProForma') {
+        this.form.proFormInvoiceList[index].accountId = data?.accountId
+      } else {
+        this.form.fixedInvoiceList[index].accountId = data?.accountId
+      }
+    },
     //上传并生成
     uploadAndGenerate() {
       this.$refs["form"].validate((valid) => {
@@ -365,9 +421,13 @@ export default {
     },
     /** 展示按钮操作 */
     handleUpload(row, type, shipmentId) {
+      console.log('row:', row)
       this.reset();
       this.type = type;
       this.shipmentId = shipmentId;
+      if (!this.companyId) {
+        this.companyId = row.contractId
+      }
       if (type == "finally") {
         getInvoiceListByShipmentId(shipmentId)
           .then((response) => {