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

package/package.json

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

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

@@ -12,7 +12,7 @@
       v-for="(bankData, i) in bankList"
       :key="i"
       class="bank-container"
-      :class="{ 'bank-container-select': sellectIndex == i, 'bank-container-unselect': sellectIndex != i }"
+      :class="{ 'bank-container-select': !disableSelect && sellectIndex == i, 'bank-container-unselect': disableSelect || sellectIndex != i }"
       @click="clickSelct(i)"
     >
       <el-row style="padding-bottom: 20px">
@@ -37,10 +37,14 @@
       </el-row>
     </div>
     <!-- 添加入口 -->
-    <div v-if="!bankList || bankList.length < 3" style="padding-left: 30px; padding-top: 10px">
+    <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">
@@ -95,14 +99,31 @@ export default {
     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() {
@@ -136,9 +157,18 @@ export default {
         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() {
@@ -146,6 +176,10 @@ export default {
       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)
@@ -157,7 +191,7 @@ export default {
     clickConfirm() {
       let e = this.form
       if (!(e.swiftCode || e.bankName || e.bankAddress || e.beneficiaryAccount || e.beneficiary || e.beneficiaryAddress)) {
-        this.$modal.msgError('请输入内容');
+        this.$modal.msgError('请输入内容')
         return
       }
       insertCompanyBank({

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

@@ -81,7 +81,7 @@
               />
             </el-form-item>
             <el-form-item
-              label="实际应收付金额($)"
+              label="应付金额($)"
               label-width="140px"
               :prop="'proFormInvoiceList.' + index + '.amount'"
               :rules="[
@@ -186,7 +186,24 @@
             </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="应付金额($)"
+                label-width="140px"
                 :prop="'fixedInvoiceList.' + index + '.amount'"
                 :rules="[
                   { required: true, message: '不能为空' },