From 3db1b73ab5630408d97542f9f4673909b63b47a9 Mon Sep 17 00:00:00 2001
From: zhang <2012681011@qq.com>
Date: Fri, 24 Jan 2025 11:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PackagePointIvtServiceImpl.java      |   3 +-
 .../src/views/wms/st/outbill/MoneyDialog.vue  | 105 +++++++++---------
 2 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java
index d7dd906..241b78c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java
@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.config.language.LangProcess;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -110,7 +111,7 @@ public class PackagePointIvtServiceImpl implements PackagePointIvtService {
     public void update(PackagePointIvtDto dto) {
         PackagePointIvtDto entity = this.findById(dto.getIvt_id());
         if (entity == null) {
-            throw new BadRequestException("被删除或无权限，操作失败!");
+            throw new BadRequestException(LangProcess.msg("master_operation_permissions"));
         }
 
         String currentUserId = SecurityUtils.getCurrentUserId();
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue
index f1da978..a3af9e5 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue
@@ -1,54 +1,54 @@
 <template>
   <el-dialog
-    title="发货信息"
+    v-if="dialogShow"
+    :title="$t('outbill.placeholder.end33')"
     append-to-body
     :visible.sync="dialogVisible"
     :before-close="handleClose"
     width="1100px"
     destroy-on-close
-    v-if="dialogShow"
     @close="close"
   >
     <el-form ref="form3" :model="formMst" :rules="rules" size="mini" label-width="130px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="收货单位:">
-            <el-input v-model="formMst.consignee" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.consignee')">
+            <el-input v-model="formMst.consignee" size="mini" style="width: 210px" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="收货人:">
-            <el-input v-model="formMst.receiver" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.receiver')">
+            <el-input v-model="formMst.receiver" size="mini" style="width: 210px" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="收货地址:">
-            <el-input v-model="formMst.receiptaddress" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.receiptaddress')">
+            <el-input v-model="formMst.receiptaddress" size="mini" style="width: 210px" />
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="收货人联系电话:">
-            <el-input v-model="formMst.receiptphone" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.receiptphone')">
+            <el-input v-model="formMst.receiptphone" size="mini" style="width: 210px" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="合同号:">
-            <el-input v-model="formMst.contractno" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.contractno')">
+            <el-input v-model="formMst.contractno" size="mini" style="width: 210px" />
           </el-form-item>
-<!--          <el-form-item label="物流公司:">
+          <!--          <el-form-item label="物流公司:">
             <el-input v-model="formMst.logisticscompany" size="mini" style="width: 210px"/>
           </el-form-item>-->
         </el-col>
         <el-col :span="8">
-          <el-form-item label="送货单位:">
+          <el-form-item :label="$t('outbill.placeholder.deliveryunit')">
             <el-select
               v-model="formMst.deliveryunit"
               clearable
               size="mini"
-              placeholder="请选择"
+              :placeholder="$t('outbill.placeholder.select')"
               class="filter-item"
               style="width: 210px"
             >
@@ -60,19 +60,19 @@
               />
             </el-select>
           </el-form-item>
-<!--          <el-form-item label="司机:">
+          <!--          <el-form-item label="司机:">
             <el-input v-model="formMst.drivername" size="mini" style="width: 210px"/>
           </el-form-item>-->
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="送货方地址:">
+          <el-form-item :label="$t('outbill.placeholder.deliveryaddress')">
             <el-select
               v-model="formMst.deliveryaddress"
               clearable
               size="mini"
-              placeholder="请选择"
+              :placeholder="$t('outbill.placeholder.select')"
               class="filter-item"
               style="width: 210px"
             >
@@ -86,12 +86,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="物流公司编码:">
+          <el-form-item :label="$t('outbill.placeholder.trans_code')">
             <el-select
               v-model="formMst.trans_code"
               clearable
               size="mini"
-              placeholder="请选择"
+              :placeholder="$t('outbill.placeholder.select')"
               class="filter-item"
               style="width: 210px"
             >
@@ -105,10 +105,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="预估运费:">
-            <el-input v-model="formMst.estimated_freight" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.estimated_freight')">
+            <el-input v-model="formMst.estimated_freight" size="mini" style="width: 210px" />
           </el-form-item>
-<!--          <el-form-item label="送货方联系人:">
+          <!--          <el-form-item label="送货方联系人:">
             <el-input v-model="formMst.deliveryname" size="mini" style="width: 210px"/>
           </el-form-item>-->
         </el-col>
@@ -116,57 +116,54 @@
 
       <el-row>
         <el-col :span="8">
-<!--          <el-form-item label="送货联系电话:">
+          <!--          <el-form-item label="送货联系电话:">
             <el-input v-model="formMst.deliveryphone" size="mini" style="width: 210px"/>
           </el-form-item>-->
         </el-col>
-        <el-col :span="8">
-
-        </el-col>
-        <el-col :span="8">
-
-        </el-col>
+        <el-col :span="8" />
+        <el-col :span="8" />
       </el-row>
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="运转费:">
-            <el-input v-model="formMst.run_freight" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.run_freight')">
+            <el-input v-model="formMst.run_freight" size="mini" style="width: 210px" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="卸车费:">
-            <el-input v-model="formMst.unload_freight" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.unload_freight')">
+            <el-input v-model="formMst.unload_freight" size="mini" style="width: 210px" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="其他费用:">
-            <el-input v-model="formMst.other_freight" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.other_freight')">
+            <el-input v-model="formMst.other_freight" size="mini" style="width: 210px" />
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="运单号:">
-            <el-input v-model="formMst.order_number" size="mini" style="width: 210px"/>
+          <el-form-item :label="$t('outbill.placeholder.order_number')">
+            <el-input v-model="formMst.order_number" size="mini" style="width: 210px" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="车型:">
-<!--            <el-input v-model="formMst.car_type" size="mini" style="width: 210px"/>-->
+          <el-form-item :label="$t('outbill.placeholder.car_type')">
+            <!--            <el-input v-model="formMst.car_type" size="mini" style="width: 210px"/>-->
             <el-select
               v-model="formMst.car_type"
               filterable
               allow-create
               default-first-option
-              placeholder="请选择">
+              :placeholder="$t('outbill.placeholder.select')"
+            >
               <el-option
                 v-for="item in carList"
                 :key="item.value"
                 :label="item.label"
-                :value="item.value">
-              </el-option>
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -174,12 +171,12 @@
 
       <el-row :gutter="20">
         <el-col :span="20" style="border: 1px solid white">
-          <span/>
+          <span />
         </el-col>
         <el-col :span="4">
           <span>
-            <el-button icon="el-icon-check" size="mini" type="primary" @click="moneySubmit">保存</el-button>
-            <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
+            <el-button icon="el-icon-check" size="mini" type="primary" @click="moneySubmit">{{ $t('outbill.placeholder.save') }}</el-button>
+            <el-button icon="el-icon-close" size="mini" type="info" @click="close">{{ $t('outbill.placeholder.close') }}</el-button>
           </span>
         </el-col>
       </el-row>
@@ -207,14 +204,6 @@ export default {
       type: Object
     }
   },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-        this.formMst = this.openParamMoney
-      }
-    }
-  },
   data() {
     return {
       transportaList: [],
@@ -244,6 +233,14 @@ export default {
       dialogVisible: false
     }
   },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+        this.formMst = this.openParamMoney
+      }
+    }
+  },
   created() {
     crudTransportationbase.getTransporta().then(res => {
       this.transportaList = res