doctor-admin-components 1.0.14-beta.74 → 1.0.14-beta.76

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 (4) hide show
  1. package/README.md +1 -1
  2. package/package.json +1 -1
  3. package/packages/src/views/biz/bizShipment/add.vue +28 -27
  4. package/packages/src/views/biz/contractTracing/info.vue +1 -0
package/README.md CHANGED
@@ -48,7 +48,7 @@ nrm use npm
48
48
  npm login
49
49
  填写信息
50
50
  Username: xizaozao
51
- Password: 158394933000abc
51
+ Password: 15839493300abc
52
52
  Email: (this IS public) 3316756985@qq.com
53
53
  如果出现这个：联系我
54
54
  Enter one-time password:
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.14-beta.74",
4
+ "version": "1.0.14-beta.76",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
package/packages/src/views/biz/bizShipment/add.vue CHANGED
@@ -231,13 +231,16 @@
231
231
  :rules="rules.packageTareWeight"
232
232
  :prop="'containerList.' + index + '.containerDetailList.' + scope1.$index + '.packageList.' + scope2.$index + '.packageTareWeight'"
233
233
  >
234
- <el-input
234
+ <div>
235
+ {{ scope2.row.packageTareWeight ? scope2.row.packageTareWeight : '自动计算' }}
236
+ </div>
237
+ <!-- <el-input
235
238
  v-model="scope2.row.packageTareWeight"
236
239
  placeholder="请输入皮重"
237
240
  size="mini"
238
241
  v-decimal="3"
239
242
  @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageTareWeight')"
240
- ></el-input>
243
+ ></el-input> -->
241
244
  </el-form-item>
242
245
  </template>
243
246
  </el-table-column>
@@ -707,8 +710,9 @@ export default {
707
710
  if (type == 'packageGrossWeight') {
708
711
  this.changePackageGrossWeight(index, scope1Index, scope2Index)
709
712
  } else if (type == 'packageTareWeight') {
710
- this.changePackageTareWeight(index, scope1Index, scope2Index)
713
+
711
714
  } else if (type == 'packageNetWeight') {
715
+ this.changePackageNetWeight(index, scope1Index, scope2Index)
712
716
  }
713
717
  },
714
718
 
@@ -723,53 +727,50 @@ export default {
723
727
  return total + Number(item.goodsGrossWeight)
724
728
  }, 0)
725
729
  .toFixed(3)
726
- //计算净重
727
- this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight = (
728
- this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
729
- this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight
730
- ).toFixed(3)
731
-
732
- this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList
733
- .reduce((total, item) => {
734
- return total + Number(item.packageNetWeight)
735
- }, 0)
736
- .toFixed(3)
737
-
738
- this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
739
- .reduce((total, item) => {
740
- return total + Number(item.goodsNetWeight)
741
- }, 0)
742
- .toFixed(3)
730
+ //计算皮重
731
+ this.changePackageTareWeight(index, k, yindex)
743
732
  },
733
+ //计算皮重
744
734
  changePackageTareWeight(index, k, yindex) {
745
- //计算皮重
735
+ if (this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight && this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight) {
736
+ this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight = (
737
+ this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
738
+ this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight
739
+ ).toFixed(3)
740
+ // 小于0，则为0
741
+ if (this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight < 0) {
742
+ this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight = '0'
743
+ }
744
+ } else {
745
+ this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight = ''
746
+ }
747
+
746
748
  this.form.containerList[index].containerDetailList[k].goodsTareWeight = this.form.containerList[index].containerDetailList[k].packageList
747
749
  .reduce((total, item) => {
748
750
  return total + Number(item.packageTareWeight)
749
751
  }, 0)
750
752
  .toFixed(3)
753
+
751
754
  this.form.containerList[index].totalGoodsTareWeight = this.form.containerList[index].containerDetailList
752
755
  .reduce((total, item) => {
753
756
  return total + Number(item.goodsTareWeight)
754
757
  }, 0)
755
758
  .toFixed(3)
759
+ },
760
+ changePackageNetWeight(index, k, yindex) {
756
761
  //计算净重
757
- this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight = (
758
- this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
759
- this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight
760
- ).toFixed(3)
761
-
762
762
  this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList
763
763
  .reduce((total, item) => {
764
764
  return total + Number(item.packageNetWeight)
765
765
  }, 0)
766
766
  .toFixed(3)
767
-
768
767
  this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
769
768
  .reduce((total, item) => {
770
769
  return total + Number(item.goodsNetWeight)
771
770
  }, 0)
772
771
  .toFixed(3)
772
+ //计算皮重
773
+ this.changePackageTareWeight(index, k, yindex)
773
774
  },
774
775
  changeItem(item, index, k) {
775
776
  this.form.containerList[index].containerDetailList[k].askName = item.askAliasName || item.askName
package/packages/src/views/biz/contractTracing/info.vue CHANGED
@@ -102,6 +102,7 @@
102
102
 
103
103
  <el-descriptions-item label="Origin Country/Region">{{ form.originCountry }}</el-descriptions-item>
104
104
  <el-descriptions-item label="Loading Country/Region">{{ form.loadingCountry }}</el-descriptions-item>
105
+ <el-descriptions-item label="Loading Port">{{ form.originPort }}</el-descriptions-item>
105
106
  <el-descriptions-item v-if="form.freightTerms != 'EXW'" label="Destination">{{ form.destination }}</el-descriptions-item>
106
107
  <el-descriptions-item v-else label="EXW Address">{{ form.exw }}</el-descriptions-item>
107
108
  <el-descriptions-item label="Containers">