货代bug 2024-1-12

public/MP_verify_Suvh578kic6T9BZz.txt

@@ -0,0 +1 @@
+Suvh578kic6T9BZz

src/api/iosBasicData/rateManagement.js

@@ -7,6 +7,22 @@ export function getRateList(params) {
     params
   })
 }
+// 汇率年 汇率月 查明细
+export function bcurexrateList(params) {
+  return request({
+    url: '/api/blade-los/bcurexrate/list',
+    method: 'get',
+    params
+  })
+}
+// 查汇率
+export function bcurrencyGetExrate(params) {
+  return request({
+    url: '/api/blade-los/bcurrency/getExrate',
+    method: 'get',
+    params
+  })
+}
 //修改和保存
 export function typeSave(data) {
   return request({

src/views/approveDataH/configuration/mainList.json

@@ -140,28 +140,21 @@
       "width": 150
     },
     {
-      "label": "数量",
-      "prop": "orderQuantity",
+      "label": "应收金额",
+      "prop": "receivableAmount",
       "overHidden": true,
       "width": 100,
       "index": 9
     },
     {
-      "label": "金额",
-      "prop": "amount",
+      "label": "应付金额",
+      "prop": "payAmount",
       "overHidden": true,
       "width": 100,
       "index": 10
     },
     {
-      "label": "应收金额",
-      "prop": "amountReceivable",
-      "overHidden": true,
-      "width": 100,
-      "index": 11
-    },
-    {
-      "label": "毛利",
+      "label": "利润",
       "prop": "grossProfit",
       "overHidden": true,
       "width": 100,

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -65,7 +65,7 @@
             </el-table-column>
             <el-table-column
                 prop="currentStlAmountRMB"
-                label="本次RMB" width="100px">
+                label="本次CNY" width="100px">
                 <template slot-scope="scope">
                     <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB"
                               :disabled="scope.row.curCode != 'CNY' || settlementdistar"
@@ -104,7 +104,7 @@
             </el-table-column>
             <el-table-column
                 prop="currentInvoiceAmountRMB"
-                label="发票RMB">
+                label="发票CNY">
             </el-table-column>
             <el-table-column
                 prop="currentInvoiceAmountUSD"
@@ -137,7 +137,7 @@
             <!--amountNet 应结算金额 没有税-->
             <el-table-column
                 prop="amountRMB"
-                label="应结算RMB" width="90px">
+                label="应结算CNY" width="90px">
             </el-table-column>
             <el-table-column
                 prop="amountUSD"
@@ -145,7 +145,7 @@
             </el-table-column>
             <el-table-column
                 prop="stlTtlAmountRMB"
-                label="已结算RMB" width="100px">
+                label="已结算CNY" width="100px">
             </el-table-column>
             <el-table-column
                 prop="stlTtlAmountUSD"

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

@@ -297,6 +297,12 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
             handleReportPreview(url,data){
                 console.log(url,1670)
                 console.log(data,1671)
+                // 处理时间
+                data.end = data.end?data.end.slice(0,10):''
+                data.goodsTime = data.goodsTime?data.goodsTime.slice(0,10):''
+                data.clearanceTime = data.clearanceTime?data.clearanceTime.slice(0,10):''
+                data.vgmDeadline = data.vgmDeadline?data.vgmDeadline.slice(0,10):''
+
                 Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
                 // Stimulsoft.Base.StiLicense.Key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w='
                 Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile( '/reports/stimulsoft/Localization/zh-CHS.xml', true, 'zh-CHS')

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

@@ -25,8 +25,7 @@
                                                   @corpFocus="remoteMethod($event,'hshipper')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
-                                    <span style="padding-left: 10px"></span>
+                                <el-col :span="8">
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.hshipperCntyName"
                                               size="small" autocomplete="off"
                                               :disabled="detailData.seeDisabled"
@@ -108,7 +107,7 @@
                                                   @corpFocus="remoteMethod($event,'hnotify')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="8">
                                     <div style="display: flex;align-items: center;justify-content: space-between;padding-left: 10px">
                                         <div style="flex: 4">
                                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.hnotifyCntyName"
@@ -466,7 +465,7 @@
                         <span slot="label">
                             <span style="color: #1e9fff">订舱代理</span>
                         </span>
-                            <el-col :span="8" style="margin-left: -10px">
+                            <el-col :span="9" style="margin-left: -10px">
                                 <search-query :datalist="bookingAgentData"
                                               :selectValue="assemblyForm.bookingAgentCnName"
                                               :filterable="true"
@@ -480,8 +479,8 @@
                                               @corpFocus="remoteMethod($event,'bookingAgent')">
                                 </search-query>
                             </el-col>
-                            <el-col :span="16">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.bookingAgentEnName"
+                            <el-col :span="15">
+                                <el-input type="age" style="width: 100%;margin-left: 20px;" v-model="assemblyForm.bookingAgentEnName"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="订舱代理" ></el-input>
@@ -507,6 +506,7 @@
                                     <span style="color: #1e9fff">包装</span>
                                 </span>
                                     <search-query :datalist="packingUnitData"
+                                                  style="margin-right: -10px;"
                                                   :selectValue="assemblyForm.packingUnit"
                                                   :filterable="true"
                                                   :clearable="true"
@@ -535,12 +535,13 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="尺码(CBM)" prop="measurement" label-width="80px"
+                                <el-form-item label="尺码(CBM)" prop="measurement" label-width="90px"
                                               :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">尺码(CBM)</span>
                                 </span>
-                                    <el-input type="number" step="0.01" style="width: 100%;" v-model="assemblyForm.measurement"
+                                    <el-input type="number" step="0.01" style="width: 106%;"
+                                              v-model="assemblyForm.measurement"
                                               size="small" autocomplete="off"
                                               :disabled="detailData.seeDisabled"
                                               clearable placeholder="请选择尺码/体积" ></el-input>

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

@@ -15,9 +15,9 @@
                            @click="batchWithdrawfun">批量撤回
                 </el-button>
             </template>
-            <template slot-scope="scope" slot="menu" v-if="assemblyForm.billStatus != 3 || assemblyForm.status == 1" >
+            <template slot-scope="scope" slot="menu" v-if="assemblyForm.billStatus != 3" >
                 <el-button :type="scope.type" :size="scope.size" icon="el-icon-edit"
-                           :disabled="detailData.seeDisabled"
+                           :disabled="detailData.seeDisabled || assemblyForm.status == 1"
                            @click.stop="withdrawfun(scope.row, scope.index)">撤回
                 </el-button>
             </template>

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

@@ -175,9 +175,9 @@
                                   :remote="true"
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'code',value:'code'}"
-                                  @remoteMethod="getRateListfun($event,'curCode')"
-                                  @corpChange="corpChange($event,'curCode',row)"
-                                  @corpFocus="getRateListfun($event,'curCode')" >
+                                  @remoteMethod="bcurrencyGetExratefun($event,'D')"
+                                  @corpChange="corpChange($event,'curCode',row,'D')"
+                                  @corpFocus="bcurrencyGetExratefun($event,'D')" >
                     </search-query>
                     <span v-else>{{row.curCode}}</span>
                 </template>
@@ -342,9 +342,9 @@
                                   :remote="true"
                                   :buttonIf="false"
                                   :forParameter="{key:'id',label:'code',value:'code'}"
-                                  @remoteMethod="getRateListfun($event,'curCode')"
-                                  @corpChange="corpChange($event,'curCode',row)"
-                                  @corpFocus="getRateListfun($event,'curCode')" >
+                                  @remoteMethod="bcurrencyGetExratefun($event,'C')"
+                                  @corpChange="corpChange($event,'curCode',row,'C')"
+                                  @corpFocus="bcurrencyGetExratefun($event,'C')" >
                     </search-query>
                     <span v-else>{{row.curCode}}</span>
                 </template>
@@ -569,7 +569,7 @@
     import {getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsPage} from "@/api/iosBasicData/bunits";
-    import {getRateList} from "@/api/iosBasicData/rateManagement";
+    import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
     import {
         feecenterList,
         feecenterRemove,
@@ -585,6 +585,7 @@
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
     import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
     import {getList as reportsList} from "@/api/iosBasicData/reports";
+    import {dateFormat} from "@/util/date";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},
@@ -1671,7 +1672,7 @@
                 })
             },
             // 客户的回调
