doctor-admin-components 1.0.14-beta.71 → 1.0.14-beta.73

package/README.md

@@ -15,36 +15,13 @@
 npm install
 ```
 
-### 运行项目可以开调试模块（example 文件）
-
-```
-npm run serve
-```
-
-### 打包（组件修改在 packages 文件中）
-
-```
-npm run lib
-```
-
-### 调试
-
-package.json 文件 入口改为："main": "packages/index.js"
-
-#### 把模块链接到全局
-
+#### 1 把公共模块链接到全局
 ```
 sudo npm link
 ```
 
-#### 模块取消软链接
-
-```
-sudo npm unlink doctor-admin-components
-```
-
-#### 把模块链接到项目
 
+#### 2 把公共模块链接到项目中 
 ```
 npm link doctor-admin-components --legacy-peer-deps
 ```
@@ -57,34 +34,31 @@ npm unlink doctor-admin-components --legacy-peer-deps
 
 ### 发布包
 
-```
-package.json文件  入口改为："main": "lib/index.umd.min.js"
-
-登录npm账号
+1登录npm账号 
+确保是npm镜像
+nrm ls 查看镜像列表 
+  npm ---------- https://registry.npmjs.org/
+  yarn --------- https://registry.yarnpkg.com/
+  tencent ------ https://mirrors.cloud.tencent.com/npm/
+  cnpm --------- https://r.cnpmjs.org/
+  taobao ------- https://registry.npmmirror.com/
+  npmMirror ---- https://skimdb.npmjs.com/registry/
+nrm use npm
 
 npm login
+填写信息
+Username: xizaozao
+Password: 158394933000abc
+Email: (this IS public) 3316756985@qq.com
+如果出现这个：联系我
+Enter one-time password:  
 
-1 npm run lib
-2 修改package.json里的 version
-  2.1 调试版本格式："1.0.0-beta.11"
-      npm publish --tag=beta
-  2.2 正式版本格式："1.0.0"
-      npm publish
-```
-
-### Customize configuration
-
-See [Configuration Reference](https://cli.vuejs.org/config/).
-
-VDistpicker
+2 发布
+修改package.json里的 version
+    调试版本格式："1.0.0-beta.11"
+    npm publish --tag=beta
 ```
