doctor-admin-components 1.0.13-beta.50 → 1.0.13-beta.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "doctor-admin-components",
3
3
  "version1": "1.0.11",
4
- "version": "1.0.13-beta.50",
4
+ "version": "1.0.13-beta.52",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
@@ -21,8 +21,8 @@
21
21
  bgButton: $t('contractDetail.blInfo'),
22
22
  bgTime:contractFileInfo.personalBillFileInfo && timeFormate(contractFileInfo.personalBillFileInfo),
23
23
  }"></ContentTitle>
24
- <el-col :span="12" v-if="getLastFileByList(contractFileInfo.latestBillFileInfo)">
25
- <div>
24
+ <el-col :span="12">
25
+ <div v-if="getLastFileByList(contractFileInfo.latestBillFileInfo)">
26
26
  <div class="sub-title">{{ $t("contractDetail.blInfo") }}</div>
27
27
  <div class="file-list">
28
28
  <file-show
@@ -37,8 +37,6 @@
37
37
  />
38
38
  </div>
39
39
  </div>
40
- </el-col>
41
- <el-col :span="12">
42
40
  <div class="file-list">
43
41
  <file-show
44
42
  :hiddenOperation="channel == 'official-website'"
@@ -56,6 +54,9 @@
56
54
  ":isShowTip="false"
57
55
  :uploadNameStr="$t('contractDetail.blInfo')" />
58
56
  </div>
57
+ </el-col>
58
+ <el-col :span="12">
59
+
59
60
  </el-col>
60
61
  <el-col :span="12" v-if="contractFileInfo.bliConfirmFlag" class="center-status">
61
62
  <i class="el-icon-success success"></i>
@@ -942,9 +943,13 @@
942
943
  bgcolor: getGoodsProgressInfo.bgcolor,
943
944
  successFlag: true
944
945
  }"></ContentTitle>
945
- <div v-if="!shipmentFileInfo.balanceInvoiceFullyPaidFlag">
946
- <i class="el-icon-time"></i>
947
- <span style="color:#f00">{{ $t('contractDetail.Final_payment_unpaid') }}</span>
946
+ <div v-if="shipmentFileInfo.balanceInvoiceFullyPaidFlag">
947
+ <i class="el-icon-success success"></i>
948
+ <span style="color:#67C23A">{{ $t('contractDetail.balancePaid_true') }}</span>
949
+ </div>
950
+ <div v-else>
951
+ <i class="el-icon-time"></i>
952
+ <span style="color:#f00">{{ $t('contractDetail.Final_payment_unpaid') }}</span>
948
953
  </div>
949
954
 
950
955
  <div class="file-list">
@@ -2154,19 +2159,19 @@ export default {
2154
2159
  let shipmentFileInfo = this.shipmentItemData && this.shipmentItemData
2155
2160
  if((shipmentFileInfo.saleFinallyInvoice && shipmentFileInfo.saleFinallyInvoice.length > 0) && (shipmentFileInfo.salePersonalFinallyInvoice && shipmentFileInfo.salePersonalFinallyInvoice.length > 0)) {
2156
2161
  if((shipmentFileInfo.saleFinallyInvoice && shipmentFileInfo.saleFinallyInvoice[0]?.createTime) > (shipmentFileInfo.salePersonalFinallyInvoice && shipmentFileInfo.salePersonalFinallyInvoice[0]?.createTime)) {
2157
- return shipmentFileInfo.saleFinallyInvoice
2162
+ return [shipmentFileInfo.saleFinallyInvoice[0]]
2158
2163
  } else {
2159
- return shipmentFileInfo.salePersonalFinallyInvoice
2164
+ return [shipmentFileInfo.salePersonalFinallyInvoice[0]]
2160
2165
  }
2161
2166
  } else {
2162
2167
  // 展示存在的其中一个 saleFinallyInvoice
2163
2168
  if(shipmentFileInfo.saleFinallyInvoice && shipmentFileInfo.saleFinallyInvoice.length && (!shipmentFileInfo.salePersonalFinallyInvoice || shipmentFileInfo.salePersonalFinallyInvoice.length == 0)) {
2164
- return shipmentFileInfo.saleFinallyInvoice
2169
+ return [shipmentFileInfo.saleFinallyInvoice[0]]
2165
2170
  }
2166
2171
 
2167
2172
  // 展示存在的其中一个 salePersonalFinallyInvoice
2168
2173
  if((!shipmentFileInfo.saleFinallyInvoice || shipmentFileInfo.saleFinallyInvoice.length == 0) && (shipmentFileInfo.salePersonalFinallyInvoice && shipmentFileInfo.salePersonalFinallyInvoice.length)) {
2169
- return shipmentFileInfo.salePersonalFinallyInvoice
2174
+ return [shipmentFileInfo.salePersonalFinallyInvoice[0]]
2170
2175
  }
2171
2176
 
2172
2177
  return ''