doctor-admin-components 1.0.13-beta.39 → 1.0.13-beta.40

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/packages/src/views/biz/bizFileInfo/contract.vue +63 -66
  3. package/packages/src/views/biz/bizFileInfo/contractFile/BillOfLadingNoTab.vue +3 -3
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.39",
4
+ "version": "1.0.13-beta.40",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
package/packages/src/views/biz/bizFileInfo/contract.vue CHANGED
@@ -784,7 +784,7 @@
784
784
  }"></ContentTitle>
785
785
  <span
786
786
  v-if="
787
- channel !== 'official-website'"
787
+ channel !== 'official-website' && contract.contractType == 'purchase' && shipmentFileInfo.purchaseFinallyInvoice && shipmentFileInfo.purchaseFinallyInvoice.length > 0"
788
788
  style="color: #1890ff; cursor: pointer; margin-left: 10px;font-size:14px;"
789
789
  @click.stop="identifyPageBoth(shipmentFileInfo, 2)"
790
790
  >{{ identify }}
@@ -1878,7 +1878,8 @@ export default {
1878
1878
 
1879
1879
  let shipmentFileInfoList = this.contractFileInfo.shipmentFileInfoList;
1880
1880
 
1881
-
1881
+ let shipTextArr = []
1882
+
1882
1883
  if(shipmentFileInfoList && shipmentFileInfoList.length > 0) {
1883
1884
  let shipmentItem = shipmentFileInfoList[index]
1884
1885
  this.shipmentItemData = shipmentItem
@@ -1887,71 +1888,64 @@ export default {
1887
1888
  this.claimProgressInfo.rate = this.contractFileInfo?.claimPercentage || 0
1888
1889
 
1889
1890
  // 装运进度
1890
- let shipTextArr = []
1891
- if(!shipmentItem.shipmentPercentage || shipmentItem.shipmentPercentage == 0) {
1892
- // 等待卖家装运（英文：X MT/ x containers to be shipped）
1893
- shipTextArr.push('等待卖家装运')
1894
- } else {
1895
- // 装运已完成
1896
- // 装箱单
1897
- if(shipmentItem.generatePackingFlag) {
1898
- // 装箱单已上传（英文：Packing List updated）
1899
- // shipTextArr.push('装箱单已上传')
1900
- } else {
1901
- // 装箱单待上传（英文：Shipping docs-Packing list to be updated）
1902
- shipTextArr.push('装箱单待上传')
1903
- }
1904
-
1905
- // 是否已支付尾款
1906
- if(!shipmentItem.balanceInvoiceFullyPaidFlag && this.contract.contractType == 'sale') {
1907
- // 尾款发票待上传（英文：Balance Invoice to be updated）
1908
- shipTextArr.push('尾款发票待上传')
1909
- }
1910
-
1911
- // 上传装箱照片
1912
- if(shipmentItem.uploadContainerPhotoFlag) {
1913
- // 装箱照片已上传（Packing photos updated）
1914
- // shipTextArr.push('装箱照片已上传')
1915
- } else {
1916
- // 装箱照片待上传（英文：Shipping docs-Shipping photos to be updated）
1917
- shipTextArr.push('装箱照片待上传')
1918
- }
1919
-
1920
-
1921
- // 是否上传草稿提单
1922
- if(shipmentItem.uploadDraftBlFlag) {
1923
- // 草稿提单已上传（Draft BL updated）
1924
- // shipTextArr.push('草稿提单已上传')
1925
- } else {
1926
- // 草稿提单待上传（英文：Shipping docs-Draft BL to be updated）
1927
- shipTextArr.push('草稿提单待上传')
1928
- }
1929
-
1930
- // 是否确认草稿提单
1931
- if(!shipmentItem.confirmDraftBlFlag) {
1932
- // 草稿提单待买家确认（英文：Draft BL to be confirmed ）
1933
- shipTextArr.push('草稿提单待买家确认')
1934
- } else {
1935
- // 草稿提单已确认（英文：Draft BL confirmed）
1936
- // shipTextArr.push('草稿提单已确认')
1937
- }
1938
-
1939
- // 尾款部分支付标记
1940
-
1941
- // 尾款部分支付标记
1942
- if(shipmentItem.balanceInvoiceFullyPaidFlag) {
1943
- // 尾款已支付（英文：Final Payment paid）
1944
- // shipTextArr.push('尾款已支付')
1891
+ // 装箱单
1892
+ if(shipmentItem.generatePackingFlag) {
1893
+ // 装箱单已上传（英文：Packing List updated）
1894
+ // shipTextArr.push('装箱单已上传')
1895
+ } else {
1896
+ // 装箱单待上传（英文：Shipping docs-Packing list to be updated）
1897
+ shipTextArr.push('装箱单待上传')
1898
+ }
1899
+
1900
+ // 是否已支付尾款
1901
+ if(!shipmentItem.balanceInvoiceFullyPaidFlag && this.contract.contractType == 'sale') {
1902
+ // 尾款发票待上传（英文：Balance Invoice to be updated）
1903
+ shipTextArr.push('尾款发票待上传')
1904
+ }
1905
+
1906
+ // 上传装箱照片
1907
+ if(shipmentItem.uploadContainerPhotoFlag) {
1908
+ // 装箱照片已上传（Packing photos updated）
1909
+ // shipTextArr.push('装箱照片已上传')
1910
+ } else {
1911
+ // 装箱照片待上传（英文：Shipping docs-Shipping photos to be updated）
1912
+ shipTextArr.push('装箱照片待上传')
1913
+ }
1914
+
1915
+
1916
+ // 是否上传草稿提单
1917
+ if(shipmentItem.uploadDraftBlFlag) {
1918
+ // 草稿提单已上传（Draft BL updated）
1919
+ // shipTextArr.push('草稿提单已上传')
1945
1920
  } else {
1946
- if(shipmentItem.balanceInvoicePartiallyPaidFlag) {
1947
- // 尾款已部分支付（英文：Final Payment partially paid）
1948
- shipTextArr.push('尾款已部分支付')
1949
- } else {
1950
- // 尾款待买家支付（英文：Balance Invoice to be paid）
1951
- shipTextArr.push('尾款待买家支付')
1952
- }
1953
- }
1954
- }
1921
+ // 草稿提单待上传（英文：Shipping docs-Draft BL to be updated）
1922
+ shipTextArr.push('草稿提单待上传')
1923
+ }
1924
+
1925
+ // 是否确认草稿提单
1926
+ if(!shipmentItem.confirmDraftBlFlag) {
1927
+ // 草稿提单待买家确认（英文：Draft BL to be confirmed ）
1928
+ shipTextArr.push('草稿提单待买家确认')
1929
+ } else {
1930
+ // 草稿提单已确认（英文：Draft BL confirmed）
1931
+ // shipTextArr.push('草稿提单已确认')
1932
+ }
1933
+
1934
+ // 尾款部分支付标记
1935
+
1936
+ // 尾款部分支付标记
1937
+ if(shipmentItem.balanceInvoiceFullyPaidFlag) {
1938
+ // 尾款已支付（英文：Final Payment paid）
1939
+ // shipTextArr.push('尾款已支付')
1940
+ } else {
1941
+ if(shipmentItem.balanceInvoicePartiallyPaidFlag) {
1942
+ // 尾款已部分支付（英文：Final Payment partially paid）
1943
+ shipTextArr.push('尾款已部分支付')
1944
+ } else {
1945
+ // 尾款待买家支付（英文：Balance Invoice to be paid）
1946
+ shipTextArr.push('尾款待买家支付')
1947
+ }
1948
+ }
1955
1949
 
1956
1950
  this.shipProgressInfo.textArr = shipTextArr
1957
1951
 
@@ -1987,6 +1981,9 @@ export default {
1987
1981
  }
1988
1982
 
1989
1983
  this.claimProgressInfo.textArr = claimTextArr
1984
+ } else {
1985
+ shipTextArr.push('等待卖家装运')
1986
+ this.claimProgressInfo.textArr = shipTextArr
1990
1987
  }
1991
1988
 
1992
1989
  this.loadingInstance.close();
package/packages/src/views/biz/bizFileInfo/contractFile/BillOfLadingNoTab.vue CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
3
3
  * @Date: 2024-03-13 14:28:59
4
4
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
5
- * @LastEditTime: 2024-04-07 13:48:28
5
+ * @LastEditTime: 2024-04-09 17:36:44
6
6
  * @FilePath: /doctor-admin-components 公共组件/packages/src/views/biz/bizFileInfo/contractFile/BillOfLadingNoTab.vue
7
7
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8
8
  -->
@@ -16,7 +16,7 @@
16
16
  ? shipmentFileInfo.billOfLadingNo
17
17
  : '' }}
18
18
  </div>
19
- <div class="billOfLadingNo-more" v-if="contractFileInfoData.shipmentFileInfoList && contractFileInfoData.shipmentFileInfoList.length > 3" @click.stop="openFun">
19
+ <div class="billOfLadingNo-more" v-if="contractFileInfoData.shipmentFileInfoList && contractFileInfoData.shipmentFileInfoList.length > 4" @click.stop="openFun">
20
20
  <!-- <div class="billOfLadingNo-more" @click.stop="openFun"> -->
21
21
  <i v-if="open" class="el-icon-caret-top"></i>
22
22
  <i v-else class="el-icon-caret-bottom"></i>
@@ -99,7 +99,7 @@ export default {
99
99
  }
100
100
 
101
101
  .bill-no {
102
- width:33%;
102
+ width:23%;
103
103
  font-size: 14px;
104
104
  color: #A7A9AC;
105
105
  padding:20px 20px 20px 0;