doctor-admin-components 1.0.13-beta.57 → 1.0.13-beta.59

package/package.json

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

package/packages/index.js

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

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

@@ -1088,20 +1088,3 @@ 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,7 +19,6 @@ 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 安装方法，供按需引入
 
@@ -47,10 +46,6 @@ EditBill.install = function (Vue) {
   Vue.component(EditBill.name, EditBill);
 };
 
-CompanyBanks.install = function (Vue) {
-  Vue.component(CompanyBanks.name, CompanyBanks);
-};
-
 // 导出组件
 export {
   EditBill,
@@ -59,5 +54,4 @@ export {
   PurchaseInvoiceUpload,
   BizShipmentAdd,
   ContractChangeLog,
-  CompanyBanks,
 };

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

@@ -173,9 +173,11 @@
                     @checked="handleChecked"
                     @uncheck="handleUncheck"
                     :selectFileListProp="selectFileList"
-                    :fileInfo="
-                      getLastFileByList(contractFileInfo.proformaInvoiceFileInfo)
-                    "
+                    v-for="(
+                      item, i
+                    ) in contractFileInfo.proformaInvoiceFileInfo" 
+                    :key="i" 
+                    :fileInfo="item"
                   />
                 </div>
                 <!-- 手动上传定金发票 -->
@@ -762,7 +764,6 @@
               <el-col :span="24">
                 <el-col :span="24">
                   <div style="margin-bottom:-20px">
-                    {{ getShipmentPurchaseAmount(shipmentFileInfo,shipmentIndex) }}
                     <span
                       v-if="channel !== 'official-website' &&
                         contract.contractType == 'purchase' "
@@ -1205,9 +1206,7 @@
 
     <gen-shipment ref="genShipment" @refresh="handleRefresh" />
 
-    <purchase-invoice-upload ref="purchaseInvoice"
-    :companyId="contract.contractId"
-    @refresh="handleRefresh"
+    <purchase-invoice-upload ref="purchaseInvoice" @refresh="handleRefresh"
     :purchaseBalanceMoneyProp="purchaseBalanceMoney"
     :getShipmentPurchaseFun="getShipmentPurchase"
     ></purchase-invoice-upload>
@@ -1479,6 +1478,7 @@ export default {
 
     changeShipBillNo(index) {
       this.shipBillNo = index
+      this.activeName = index
       this.setRate(index)
     },
     changeGoodsBillNo(index) {
@@ -1487,17 +1487,6 @@ export default {
     changeClaimBillNo(index) {
       this.claimBillNo = index
     },
-    getShipmentPurchaseAmount(shipmentFileInfo, shipmentIndex) {
-      if (shipmentIndex == this.activeName) {
-        getPurchaseAmount(shipmentFileInfo.shipmentId).then((res) => {
-          this.purchaseBalanceMoney = (res.data.totalPurchaseAmount - res.data.purchaseDepositAmount).toFixed(2)
-          this.shipmentPurchaseAmountMessage =
-            `${this.$t('contractDetail.reference_invince')}$` + this.purchaseBalanceMoney
-            ;
-          return this.shipmentPurchaseAmountMessage;
-        });
-      }
-    },
     getShipmentPurchase(shipmentFileInfo) {
       this.$refs.shipmentPurchaseAmount.handleShow(shipmentFileInfo.shipmentId);
     },
@@ -1775,23 +1764,17 @@ 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);
     },
     //设置进度
@@ -2008,7 +1991,7 @@ export default {
           shipTextArr.push(this.$t('contractDetail.Waiting_for_the_seller_to_ship'))
           this.claimProgressInfo.textArr = shipTextArr
        }
-
+       this.getShipmentPurchaseAmount()
        this.loadingInstance.close();
     },
     //获取合同文件信息
@@ -2159,6 +2142,16 @@ export default {
         this.loading = false;
       });
     },
+    getShipmentPurchaseAmount() {
+      let shipmentFileInfo = this.shipmentItemData
+      getPurchaseAmount(shipmentFileInfo.shipmentId).then((res) => {
+        this.purchaseBalanceMoney = (res.data.totalPurchaseAmount - res.data.purchaseDepositAmount).toFixed(2)
+        this.shipmentPurchaseAmountMessage =
+          `${this.$t('contractDetail.reference_invince')}$` + this.purchaseBalanceMoney
+          ;
+        return this.shipmentPurchaseAmountMessage;
+      });
+    },
   },
   computed: {
     // 销售获取最新的尾款发票

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

@@ -65,24 +65,7 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item
-              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="应付金额($)"
-              label-width="140px"
+              label="金额($)"
               :prop="'proFormInvoiceList.' + index + '.amount'"
               :rules="[
                 { required: true, message: '不能为空' },
@@ -112,7 +95,6 @@
                 <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 />
@@ -186,24 +168,7 @@
             </el-form-item>
             <el-row>
               <el-form-item
-                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="应付金额($)"
-                label-width="140px"
+                label="金额($)"
                 :prop="'fixedInvoiceList.' + index + '.amount'"
                 :rules="[
                   { required: true, message: '不能为空' },
@@ -242,7 +207,6 @@
               </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>
@@ -288,20 +252,13 @@ import {
   getInvoiceListByShipmentId,
 } from "../../../api/biz/bizInvoice";
 import { getByContractId } from "../../../api/biz/bizShipment";
-import CompanyBanks from './companyBanks.vue';
 
 export default {
   name: "PurchaseInvoiceUpload",
   components: { 
-    UploadInvoice,
-    CompanyBanks
+    UploadInvoice
    },
   props: {
-    // 合同公司id
-    companyId: {
-      type: String | Number,
-      default: null,
-    },
     purchaseBalanceMoneyProp: {
       type: Number | String,
       default: '',
@@ -320,10 +277,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 表单参数
-      form: { 
-        proFormInvoiceList: [], 
-        fixedInvoiceList: [],
-      },
+      form: { proFormInvoiceList: [], fixedInvoiceList: [] },
       //销售合同选项表
       saleContractList: [],
       //采购合同选项表
@@ -334,9 +288,7 @@ export default {
       purchaseBalanceMoney: '',
     };
   },
-  created() {
-    console.log('companyId:', this.companyId)
-  },
+  created() {},
   methods: {
     dialogVisibleCancel() {
       this.submitForm(false);
@@ -354,16 +306,6 @@ 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) => {

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

@@ -1,224 +0,0 @@
-<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">
-        <slot></slot>
-      </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 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 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 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 v-model="form.beneficiaryAccount" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="18">
-            <el-form-item label="Beneficiary" label-width="150px">
-              <el-input 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 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)
-      }
-    },
-    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>