- <VDistpicker :hideArea="true" @selected="onSelected"></VDistpicker>
-#### 重新编辑
-<VDistpicker :hideArea="true" @selected="onSelected" :province="placeholders.province" :city="placeholders.city"></VDistpicker>
-
-```
-
-https://npmmirror.com/package/doctor-admin-components/versions?
 
 
-npm config set proxy http://127.0.0.1:7890
+3 拉取最新版本镜像 点击同步 可能会有延迟
+https://npmmirror.com/package/doctor-admin-components/versions?version=1.0.14-beta.72

package/package.json

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

package/packages/src/views/biz/bizShipment/add.vue

@@ -2,11 +2,13 @@
   <div class="app-container">
     <!-- 添加或修改装运对话框 -->
     <el-dialog :visible.sync="open" z-index="1000" width="80%" :before-close="handleClose" :title="title">
+      <slot name="billOfLadingUpload"></slot>
       <slot name="">
         <span v-if="isDraft" style="color: red">提示: 当前打开了【{{ form.lastUpdateUserName }}】在【{{ form.updateTime }}】保存的装运草稿</span>
         <span v-if="voidInvoiceList" style="color: red">【快捷转卖】：系统检测到此销售合同关联的采购合同存在【已作废】的装运，</span>
         <el-button v-if="voidInvoiceList" @click="handleReference" size="mini" type="text">点击这里直接复制并引用</el-button>
       </slot>
+      
       <div v-if="reason" style="color: #f00; padding-left: 60px; margin-bottom: 10px">{{ reason }}</div>
       <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
         <el-row>
@@ -581,6 +583,15 @@ export default {
       this.destinationPortList = res.rows
     })
   },
+  mounted() {
+    const channel = new BroadcastChannel('ocrInfo-channnel');
+    channel.addEventListener('message', event => {
+      console.log('event:', event.data)
+      this.OCRDataFilling(event.data)
+      // channel.close();
+    });
+
+  },
   computed: {
     containerList() {
       return this.form.containerList
@@ -1016,85 +1027,7 @@ export default {
 
         // OCR识别数据汇总
         if (this.billInfoSummary?.shipmentOcrType) {
-          if (this.billInfoSummary.shippingCompany) {
-            this.form.shippingCompany = this.billInfoSummary.shippingCompany
-          }
-
-          if (this.billInfoSummary.bookingNo) {
-            this.form.bookingNo = this.billInfoSummary.bookingNo
-          }
-
-          if (this.billInfoSummary.billOfLadingNo) {
-            this.form.billOfLadingNo = this.billInfoSummary.billOfLadingNo
-          }
-
-          if (this.billInfoSummary.destinationPort) {
-            this.form.destinationPort = this.billInfoSummary.destinationPort
-          }
-
-          // if (this.billInfoSummary.actualArrivalDate) {
-          //   this.form.actualArrivalDate = this.billInfoSummary.actualArrivalDate;
-          // }
-
-          // if (this.billInfoSummary.loadingTime) {
-          //   this.form.loadingTime = this.billInfoSummary.loadingTime;
-          // }
-
-          // if (this.billInfoSummary.etd) {
-          //   this.form.etd = this.billInfoSummary.etd;
-          // }
-
-          // if (this.billInfoSummary.eta) {
-          //   this.form.eta = this.billInfoSummary.eta;
-          // }
-
-          if (this.billInfoSummary?.containerOcrList?.length) {
-            this.form.containerList = []
-            this.billInfoSummary?.containerOcrList.forEach((containerItem, index) => {
-              this.form.containerList.push({
-                containerId: null,
-                shipmentId: shipmentId,
-                contractNo: containerItem.containerNo,
-                invoiceNo: containerItem.invoiceNo,
-                totalGoodsGrossWeight: containerItem.totalGoodsGrossWeight,
-                totalGoodsNetWeight: containerItem.totalGoodsNetWeight,
-                totalGoodsTareWeight: containerItem.totalGoodsTareWeight,
-                totalGoodsNumber: containerItem.totalGoodsNumber,
-                containerNo: containerItem.containerNo,
-                containerTareWeight: containerItem.totalGoodsTareWeight ? containerItem.totalGoodsTareWeight * 1000 : null,
-                sealNo: containerItem.sealNo,
-                isGenerateInvoice: null,
-                remark: containerItem.remark,
-                createTime: null,
-                updateTime: null,
-                containerDetailList: []
-              })
-              if (containerItem?.containerDetailOcrList?.length) {
-                containerItem?.containerDetailOcrList.forEach((containerDetailItem, index2) => {
-                  this.form.containerList[index].containerDetailList.push({
-                    contractDetailId: null,
-                    askDetailId: null,
-                    askName: containerDetailItem.askName,
-                    goodsNetWeight: containerDetailItem.goodsNetWeight,
-                    goodsTareWeight: containerDetailItem.goodsTareWeight,
-                    goodsGrossWeight: containerDetailItem.goodsGrossWeight,
-                    goodsNumber: containerDetailItem.goodsNumber,
-                    packageList: [
-                      {
-                        packageNetWeight: containerDetailItem.goodsNetWeight,
-                        packageTareWeight: containerDetailItem.goodsTareWeight,
-                        packageGrossWeight: containerDetailItem.goodsGrossWeight,
-                        remark: containerDetailItem.remark
-                      }
-                    ]
-                  })
-                })
-              }
-            })
-          }
-        }
-        if (this.billInfoSummary) {
-          this.addContainerRow()
+          this.OCRDataFilling(this.billInfoSummary, shipmentId)
         }
 
         this.$emit('closeFullscreenLoading')
@@ -1346,6 +1279,86 @@ export default {
             loading.close()
           })
       }
+    },
+    OCRDataFilling(billInfoSummary, shipmentId = null) {
+      if (billInfoSummary?.shipmentOcrType) {
+          if (billInfoSummary.shippingCompany) {
+            this.form.shippingCompany = billInfoSummary.shippingCompany
+          }
+
+          if (billInfoSummary.bookingNo) {
+            this.form.bookingNo = billInfoSummary.bookingNo
+          }
+
+          if (billInfoSummary.billOfLadingNo) {
+            this.form.billOfLadingNo = billInfoSummary.billOfLadingNo
+          }
+
+          if (billInfoSummary.destinationPort) {
+            this.form.destinationPort = billInfoSummary.destinationPort
+          }
+
+          // if (billInfoSummary.actualArrivalDate) {
+          //   this.form.actualArrivalDate = billInfoSummary.actualArrivalDate;
+          // }
+
+          // if (billInfoSummary.loadingTime) {
+          //   this.form.loadingTime = billInfoSummary.loadingTime;
+          // }
+
+          // if (billInfoSummary.etd) {
+          //   this.form.etd = billInfoSummary.etd;
+          // }
+
+          // if (billInfoSummary.eta) {
+          //   this.form.eta = billInfoSummary.eta;
+          // }
+
+            if (billInfoSummary?.containerOcrList?.length) {
+            this.form.containerList = []
+            billInfoSummary?.containerOcrList.forEach((containerItem, index) => {
+              this.form.containerList.push({
+                containerId: null,
+                shipmentId: shipmentId,
+                contractNo: containerItem.containerNo,
+                invoiceNo: containerItem.invoiceNo,
+                totalGoodsGrossWeight: containerItem.totalGoodsGrossWeight,
+                totalGoodsNetWeight: containerItem.totalGoodsNetWeight,
+                totalGoodsTareWeight: containerItem.totalGoodsTareWeight,
+                totalGoodsNumber: containerItem.totalGoodsNumber,
+                containerNo: containerItem.containerNo,
+                containerTareWeight: containerItem.totalGoodsTareWeight ? containerItem.totalGoodsTareWeight * 1000 : null,
+                sealNo: containerItem.sealNo,
+                isGenerateInvoice: null,
+                remark: containerItem.remark,
+                createTime: null,
+                updateTime: null,
+                containerDetailList: []
+              })
+              if (containerItem?.containerDetailOcrList?.length) {
+                containerItem?.containerDetailOcrList.forEach((containerDetailItem, index2) => {
+                  this.form.containerList[index].containerDetailList.push({
+                    contractDetailId: null,
+                    askDetailId: null,
+                    askName: containerDetailItem.askName,
+                    goodsNetWeight: containerDetailItem.goodsNetWeight,
+                    goodsTareWeight: containerDetailItem.goodsTareWeight,
+                    goodsGrossWeight: containerDetailItem.goodsGrossWeight,
+                    goodsNumber: containerDetailItem.goodsNumber,
+                    packageList: [
+                      {
+                        packageNetWeight: containerDetailItem.goodsNetWeight,
+                        packageTareWeight: containerDetailItem.goodsTareWeight,
+                        packageGrossWeight: containerDetailItem.goodsGrossWeight,
+                        remark: containerDetailItem.remark
+                      }
+                    ]
+                  })
+                })
+              }
+            })
+          }
+        }
     }
   }
 }

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

@@ -131,6 +131,7 @@
       <el-descriptions-item label="Partial Shipment"> {{ form.partialShipment }}</el-descriptions-item>
       <el-descriptions-item label="Transshipment"> {{ form.transshipment }}</el-descriptions-item>
       <el-descriptions-item label="Quality" v-if="form.qualityCertificateSwitch">{{ form.qualityCertificate }}</el-descriptions-item>
+      <el-descriptions-item label="Customs Rejection" v-if="form.returnedBearer">{{ form.returnedBearer && form.returnedBearer.toUpperCase() }} shall bear the return costs if goods are not in compliance with the required standards of the import country and are rejected by customs authoritie</el-descriptions-item>
       <el-descriptions-item label="Claim" v-if="form.claimSwitch">
         <div v-html="form.claim" style="white-space: pre-wrap; word-break: break-word;"></div>
       </el-descriptions-item>