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

package/README.md

@@ -48,7 +48,7 @@ nrm use npm
 npm login
 填写信息
 Username: xizaozao
-Password: 158394933000abc
+Password: 15839493300abc
 Email: (this IS public) 3316756985@qq.com
 如果出现这个：联系我
 Enter one-time password:  

package/package.json

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

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

@@ -231,13 +231,16 @@
                         :rules="rules.packageTareWeight"
                         :prop="'containerList.' + index + '.containerDetailList.' + scope1.$index + '.packageList.' + scope2.$index + '.packageTareWeight'"
                       >
-                        <el-input
+                      <div>
+                        {{ scope2.row.packageTareWeight ? scope2.row.packageTareWeight : '自动计算' }}
+                      </div>
+                        <!-- <el-input
                           v-model="scope2.row.packageTareWeight"
                           placeholder="请输入皮重"
                           size="mini"
                           v-decimal="3"
                           @input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageTareWeight')"
-                        ></el-input>
+                        ></el-input> -->
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -707,8 +710,9 @@ export default {
       if (type == 'packageGrossWeight') {
         this.changePackageGrossWeight(index, scope1Index, scope2Index)
       } else if (type == 'packageTareWeight') {
-        this.changePackageTareWeight(index, scope1Index, scope2Index)
+        
       } else if (type == 'packageNetWeight') {
+        this.changePackageNetWeight(index, scope1Index, scope2Index)
       }
     },
 
@@ -723,53 +727,50 @@ export default {
           return total + Number(item.goodsGrossWeight)
         }, 0)
         .toFixed(3)
-      //计算净重
-      this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight = (
-        this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
-        this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight
-      ).toFixed(3)
-
-      this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList
-        .reduce((total, item) => {
-          return total + Number(item.packageNetWeight)
-        }, 0)
-        .toFixed(3)
-
-      this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
-        .reduce((total, item) => {
-          return total + Number(item.goodsNetWeight)
-        }, 0)
-        .toFixed(3)
+      //计算皮重
+      this.changePackageTareWeight(index, k, yindex)
     },
+    //计算皮重
     changePackageTareWeight(index, k, yindex) {
-      //计算皮重
+      if (this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight && this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight) {
+        this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight = (
+          this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
+        this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight
+        ).toFixed(3)
+        // 小于0，则为0
+        if (this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight < 0) {
+          this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight = '0'
+        }
+      } else {
+        this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight = ''
+      }
+
       this.form.containerList[index].containerDetailList[k].goodsTareWeight = this.form.containerList[index].containerDetailList[k].packageList
         .reduce((total, item) => {
           return total + Number(item.packageTareWeight)
         }, 0)
         .toFixed(3)
+
       this.form.containerList[index].totalGoodsTareWeight = this.form.containerList[index].containerDetailList
         .reduce((total, item) => {
           return total + Number(item.goodsTareWeight)
         }, 0)
         .toFixed(3)
+    },
+    changePackageNetWeight(index, k, yindex) {
       //计算净重
-      this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight = (
-        this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
-        this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight
-      ).toFixed(3)
-
       this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList
         .reduce((total, item) => {
           return total + Number(item.packageNetWeight)
         }, 0)
         .toFixed(3)
-
       this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
         .reduce((total, item) => {
           return total + Number(item.goodsNetWeight)
         }, 0)
         .toFixed(3)
+      //计算皮重
+      this.changePackageTareWeight(index, k, yindex)
     },
     changeItem(item, index, k) {
       this.form.containerList[index].containerDetailList[k].askName = item.askAliasName || item.askName