-            corpChange(value,name,row) {
+            corpChange(value,name,row,dc) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -1713,8 +1714,11 @@
                             // 币别
                             this.$set(row,'curCode',item.curNo)
                             // 汇率
-                            getRateList({current:1,size:10}).then(res=>{
-                                for (let item of res.data.data.records) {
+                            bcurrencyGetExrate({
+                                date:this.assemblyForm.etd?this.assemblyForm.etd.slice(0,10) + ' 00:00:00':dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 开船日期
+                                dc:dc
+                            }).then(res=>{
+                                for (let item of res.data.data) {
                                     if (item.code == row.curCode) {
                                         this.$set(row,'exrate',item.exrate)
                                     }
@@ -1935,9 +1939,12 @@
             },
 
             // 获取币别数据
-            getRateListfun(cnName){
-                getRateList({current:1,size:10,cnName}).then(res=>{
-                    this.curCodeData = res.data.data.records
+            bcurrencyGetExratefun(dc){
+                bcurrencyGetExrate({
+                    date:this.assemblyForm.etd?this.assemblyForm.etd.slice(0,10) + ' 00:00:00':dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 开船日期
+                    dc:dc
+                }).then(res=>{
+                    this.curCodeData = res.data.data
                 })
             },
             // 获取签单方式字典数据

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

@@ -67,7 +67,7 @@
                           clearable placeholder="备注内容把" ></el-input>
             </el-form-item>
 
-            <el-row :gutter="20">
+            <el-row >
                 <el-col :span="6">
                     <el-form-item label="装箱方式" prop="loadType" >
                         <span slot="label">
@@ -263,11 +263,11 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-row :gutter="20">
-                <el-col span="6">
+            <el-row >
+                <el-col :span="6">
                     <el-button size="small" style="width: 100%;" type="primary" @click="inttraAdd">发送INTTRA EDI</el-button>
                 </el-col>
-                <el-col span="6">
+                <el-col :span="6">
                     <el-form-item label="签单日期" prop="issueDate" >
                         <span slot="label">
                             <span style="color: #1e9fff">签单日期</span>
@@ -283,7 +283,7 @@
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                <el-col span="6">
+                <el-col :span="6">
                     <el-form-item label="退舱日期" prop="bookingWithdrawTime" >
                         <span slot="label">
                             <span style="color: #1e9fff">退舱日期</span>

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

@@ -458,7 +458,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 label: "",
                                 prop: "srcCnName", // 来源中文 公司不是下拉写死公司两字 业务员调用户管理列表 代理调往来单位四个代理数据
                                 text:"来源",
-                                labelWidth:'10px',
+                                labelWidth:'30px',
                                 type:'select',
                                 disabled:true,
                                 dicData:[],
@@ -483,7 +483,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 text:"付款方式",
                                 prop: "mpaymode",
                                 type:'select',
-                                labelWidth:'10px',
+                                labelWidth:'30px',
                                 disabled:false,
                                 span:5,
                                 dicData:[],
@@ -506,18 +506,18 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 label: "",
                                 text:"HB/L NO",
                                 prop: "hblno",
-                                labelWidth:'10px',
-                                span:15,
+                                labelWidth:'6px',
+                                span:14,
                                 disabled:true,
                             },
                             {
                                 label: "", // HB/L 付款方式 PP=预付, CC=到付, FPA, Other', 申请之后默认 PP
                                 text:"付款方式",
                                 prop: "hpaymode",
-                                labelWidth:'10px',
+                                labelWidth:'30px',
                                 disabled:false,
                                 type:'select',
-                                span:5,
+                                span:6,
                                 dicData:[],
                                 forParameter:{
                                     key:'dictKey',
@@ -1450,9 +1450,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             async billsDetailfun(id){
                 const res = await billsDetail(id)
                 this.form = res.data.data;
-                // 先把状态改成可以编辑，然后判断是否可以编辑
-                this.generateBillsfalse = false
-                this.pleasereviewType = false
                 // 如果已经请核就禁用按钮
                 // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                 //     this.detailData.seeDisabled = true
@@ -1467,6 +1464,15 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.columnforfun('refno').disabled = true
                     this.generateBillsfalse = true
                     this.pleasereviewType = true // 请核禁用
+                }else {
+                    // 判断是否可以编辑
+                    this.columnforfun('corpCnName').disabled = false
+                    this.columnforfun('srcType').disabled = false
+                    this.columnforfun('mblno').disabled = false
+                    this.columnforfun('bookingNo').disabled = false
+                    this.columnforfun('refno').disabled = false
+                    this.generateBillsfalse = false
+                    this.pleasereviewType = false
                 }
                 this.pageLoading = false
                 this.searchMontage() // 下拉 中文名称和编号拼接

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

@@ -244,11 +244,12 @@
                                   <!--</el-input>-->
                                   <tree-select v-model="query.createDeptName" filterable
                                                :data="createDeptData"
-                                               :props="{}"
+                                               :props="{label: 'title', children:'children' }"
                                                nodeKey="title"
                                                size="small"
                                                :multiple="false"
                                                placeholder="请选择创建部门"
+                                               @focus="createDeptLzylistfun"
                                                @input="corpChange($event,'createDeptName')">
                                   </tree-select>
                               </el-form-item>
@@ -490,7 +491,7 @@ import { getDeptTree } from "@/api/system/dept";
           cyData:[],
           // 订舱代理
           bookingAgentData:[],
-          coluaccDeptData:[], // 部门数据
+          createDeptData:[], // 部门数据
           // 单据类型
           billTypeData:[
               {
@@ -588,7 +589,7 @@ import { getDeptTree } from "@/api/system/dept";
             editBtn:false,
             menuWidth:'auto',
           column: [
-            {
+              {
               label: "单据类型",
               prop: "billType",
                 type: 'select',
@@ -1220,9 +1221,9 @@ import { getDeptTree } from "@/api/system/dept";
               })
           },
           // 获取核算部分数据 // 机构管理接口
-          coluaccDeptLzylistfun(){
+          createDeptLzylistfun(){
               getDeptTree().then(res=>{
-                  this.coluaccDeptData = res.data.data
+                  this.createDeptData = res.data.data
               })
           },
         // 获取业务状态字典数据

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -541,7 +541,7 @@ export default {
         },
         // 获取计算属性
         getBunitsListfun(){
-            getBunitsList(1,10,).then(res=>{
+            getBunitsList(1,10,{status:0}).then(res=>{
                 this.unitNoData = res.data.data.records
             })
         },

src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -63,7 +63,7 @@
               size="small"
               type="primary"
               @click="createExRate"
-              :disabled="detailData.status == 1"
+              :disabled="detailData.status == 1 || dataList.length != 0"
               >产生汇率项目</el-button>
           </template>
         </avue-form>
@@ -83,22 +83,22 @@
           @row-update="rowUpdate"
           @selection-change="selectionChange"
         >
-            <template slot="menuLeft">
-                <el-button
-                    type="danger" plain
-                    size="small"
-                    @click.stop="BatchDelete"
-                >批量删除</el-button>
-            </template>
+            <!--<template slot="menuLeft">-->
+            <!--    <el-button-->
+            <!--        type="danger" plain-->
+            <!--        size="small"-->
+            <!--        @click.stop="BatchDelete"-->
+            <!--    >批量删除</el-button>-->
+            <!--</template>-->
             <template v-if="!row.$cellEdit" slot="menu" slot-scope="{row}">
                 <el-button type="text"
                            size="small"
                            @click="editFun(row)">编辑
                 </el-button>
-                <el-button type="text"
-                           size="small"
-                           @click="rowDel(row)">删除
-                </el-button>
+                <!--<el-button type="text"-->
+                <!--           size="small"-->
+                <!--           @click="rowDel(row)">删除-->
+                <!--</el-button>-->
             </template>
         </avue-crud>
       </basic-container>
@@ -107,7 +107,7 @@
 </template>
 
 <script>
-import {typeSave, dataDetail, delItem, bcurexrateDetails} from "@/api/iosBasicData/rateManagement";
+import {typeSave, dataDetail, delItem, bcurexrateDetails, bcurexrateList} from "@/api/iosBasicData/rateManagement";
 import { optionList } from "./js/optionList";
 import reportDialog from "@/components/report-dialog/main";
 export default {
@@ -412,9 +412,9 @@ export default {
         .then(res => {
           this.form = res.data.data
           this.form.annual = this.form.annual + ''
-          this.dataList = res.data.data.curExrateList
-            ? res.data.data.curExrateList
-            : [];
+          // this.dataList = res.data.data.curExrateList
+          //   ? res.data.data.curExrateList
+          //   : [];
         })
         .finally(() => {
           this.allloading = false;
@@ -524,6 +524,7 @@ export default {
               code: this.form.code,
               cnName: this.form.cnName,
               enName: this.form.enName,
+              type:this.form.paritiesType
             };
             this.dataList.push(data);
             typeSave({
@@ -549,6 +550,7 @@ export default {
                 code: this.form.code,
                 cnName: this.form.cnName,
                 enName: this.form.enName,
+                type:this.form.paritiesType
               };
               this.dataList.push(data);
             }
@@ -622,7 +624,13 @@ export default {
     "form.paritiesType":{
         // 执行方法
         handler(row,newValue) {
-            console.log(row,624)
+            let obj = {
+                current:1,
+                size:20,
+                type:row,
+                code:this.form.code,
+                exrateYear:this.form.annual
+            }
             if (row == "日汇率") {
                 this.findObject(this.option.column, "moon").display = true;
                 // this.findObject(this.option.column, "annual").display = false;
@@ -633,8 +641,14 @@ export default {
                 this.findObject(this.option.column, "moon").display = false;
                 // this.findObject(this.option.column, "annual").display = true;
             }
+            if (this.form.code) {
+                // 查明细信息
+                bcurexrateList(obj).then(res=>{
+                    this.dataList = res.data.data.records;
+                })
+            }
         },
-        deep: true, // 深度监听
+        deep: false, // 深度监听
         immediate: false  // 第一次改变就执行
     },
 

src/views/system/user.vue

@@ -538,7 +538,12 @@
                       value: '1'
                     }
                   ],
-                  hide: true
+                  hide: true,
+                  rules: [{
+                      required: true,
+                      message: "请选择用户状态",
+                      trigger: "blur"
+                  }]
                 },
                 {
                   label: "账号状态",