货代凭证 2024-2-28

src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -456,7 +456,7 @@ import {
                                 label: "MB/L NO",
                                 text:"请输入MB/L NO",
                                 prop: "mblno",
-                                span:19,
+                                span:18,
                                 disabled:false,
 
                             },
@@ -467,7 +467,7 @@ import {
                                 type:'select',
                                 labelWidth:'30px',
                                 disabled:false,
-                                span:5,
+                                span:6,
                                 dicData:[],
                                 forParameter:{
                                     key:'dictKey',

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -457,9 +457,8 @@ import {
                                 label: "MB/L NO",
                                 text:"请输入MB/L NO",
                                 prop: "mblno",
-                                span:19,
+                                span:18,
                                 disabled:false,
-
                             },
                             {
                                 label: "",  // MB/L 付款方式 PP=预付, CC=到付, FPA, Other
@@ -468,7 +467,7 @@ import {
                                 type:'select',
                                 labelWidth:'30px',
                                 disabled:false,
-                                span:5,
+                                span:6,
                                 dicData:[],
                                 forParameter:{
                                     key:'dictKey',

src/views/iosBasicData/OceanFreightImport/bills/assembly/DistributionBox/containers.vue

@@ -465,7 +465,7 @@ import {getToken} from "@/util/auth";
 
       rowSave(row, done, loading) {
         containersSubmit(row).then(() => {
-          this.onLoad(this.page);
+          // this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
@@ -478,7 +478,7 @@ import {getToken} from "@/util/auth";
       },
       rowUpdate(row, index, done, loading) {
         containersSubmit(row).then(() => {
-          this.onLoad(this.page);
+          // this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
@@ -500,7 +500,7 @@ import {getToken} from "@/util/auth";
             return containersRemove(row.id);
           })
           .then(() => {
-            this.onLoad(this.page);
+            // this.onLoad(this.page);
             this.$message({
               type: "success",
               message: "操作成功!"

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -374,6 +374,13 @@ import {number} from "echarts";
         },
         // 平均箱量
         equalDistribution(){
+            if (!this.assemblyForm.id) {
+                this.$message({
+                    message: '请先保存数据之后才能添加',
+                    type: 'warning'
+                });
+                return
+            }
             if(this.assemblyForm.waitingBoxList.length <= 0) {
                 this.$message({
                     type: "warning",

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -481,7 +481,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 label: "MB/L NO",
                                 text:"请输入MB/L NO",
                                 prop: "mblno",
-                                span:19,
+                                span:18,
                                 disabled:false,
 
                             },
@@ -492,7 +492,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 type:'select',
                                 labelWidth:'30px',
                                 disabled:false,
-                                span:5,
+                                span:6,
                                 dicData:[],
                                 forParameter:{
                                     key:'dictKey',

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -450,7 +450,7 @@ import {getToken} from "@/util/auth";
 
       rowSave(row, done, loading) {
         containersSubmit(row).then(() => {
-          this.onLoad(this.page);
+          // this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
@@ -463,7 +463,7 @@ import {getToken} from "@/util/auth";
       },
       rowUpdate(row, index, done, loading) {
         containersSubmit(row).then(() => {
-          this.onLoad(this.page);
+          // this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
@@ -485,7 +485,7 @@ import {getToken} from "@/util/auth";
             return containersRemove(row.id);
           })
           .then(() => {
-            this.onLoad(this.page);
+            // this.onLoad(this.page);
             this.$message({
               type: "success",
               message: "操作成功!"
@@ -507,7 +507,7 @@ import {getToken} from "@/util/auth";
             return containersRemove(this.ids);
           })
           .then(() => {
-            this.onLoad(this.page);
+            // this.onLoad(this.page);
             this.$message({
               type: "success",
               message: "操作成功!"

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -881,6 +881,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             assemblyForm:{
                 type:Object,
+                default: {}
             },
             // 是否生成账单
             generateBillsfalse:{

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -106,7 +106,10 @@ import {
       components: {SearchQuery},
       props:{
           pid:{},
-          assemblyForm:{},
+          assemblyForm:{
+              type:Object,
+              default: {}
+          },
           seeDisabled:{
               type:Boolean,
               default:false,
@@ -382,6 +385,13 @@ import {
         },
         // 平均箱量
         equalDistribution(){
+            if (!this.assemblyForm.id) {
+                this.$message({
+                    message: '请先点击右上角保存按钮，保存数据之后才能添加！',
+                    type: 'warning'
+                });
+                return
+            }
             if(this.assemblyForm.waitingBoxList.length <= 0) {
                 this.$message({
                     type: "warning",

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -483,7 +483,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 label: "MB/L NO",
                                 text:"请输入MB/L NO",
                                 prop: "mblno",
-                                span:19,
+                                span:18,
                                 disabled:false,
 
                             },
@@ -494,7 +494,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 type:'select',
                                 labelWidth:'30px',
                                 disabled:false,
-                                span:5,
+                                span:6,
                                 dicData:[],
                                 forParameter:{
                                     key:'dictKey',

src/views/iosBasicData/accounts/assembly/accountsDialog.vue

@@ -44,7 +44,7 @@
                                           :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
                                           @remoteMethod="propertyWorkDictsfun"
                                           @corpChange="corpChange($event,'property')"
-                                          @corpFocus="propertyWorkDictsfun">
+                                          @corpFocus="propertyWorkDictsfun" >
                             </search-query>
                         </el-form-item>
                     </el-col>

src/views/iosBasicData/finvouchers/assembly/fromtableDetails.vue

@@ -46,6 +46,7 @@
                                       :buttonIf="false"
                                       :forParameter="{key:'id',label:'code',value:'id'}"
                                       @corpFocus="accountsListfun"
+                                      @remoteMethod="accountsListfun"
                                       @corpChange="corpChange($event,'accountId',row)">
                         </search-query>
                         <el-tooltip class="item" effect="dark" content="修改" placement="top">
@@ -218,7 +219,7 @@
                 });
                 return sums;
             },
-            // 借方/贷方
+            // 借方/贷方 本币的计算
             amountBlur(row,name){
                 if (name == 'D') {
                     this.$set(row,'amountCr',0)
@@ -236,6 +237,7 @@
                     this.$set(row,'exrate',row.exrate?Number(row.exrate):0)
                     this.$set(row,'amountCr',row.amountCr?Number(row.amountCr):0)
                     this.$set(row,'amountDr',row.amountDr?Number(row.amountDr):0)
+
                     this.$set(row,'amountCrUsd',(row.amountCr * row.exrate).toFixed(2))
                     this.$set(row,'amountDrUsd',(row.amountDr * row.exrate).toFixed(2))
                 }
@@ -256,8 +258,8 @@
                 this.$set(row,'amountDr',(row.amountDrUsd / row.exrate).toFixed(2))
             },
             // 获取科目类型数据
-            accountsListfun(){
-                accountsList(1,10,).then(res=>{
+            accountsListfun(code){
+                accountsList(1,10,{code}).then(res=>{
                     this.accountData = res.data.data.records
                 })
             },

src/views/iosBasicData/finvouchers/index.vue

@@ -64,6 +64,7 @@
   import {mapGetters} from "vuex";
   import finvouchersitems from "@/views/iosBasicData/finvouchers/finvouchersitems.vue";
   import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDetails.vue";
+  import {getWorkDicts} from "@/api/system/dictbiz";
 
   export default {
     data() {
@@ -178,6 +179,7 @@
               prop: "isForeign",
               search: true,
               type:'select',
+              dicData:[],
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=ifInvoice",
               props: {
                 label: "dictValue",
@@ -190,6 +192,7 @@
               prop: "isQuantity",
               search: true,
               type:'select',
+              dicData:[],
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=ifInvoice",
               props: {
                  label: "dictValue",
@@ -222,6 +225,7 @@
               prop: "voucherStatus",
               search: true,
               type:'select',
+              dicData:[],
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=voucher_status_los",
               props: {
                  label: "dictValue",
@@ -260,8 +264,21 @@
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(321), this.optionBack);
+        this.voucherStatusWorkDictsfun()
     },
     methods: {
+      // 获取字典数据
+        voucherStatusWorkDictsfun(){
+          getWorkDicts("voucher_status_los").then(res => {
+              this.findObject(this.option.column, "voucherStatus").dicData = res.data.data;
+          })
+          // 是否字典
+          getWorkDicts("ifInvoice").then(res => {
+              this.findObject(this.option.column, "isForeign").dicData = res.data.data;
+              this.findObject(this.option.column, "isQuantity").dicData = res.data.data;
+          })
+      },
+
       // 凭证记账
       voucherAccountingfun(){
           if (this.selectionList.length === 0) {
@@ -398,7 +415,12 @@
         finvouchersList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
-          this.data = data.records;
+          this.data = data.records.map(item=>{
+              item.isForeign = item.isForeign + ''
+              item.isQuantity = item.isQuantity + ''
+              item.voucherStatus = item.voucherStatus + ''
+              return item
+          })
           this.loading = false;
           this.selectionClear();
         });