doctor-admin-components 1.0.13-beta.8 → 1.0.13-pro.0

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,28 +996,33 @@ export default {
     submitShipment() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.open = false
           if (this.form.shipmentId == null) {
             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((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) => {
@@ -1021,25 +1041,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,25 +1094,39 @@ 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 {
             this.$emit('openGenerateLive', { ...this.form, quoteType: this.contract.quoteType })
           }
@@ -1139,3 +1182,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>

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

@@ -6,35 +6,23 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('contract.companyName')" prop="companyEnglishName">
-              <el-input
-                v-model="form.companyEnglishName"
-                :placeholder="
-                  $t('placeholder.enter') + $t('contract.companyName')
-                "
-              />
+              <el-input v-model="form.companyEnglishName" :placeholder="$t('placeholder.enter') + $t('contract.companyName')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              :label="$t('contract.taxId')"
-              prop="taxNumber"
-              v-if="this.companyType !== 'contract'"
-            >
-              <el-input
-                v-model="form.taxNumber"
-                :placeholder="$t('placeholder.enter') + $t('contract.taxId')"
-              />
+            <el-form-item :label="$t('contract.taxId')" prop="taxNumber" v-if="this.companyType !== 'contract'">
+              <el-input v-model="form.taxNumber" :placeholder="$t('placeholder.enter') + $t('contract.taxId')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="20">
+          <el-col :span="24">
             <el-form-item :label="$t('contract.companyAddress')" prop="address">
               <el-input
+                type="textarea"
+                :autosize="{ minRows: 1, maxRows: 4 }"
                 v-model="form.address"
-                :placeholder="
-                  $t('placeholder.enter') + $t('contract.companyAddress')
-                "
+                :placeholder="$t('placeholder.enter') + $t('contract.companyAddress')"
               />
             </el-form-item>
           </el-col>
@@ -43,46 +31,31 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="PAN NO." prop="panNo">
-              <el-input
-                v-model="form.panNo"
-                :placeholder="
-                  $t('placeholder.enter') + 'PAN NO.'
-                "
-              />
+              <el-input v-model="form.panNo" :placeholder="$t('placeholder.enter') + 'PAN NO.'" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="IEC CODE" prop="iecCode">
-              <el-input
-                v-model="form.iecCode"
-                :placeholder="
-                  $t('placeholder.enter') + 'IEC CODE'
-                "
-              />
+              <el-input v-model="form.iecCode" :placeholder="$t('placeholder.enter') + 'IEC CODE'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="GST NUMBER" prop="gstNumber">
-              <el-input
-                v-model="form.gstNumber"
-                :placeholder="
-                  $t('placeholder.enter') + 'GST NUMBER'
-                "
-              />
+              <el-input v-model="form.gstNumber" :placeholder="$t('placeholder.enter') + 'GST NUMBER'" />
             </el-form-item>
           </el-col>
           <el-col :span="12"></el-col>
         </el-row>
         <el-row v-if="companyType == 'delivery' && channel !== 'official-website'">
-          <el-col :span="20">
+          <el-col :span="24">
             <el-form-item :label="$t('contract.bliRemark')" prop="bliRemark">
               <el-input
+                type="textarea"
+                :autosize="{ minRows: 3, maxRows: 4 }"
                 v-model="form.bliRemark"
-                :placeholder="
-                  $t('placeholder.enter') + $t('contract.bliRemark')
-                "
+                :placeholder="$t('placeholder.enter') + $t('contract.bliRemark')"
               />
             </el-form-item>
           </el-col>
@@ -90,30 +63,18 @@
 
         <el-divider></el-divider>
         <el-row type="flex" justify="space-between">
-          <h4>{{ $t("contract.contactInfo") }}</h4>
+          <h4>{{ $t('contract.contactInfo') }}</h4>
         </el-row>
 
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('contract.contact')" prop="contact">
-              <el-input
-                v-model="form.contact"
-                :placeholder="$t('placeholder.enter') + $t('contract.contact')"
-                style="width: 75%"
-              />
+              <el-input v-model="form.contact" :placeholder="$t('placeholder.enter') + $t('contract.contact')" style="width: 75%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              :label="$t('contract.landline')"
-              prop="landline"
-              v-if="this.companyType == 'contract'"
-            >
-              <el-input
-                v-model="form.landline"
-                :placeholder="$t('placeholder.enter') + $t('contract.landline')"
-                style="width: 75%"
-              />
+            <el-form-item :label="$t('contract.landline')" prop="landline" v-if="this.companyType == 'contract'">
+              <el-input v-model="form.landline" :placeholder="$t('placeholder.enter') + $t('contract.landline')" style="width: 75%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -123,37 +84,14 @@
             <el-row v-for="(item, index) in form.phoneNumber" :key="index">
               <el-col :span="20">
                 <el-form-item :label="$t('contract.phoneNumber')" prop="phoneNumber">
-                  <el-input
-                    v-model="form.phoneNumber[index]"
-                    :placeholder="
-                      $t('placeholder.enter') + $t('contract.phoneNumber')
-                    "
-                  ></el-input>
+                  <el-input v-model="form.phoneNumber[index]" :placeholder="$t('placeholder.enter') + $t('contract.phoneNumber')"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="2" style="padding-top: 5px" v-if="companyType !== 'contract'">
-                <el-button
-                  icon="el-icon-plus"
-                  size="mini"
-                  circle
-                  class="ml5"
-                  v-if="index === form.phoneNumber.length - 1"
-                  @click="addArr('phoneNumber')"
-                ></el-button>
+                <el-button icon="el-icon-plus" size="mini" circle class="ml5" v-if="index === form.phoneNumber.length - 1" @click="addArr('phoneNumber')"></el-button>
               </el-col>
-              <el-col
-                :span="2"
-                style="padding-top: 5px"
-                :push="1"
-                v-if="companyType !== 'contract'"
-              >
-                <el-button
-                  v-if="index > 0"
-                  size="mini"
-                  icon="el-icon-minus"
-                  circle
-                  @click="deleteArr('phoneNumber', index)"
-                ></el-button>
+              <el-col :span="2" style="padding-top: 5px" :push="1" v-if="companyType !== 'contract'">
+                <el-button v-if="index > 0" size="mini" icon="el-icon-minus" circle @click="deleteArr('phoneNumber', index)"></el-button>
               </el-col>
             </el-row>
           </el-col>
@@ -161,37 +99,15 @@
             <!-- 循环 -->
             <el-row v-for="(item, index) in form.email" :key="index">
               <el-col :span="20">
-                <el-form-item
-                  :label="$t('contract.email')"
-                  :prop="'email.' + index"
-                  :rules="rules.email"
-                >
-                  <el-input
-                    v-model="form.email[index]"
-                    :placeholder="
-                      $t('placeholder.enter') + $t('contract.email')
-                    "
-                  />
+                <el-form-item :label="$t('contract.email')" :prop="'email.' + index" :rules="rules.email">
+                  <el-input v-model="form.email[index]" :placeholder="$t('placeholder.enter') + $t('contract.email')" />
                 </el-form-item>
               </el-col>
               <el-col :span="2" style="padding-top: 5px">
-                <el-button
-                  icon="el-icon-plus"
-                  size="mini"
-                  circle
-                  class="ml5"
-                  v-if="index === form.email.length - 1"
-                  @click="addArr('email')"
-                ></el-button>
+                <el-button icon="el-icon-plus" size="mini" circle class="ml5" v-if="index === form.email.length - 1" @click="addArr('email')"></el-button>
               </el-col>
               <el-col :span="2" style="padding-top: 5px" :push="1">
-                <el-button
-                  v-if="index > 0"
-                  size="mini"
-                  icon="el-icon-minus"
-                  circle
-                  @click="deleteArr('email', index)"
-                ></el-button>
+                <el-button v-if="index > 0" size="mini" icon="el-icon-minus" circle @click="deleteArr('email', index)"></el-button>
               </el-col>
             </el-row>
           </el-col>
@@ -202,19 +118,18 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{ $t("button.confirm") }}</el-button>
-        <el-button @click="cancel">{{ $t("button.cancel") }}</el-button>
+        <el-button v-if="(companyType == 'delivery' || companyType == 'notifier') && form.contractCompanyId == null" type="primary" @click="submitAndGenerate">
+          {{ '确认并生成' + (companyType == 'delivery' ? '通知人' : companyType == 'notifier' ? '收货人' : '') }}
+        </el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('button.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('button.cancel') }}</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {
-  getBizContractCompany,
-  addBizContractCompany,
-  updateBizContractCompany,
-} from '../../../api/biz/bizContractCompany';
+import { getBizContractCompany, addBizContractCompany, updateBizContractCompany } from '../../../api/biz/bizContractCompany'
 
 export default {
   name: 'AddSubCompanyDialog',
@@ -238,50 +153,50 @@ export default {
           {
             required: true,
             message: this.$t('contract.tip7'),
-            trigger: 'blur',
-          },
+            trigger: 'blur'
+          }
         ],
         address: [
           {
             required: true,
             message: this.$t('contract.tip8'),
-            trigger: 'blur',
-          },
+            trigger: 'blur'
+          }
         ],
         email: [
           {
             required: true,
             message: this.$t('contract.tip9'),
-            trigger: 'blur',
-          },
+            trigger: 'blur'
+          }
         ],
         taxNumber: [
           {
             required: true,
             message: this.$t('contract.tip10'),
-            trigger: 'blur',
-          },
-        ],
-      },
-    };
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
   },
   props: {
-    channel: '',
+    channel: ''
   },
   created() {},
   methods: {
     //增加手机号
     addArr(type) {
-      this.form[type].push('');
+      this.form[type].push('')
     },
     //增加邮箱
     deleteArr(type, index) {
-      this.form[type].splice(index, 1);
+      this.form[type].splice(index, 1)
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -299,23 +214,23 @@ export default {
         companyType: null,
         defaultFlag: false,
         landline: null,
-        taxNumber: null,
-      };
-      this.resetForm('form');
+        taxNumber: null
+      }
+      this.resetForm('form')
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const contractCompanyId = row.contractCompanyId;
+      this.reset()
+      const contractCompanyId = row.contractCompanyId
       getBizContractCompany(contractCompanyId).then((response) => {
-        this.form = response.data;
-        this.companyId = row.companyId;
-        this.companyType = response.data.companyType;
+        this.form = response.data
+        this.companyId = row.companyId
+        this.companyType = response.data.companyType
         if (this.form.phoneNumber.length <= 0) {
-          this.addArr('phoneNumber');
+          this.addArr('phoneNumber')
         }
 
-        console.log(this.companyType);
+        console.log(this.companyType)
         const title =
           this.companyType == 'contract'
             ? this.$t('button.edit') + this.$t('contract.contract')
@@ -323,17 +238,17 @@ export default {
             ? this.$t('button.edit') + this.$t('contract.consignee')
             : this.companyType == 'notifier'
             ? this.$t('button.edit') + this.$t('contract.notifier')
-            : this.$t('button.edit');
-        this.title = title;
-        this.open = true;
-      });
+            : this.$t('button.edit')
+        this.title = title
+        this.open = true
+      })
     },
     /** 新增按钮操作 */
     handleAdd(companyId, companyType) {
-      this.reset();
-      this.open = true;
-      this.companyType = companyType;
-      this.companyId = companyId;
+      this.reset()
+      this.open = true
+      this.companyType = companyType
+      this.companyId = companyId
       const title =
         companyType == 'contract'
           ? this.$t('button.add') + this.$t('contract.contract')
@@ -341,33 +256,55 @@ export default {
           ? this.$t('button.add') + this.$t('contract.consignee')
           : companyType == 'notifier'
           ? this.$t('button.add') + this.$t('contract.notifier')
-          : this.$t('button.add');
-      this.addArr('phoneNumber');
-      this.addArr('email');
-      this.title = title;
+          : this.$t('button.add')
+      this.addArr('phoneNumber')
+      this.addArr('email')
+      this.title = title
+    },
+    //提交并生成
+    submitAndGenerate() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.form.companyType = this.companyType
+          this.form.companyId = this.companyId
+          addBizContractCompany(this.form).then((response) => {
+            if (this.companyType == 'delivery') {
+              this.form.companyType = 'notifier'
+            }
+            if (this.companyType == 'notifier') {
+              this.form.companyType = 'delivery'
+            }
+            addBizContractCompany(this.form).then((response) => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.$emit('submit')
+            })
+          })
+        }
+      })
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.form.companyType = this.companyType;
-          this.form.companyId = this.companyId;
+          this.form.companyType = this.companyType
+          this.form.companyId = this.companyId
           if (this.form.contractCompanyId != null) {
             updateBizContractCompany(this.form).then((response) => {
-              this.$modal.msgSuccess(this.$t('button.editTip'));
-              this.open = false;
-              this.$emit('submit');
-            });
+              this.$modal.msgSuccess(this.$t('button.editTip'))
+              this.open = false
+              this.$emit('submit')
+            })
           } else {
             addBizContractCompany(this.form).then((response) => {
-              this.$modal.msgSuccess(this.$t('button.addTip'));
-              this.open = false;
-              this.$emit('submit');
-            });
+              this.$modal.msgSuccess(this.$t('button.addTip'))
+              this.open = false
+              this.$emit('submit')
+            })
           }
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>