doctor-admin-components 1.0.13-beta.9 → 1.0.13-pro.1

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 添加或修改装运对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body :before-close="handleClose">
+    <el-dialog :title="title" :visible.sync="open" width="80%" :before-close="handleClose">
       <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
         <el-row>
           <el-col :span="6">
@@ -202,7 +202,7 @@
                           v-model="scope2.row.packageGrossWeight"
                           placeholder="请输入毛重"
                           size="mini"
-                          @change="changePackageGrossWeight(index, scope1.$index, scope2.$index)"
+                          @input="changePackageGrossWeight(index, scope1.$index, scope2.$index)"
                         ></el-input>
                       </el-form-item>
                     </template>
@@ -220,7 +220,7 @@
                           v-model="scope2.row.packageTareWeight"
                           placeholder="请输入皮重"
                           size="mini"
-                          @change="changePackageTareWeight(index, scope1.$index, scope2.$index)"
+                          @input="changePackageTareWeight(index, scope1.$index, scope2.$index)"
                         ></el-input>
                       </el-form-item>
                     </template>
@@ -388,7 +388,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
 
-      <div style="display: flex; justify-content: center; align-items: center">
+      <div style="display: flex; justify-content: center; align-items: center" v-if="title == '修改装运'">
         <ul>
           按钮说明
           <ul>
@@ -627,6 +627,21 @@ export default {
       this.form.containerList[index].totalGoodsGrossWeight = this.form.containerList[index].containerDetailList.reduce((total, item) => {
         return total + Number(item.goodsGrossWeight)
       }, 0)
+      //计算净重
+      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)
+
+      this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
+        .reduce((total, item) => {
+          return total + Number(item.goodsNetWeight)
+        }, 0)
+        .toFixed(3)
     },
     changePackageTareWeight(index, k, yindex) {
       //计算皮重
@@ -981,31 +996,38 @@ export default {
     submitShipment() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.open = false
+          let loadingInstance = Loading.service({
+            text: '请稍候',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)',
+            customClass: 'custom-loading-class'
+          })
           if (this.form.shipmentId == null) {
-            let loadingInstance = Loading.service({
-              text: '请稍候',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
             addWithContainer(this.form).then((response) => {
-              loadingInstance.close()
-              this.$confirm('装运已生成！您可以点击“确认”按钮留在当前页面，或点击“去看看”按钮查看详细信息。', {
-                confirmButtonText: '确定',
-                cancelButtonText: '去看看',
-                type: 'warning'
-              })
-                .then(() => {})
-                .catch(() => {
-                  this.$router.push({
-                    name: 'BizShipment',
-                    params: { viewDetailFlag: true }
-                  })
+              if (response.code == 200) {
+                this.open = false
+                loadingInstance.close()
+                this.$confirm('装运已生成！您可以点击“确认”按钮留在当前页面，或点击“去看看”按钮查看详细信息。', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '去看看',
+                  type: 'warning'
                 })
-              this.$emit('refresh')
+                  .then(() => {})
+                  .catch(() => {
+                    this.$router.push({
+                      name: 'BizShipment',
+                      params: { viewDetailFlag: true }
+                    })
+                  })
+                this.$emit('refresh')
+              } else {
+                loadingInstance.close()
+              }
             })
           } else {
             updateWithContainer(this.form).then((res) => {
+              loadingInstance.close()
+              this.open = false
               this.$modal.msgSuccess('修改成功')
               this.$emit('refresh')
             })
@@ -1021,25 +1043,34 @@ export default {
     submitAndDownload(templateType) {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.open = false
           let loadingInstance = Loading.service({
             text: '请稍候',
             spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
+            background: 'rgba(0, 0, 0, 0.7)',
+            customClass: 'custom-loading-class'
           })
-          addWithContainer(this.form).then((res) => {
-            loadingInstance.close()
-            var query = {}
-            query.orderByColumn = 'shipmentId'
-            query.isAsc = 'desc'
-            query.pageNum = 1
-            query.pageSize = 1
-            listBizShipment(query).then((res) => {
-              var shipment = res.rows[0]
-              this.handleDownloadShipment(shipment, templateType)
+          addWithContainer(this.form)
+            .then((res) => {
+              if (res.code == 200) {
+                var query = {}
+                query.orderByColumn = 'shipmentId'
+                query.isAsc = 'desc'
+                query.pageNum = 1
+                query.pageSize = 1
+                listBizShipment(query).then((res) => {
+                  var shipment = res.rows[0]
+                  this.handleDownloadShipment(shipment, templateType)
+                })
+                this.$emit('refresh')
+                this.open = false
+                loadingInstance.close()
+              } else {
+                loadingInstance.close()
+              }
+            })
+            .finally(() => {
+              loadingInstance.close()
             })
-            this.$emit('refresh')
-          })
         }
       })
     },
@@ -1065,26 +1096,42 @@ export default {
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.open = false
+          let loadingInstance = Loading.service({
+            text: '请稍候',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)',
+            customClass: 'custom-loading-class'
+          })
           if (this.form.shipmentId == null) {
-            addWithContainer(this.form).then((response) => {
-              this.$modal.msgSuccess('生成成功')
-              var query = {}
-              query.orderByColumn = 'shipmentId'
-              query.isAsc = 'desc'
-              query.pageNum = 1
-              query.pageSize = 10
-              if (this.contract.contractType == 'sale') {
-                query.saleContractId = this.contract.contractId
-              } else {
-                query.purchaseContractId = this.contract.contractId
-              }
-              listBizShipment(query).then((res) => {
-                var shipment = res.rows[0]
-                this.handleGenerateFinalInvoice(shipment)
+            addWithContainer(this.form)
+              .then((response) => {
+                if (response.code == 200) {
+                  this.open = false
+                  this.$modal.msgSuccess('生成成功')
+                  var query = {}
+                  query.orderByColumn = 'shipmentId'
+                  query.isAsc = 'desc'
+                  query.pageNum = 1
+                  query.pageSize = 10
+                  if (this.contract.contractType == 'sale') {
+                    query.saleContractId = this.contract.contractId
+                  } else {
+                    query.purchaseContractId = this.contract.contractId
+                  }
+                  listBizShipment(query).then((res) => {
+                    var shipment = res.rows[0]
+                    this.handleGenerateFinalInvoice(shipment)
+                  })
+                } else {
+                  loadingInstance.close()
+                }
+              })
+              .finally(() => {
+                loadingInstance.close()
               })
-            })
           } else {
+            loadingInstance.close()
+            this.open = false
             this.$emit('openGenerateLive', { ...this.form, quoteType: this.contract.quoteType })
           }
         }
@@ -1139,3 +1186,11 @@ export default {
   border-radius: 4px;
 }
 </style>
+<style lang="scss">
+.el-loading-mask.custom-loading-class.is-fullscreen {
+  z-index: 3000 !important;
+}
+.el-message.el-message--error {
+  z-index: 3001 !important;
+}
+</style>