Browse Source

货代 2024-2-05

caojunjie 1 year ago
parent
commit
e170810d71

+ 9 - 5
src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -42,6 +42,7 @@
                                                   :filterable="true"
                                                   :filterable="true"
                                                   :remote="true"
                                                   :remote="true"
                                                   :buttonIf="false"
                                                   :buttonIf="false"
+                                                  placeholder="请选择往来单位"
                                                   :forParameter="{ key:'id', label:'cnName', value:'cnName'}"
                                                   :forParameter="{ key:'id', label:'cnName', value:'cnName'}"
                                                   @corpChange="corpChange($event,'corpCnName')"
                                                   @corpChange="corpChange($event,'corpCnName')"
                                                   @remoteMethod="corpBcorpsListfun"
                                                   @remoteMethod="corpBcorpsListfun"
@@ -57,6 +58,7 @@
                                                   :disabled="editSave || !form.corpId"
                                                   :disabled="editSave || !form.corpId"
                                                   :filterable="true"
                                                   :filterable="true"
                                                   :buttonIf="false"
                                                   :buttonIf="false"
+                                                  placeholder="请选择开户帐号"
                                                   :forParameter="{ key:'id', label:'accountBankNo', value:'id'}"
                                                   :forParameter="{ key:'id', label:'accountBankNo', value:'id'}"
                                                   @corpChange="corpChange($event,'bankId')"
                                                   @corpChange="corpChange($event,'bankId')"
                                                   @corpFocus="bcorpsbankListfun" >
                                                   @corpFocus="bcorpsbankListfun" >
@@ -68,7 +70,7 @@
                                     <el-input style="width: 100%;" v-model="form.remarks"
                                     <el-input style="width: 100%;" v-model="form.remarks"
                                               size="small" autocomplete="off"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
                                               :disabled="editSave"
-                                              clearable placeholder="请输入付费事由" >
+                                              clearable placeholder="请输入事由" >
                                     </el-input>
                                     </el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
@@ -105,7 +107,7 @@
                                                   :remote="true"
                                                   :remote="true"
                                                   :buttonIf="false"
                                                   :buttonIf="false"
                                                   :disabled="editSave || tableData.length > 0"
                                                   :disabled="editSave || tableData.length > 0"
-                                                  placeholder="请选择方向"
+                                                  placeholder="请选择收/付"
                                                   @corpChange="corpChange($event,'dc')">
                                                   @corpChange="corpChange($event,'dc')">
                                     </search-query>
                                     </search-query>
                                 </el-form-item>
                                 </el-form-item>
@@ -119,6 +121,7 @@
                                                   :buttonIf="false"
                                                   :buttonIf="false"
                                                   :filterable="true"
                                                   :filterable="true"
                                                   :remote="true"
                                                   :remote="true"
+                                                  placeholder="请选择币别"
                                                   :forParameter="{ key:'id', label:'code', value:'code'}"
                                                   :forParameter="{ key:'id', label:'code', value:'code'}"
                                                   @corpChange="corpChange($event,'curCode')"
                                                   @corpChange="corpChange($event,'curCode')"
                                                   @remoteMethod="getRateListfun"
                                                   @remoteMethod="getRateListfun"
@@ -131,7 +134,7 @@
                                     <el-input style="width: 100%;" v-model="form.businessNo"
                                     <el-input style="width: 100%;" v-model="form.businessNo"
                                               size="small" autocomplete="off"
                                               size="small" autocomplete="off"
                                               :disabled="editSave || tableData.length > 0"
                                               :disabled="editSave || tableData.length > 0"
-                                              clearable placeholder="请输入JOB NO" >
+                                              clearable placeholder="请输入业务编号" >
                                     </el-input>
                                     </el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
@@ -167,7 +170,7 @@
                                     <el-input style="width: 100%;" v-model="form.checkNo"
                                     <el-input style="width: 100%;" v-model="form.checkNo"
                                               size="small" autocomplete="off"
                                               size="small" autocomplete="off"
                                               :disabled="editSave || tableData.length > 0"
                                               :disabled="editSave || tableData.length > 0"
-                                              clearable placeholder="请输入CHK NO" >
+                                              clearable placeholder="请输入对账单号" >
                                     </el-input>
                                     </el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
@@ -179,6 +182,7 @@
                                                   :disabled="editSave || tableData.length > 0"
                                                   :disabled="editSave || tableData.length > 0"
                                                   :buttonIf="false"
                                                   :buttonIf="false"
                                                   :multiple="true"
                                                   :multiple="true"
+                                                  placeholder="请选择业务类型"
                                                   @corpChange="corpChange($event,'businessTypes')">
                                                   @corpChange="corpChange($event,'businessTypes')">
                                     </search-query>
                                     </search-query>
                                 </el-form-item>
                                 </el-form-item>
@@ -200,7 +204,7 @@
                                         <el-input style="width: 100%;" v-model="form.voyageNo"
                                         <el-input style="width: 100%;" v-model="form.voyageNo"
                                                   size="small" autocomplete="off"
                                                   size="small" autocomplete="off"
                                                   :disabled="editSave || tableData.length > 0"
                                                   :disabled="editSave || tableData.length > 0"
-                                                  clearable placeholder="请选择航次" ></el-input>
+                                                  clearable placeholder="请输入航次" ></el-input>
                                     </el-form-item>
                                     </el-form-item>
                                 </el-col>
                                 </el-col>
                             </el-row>
                             </el-row>

+ 9 - 7
src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -133,7 +133,7 @@
                                                   :remote="true"
                                                   :remote="true"
                                                   :buttonIf="false"
                                                   :buttonIf="false"
                                                   :disabled="editSave"
                                                   :disabled="editSave"
-                                                  placeholder="请选择方向"
+                                                  placeholder="请选择收/付"
                                                   @corpChange="corpChange($event,'dc')">
                                                   @corpChange="corpChange($event,'dc')">
                                     </search-query>
                                     </search-query>
                                 </el-form-item>
                                 </el-form-item>
@@ -147,6 +147,7 @@
                                                   :buttonIf="false"
                                                   :buttonIf="false"
                                                   :filterable="true"
                                                   :filterable="true"
                                                   :remote="true"
                                                   :remote="true"
+                                                  placeholder="请选择币别"
                                                   :forParameter="{ key:'id', label:'code', value:'code'}"
                                                   :forParameter="{ key:'id', label:'code', value:'code'}"
                                                   @corpChange="corpChange($event,'curCode')"
                                                   @corpChange="corpChange($event,'curCode')"
                                                   @remoteMethod="getRateListfun"
                                                   @remoteMethod="getRateListfun"
@@ -159,7 +160,7 @@
                                     <el-input style="width: 100%;" v-model="form.businessNo"
                                     <el-input style="width: 100%;" v-model="form.businessNo"
                                               size="small" autocomplete="off"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
                                               :disabled="editSave"
-                                              clearable placeholder="请输入JOB NO" >
+                                              clearable placeholder="请输入业务编号" >
                                     </el-input>
                                     </el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
@@ -168,7 +169,7 @@
                                     <el-input style="width: 100%;" v-model="form.accountNo"
                                     <el-input style="width: 100%;" v-model="form.accountNo"
                                               size="small" autocomplete="off"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
                                               :disabled="editSave"
-                                              clearable placeholder="请输入ACCT NO" >
+                                              clearable placeholder="请输入账单编号" >
                                     </el-input>
                                     </el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
@@ -195,7 +196,7 @@
                                     <el-input style="width: 100%;" v-model="form.checkNo"
                                     <el-input style="width: 100%;" v-model="form.checkNo"
                                               size="small" autocomplete="off"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
                                               :disabled="editSave"
-                                              clearable placeholder="请输入CHK NO" >
+                                              clearable placeholder="请输入对账单号" >
                                     </el-input>
                                     </el-input>
                                 </el-form-item>
                                 </el-form-item>
                             </el-col>
                             </el-col>
@@ -211,6 +212,7 @@
                                                       :disabled="editSave"
                                                       :disabled="editSave"
                                                       :buttonIf="false"
                                                       :buttonIf="false"
                                                       :multiple="true"
                                                       :multiple="true"
+                                                      placeholder="请选择业务类型"
                                                       @corpChange="corpChange($event,'businessTypes')">
                                                       @corpChange="corpChange($event,'businessTypes')">
                                         </search-query>
                                         </search-query>
                                     </el-form-item>
                                     </el-form-item>
@@ -237,7 +239,7 @@
                                         <el-input style="width: 100%;" v-model="form.voyageNo"
                                         <el-input style="width: 100%;" v-model="form.voyageNo"
                                                   size="small" autocomplete="off"
                                                   size="small" autocomplete="off"
                                                   :disabled="editSave"
                                                   :disabled="editSave"
-                                                  clearable placeholder="请选择航次" ></el-input>
+                                                  clearable placeholder="请输入航次" ></el-input>
 
 
                                     </el-form-item>
                                     </el-form-item>
                                 </el-col>
                                 </el-col>
@@ -246,7 +248,7 @@
                                         <el-input style="width: 100%;" v-model="form.billNo"
                                         <el-input style="width: 100%;" v-model="form.billNo"
                                                   size="small" autocomplete="off"
                                                   size="small" autocomplete="off"
                                                   :disabled="true"
                                                   :disabled="true"
-                                                  clearable placeholder="请选择单据编号" ></el-input>
+                                                  clearable placeholder="单据编号" ></el-input>
                                     </el-form-item>
                                     </el-form-item>
                                 </el-col>
                                 </el-col>
                                 <el-col :span="4">
                                 <el-col :span="4">
@@ -254,7 +256,7 @@
                                         <el-input style="width: 100%;" v-model="form.updateUserName"
                                         <el-input style="width: 100%;" v-model="form.updateUserName"
                                                   size="small" autocomplete="off"
                                                   size="small" autocomplete="off"
                                                   :disabled="true"
                                                   :disabled="true"
-                                                  clearable placeholder="请选择修改人" ></el-input>
+                                                  clearable placeholder="修改人" ></el-input>
                                     </el-form-item>
                                     </el-form-item>
                                 </el-col>
                                 </el-col>
                             </el-row>
                             </el-row>

+ 2 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -669,7 +669,8 @@
           console.log("从url加载报表");
           console.log("从url加载报表");
           // report.loadFile("/reports/stimulsoft/demos/SimpleList.mrt");
           // report.loadFile("/reports/stimulsoft/demos/SimpleList.mrt");
           report.load(url)
           report.load(url)
-
+          var encodedString = encodeURIComponent("your string");
+          report.ExportDocumentPdf("output.pdf", Encoding.UTF8);
           // 获取报告文件名更改文件名称
           // 获取报告文件名更改文件名称
           report.reportAlias = this.assemblyForm.corpCnName.split(' - ')[0] + '-' + this.assemblyForm.mblno
           report.reportAlias = this.assemblyForm.corpCnName.split(' - ')[0] + '-' + this.assemblyForm.mblno
           // report.reportName = '12313'
           // report.reportName = '12313'

+ 4 - 4
src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -33,7 +33,7 @@
                                             <el-input style="width: 100%;" v-model="form.invoiceNo"
                                             <el-input style="width: 100%;" v-model="form.invoiceNo"
                                                       size="small" autocomplete="off"
                                                       size="small" autocomplete="off"
                                                       :disabled="true"
                                                       :disabled="true"
-                                                      clearable placeholder="请输入发票号码" >
+                                                      clearable placeholder="发票号码" >
                                             </el-input>
                                             </el-input>
                                         </el-form-item>
                                         </el-form-item>
                                     </el-col>
                                     </el-col>
@@ -154,7 +154,7 @@
                                                           :remote="true"
                                                           :remote="true"
                                                           :disabled="editSave"
                                                           :disabled="editSave"
                                                           :buttonIf="false"
                                                           :buttonIf="false"
-                                                          placeholder="请输入装货港"
+                                                          placeholder="请选择装货港"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           @corpChange="corpChange($event,'pol')"
                                                           @corpChange="corpChange($event,'pol')"
                                                           @remoteMethod="polBportsListfun"
                                                           @remoteMethod="polBportsListfun"
@@ -171,7 +171,7 @@
                                                           :remote="true"
                                                           :remote="true"
                                                           :disabled="editSave"
                                                           :disabled="editSave"
                                                           :buttonIf="false"
                                                           :buttonIf="false"
-                                                          placeholder="请输入卸货港"
+                                                          placeholder="请选择卸货港"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           @corpChange="corpChange($event,'pod')"
                                                           @corpChange="corpChange($event,'pod')"
                                                           @remoteMethod="podBportsListfun"
                                                           @remoteMethod="podBportsListfun"
@@ -188,7 +188,7 @@
                                                           :remote="true"
                                                           :remote="true"
                                                           :disabled="editSave"
                                                           :disabled="editSave"
                                                           :buttonIf="false"
                                                           :buttonIf="false"
-                                                          placeholder="请输入目的地"
+                                                          placeholder="请选择目的地"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           @corpChange="corpChange($event,'destination')"
                                                           @corpChange="corpChange($event,'destination')"
                                                           @remoteMethod="destinationBportsListfun"
                                                           @remoteMethod="destinationBportsListfun"

+ 5 - 5
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -39,7 +39,7 @@
                                             <el-input style="width: 100%;" v-model="form.invoiceNo"
                                             <el-input style="width: 100%;" v-model="form.invoiceNo"
                                                       size="small" autocomplete="off"
                                                       size="small" autocomplete="off"
                                                       :disabled="true"
                                                       :disabled="true"
-                                                      clearable placeholder="请输入发票号码" >
+                                                      clearable placeholder="发票号码" >
                                             </el-input>
                                             </el-input>
                                         </el-form-item>
                                         </el-form-item>
                                     </el-col>
                                     </el-col>
@@ -50,7 +50,7 @@
                                                             type="date" size="small"
                                                             type="date" size="small"
                                                             :disabled="editSave"
                                                             :disabled="editSave"
                                                             value-format="yyyy-MM-dd"
                                                             value-format="yyyy-MM-dd"
-                                                            placeholder="选择开票日期">
+                                                            placeholder="选择开票日期">
                                             </el-date-picker>
                                             </el-date-picker>
                                         </el-form-item>
                                         </el-form-item>
                                     </el-col>
                                     </el-col>
@@ -160,7 +160,7 @@
                                                           :remote="true"
                                                           :remote="true"
                                                           :disabled="editSave"
                                                           :disabled="editSave"
                                                           :buttonIf="false"
                                                           :buttonIf="false"
-                                                          placeholder="请输入装货港"
+                                                          placeholder="请选择装货港"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           @corpChange="corpChange($event,'pol')"
                                                           @corpChange="corpChange($event,'pol')"
                                                           @remoteMethod="polBportsListfun"
                                                           @remoteMethod="polBportsListfun"
@@ -177,7 +177,7 @@
                                                           :remote="true"
                                                           :remote="true"
                                                           :disabled="editSave"
                                                           :disabled="editSave"
                                                           :buttonIf="false"
                                                           :buttonIf="false"
-                                                          placeholder="请输入卸货港"
+                                                          placeholder="请选择卸货港"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           @corpChange="corpChange($event,'pod')"
                                                           @corpChange="corpChange($event,'pod')"
                                                           @remoteMethod="podBportsListfun"
                                                           @remoteMethod="podBportsListfun"
@@ -194,7 +194,7 @@
                                                           :remote="true"
                                                           :remote="true"
                                                           :disabled="editSave"
                                                           :disabled="editSave"
                                                           :buttonIf="false"
                                                           :buttonIf="false"
-                                                          placeholder="请输入目的地"
+                                                          placeholder="请选择目的地"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           @corpChange="corpChange($event,'destination')"
                                                           @corpChange="corpChange($event,'destination')"
                                                           @remoteMethod="destinationBportsListfun"
                                                           @remoteMethod="destinationBportsListfun"

+ 5 - 5
src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -33,7 +33,7 @@
                                             <el-input style="width: 100%;" v-model="form.invoiceNo"
                                             <el-input style="width: 100%;" v-model="form.invoiceNo"
                                                       size="small" autocomplete="off"
                                                       size="small" autocomplete="off"
                                                       :disabled="true"
                                                       :disabled="true"
-                                                      clearable placeholder="请输入发票号码" >
+                                                      clearable placeholder="发票号码" >
                                             </el-input>
                                             </el-input>
                                         </el-form-item>
                                         </el-form-item>
                                     </el-col>
                                     </el-col>
@@ -44,7 +44,7 @@
                                                             type="date" size="small"
                                                             type="date" size="small"
                                                             :disabled="editSave"
                                                             :disabled="editSave"
                                                             value-format="yyyy-MM-dd"
                                                             value-format="yyyy-MM-dd"
-                                                            placeholder="选择开票日期">
+                                                            placeholder="选择开票日期">
                                             </el-date-picker>
                                             </el-date-picker>
                                         </el-form-item>
                                         </el-form-item>
                                     </el-col>
                                     </el-col>
@@ -154,7 +154,7 @@
                                                           :remote="true"
                                                           :remote="true"
                                                           :disabled="editSave"
                                                           :disabled="editSave"
                                                           :buttonIf="false"
                                                           :buttonIf="false"
-                                                          placeholder="请输入装货港"
+                                                          placeholder="请选择装货港"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           @corpChange="corpChange($event,'pol')"
                                                           @corpChange="corpChange($event,'pol')"
                                                           @remoteMethod="polBportsListfun"
                                                           @remoteMethod="polBportsListfun"
@@ -171,7 +171,7 @@
                                                           :remote="true"
                                                           :remote="true"
                                                           :disabled="editSave"
                                                           :disabled="editSave"
                                                           :buttonIf="false"
                                                           :buttonIf="false"
-                                                          placeholder="请输入卸货港"
+                                                          placeholder="请选择卸货港"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           @corpChange="corpChange($event,'pod')"
                                                           @corpChange="corpChange($event,'pod')"
                                                           @remoteMethod="podBportsListfun"
                                                           @remoteMethod="podBportsListfun"
@@ -188,7 +188,7 @@
                                                           :remote="true"
                                                           :remote="true"
                                                           :disabled="editSave"
                                                           :disabled="editSave"
                                                           :buttonIf="false"
                                                           :buttonIf="false"
-                                                          placeholder="请输入目的地"
+                                                          placeholder="请选择目的地"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           :forParameter="{key:'id',label:'enName',value:'enName'}"
                                                           @corpChange="corpChange($event,'destination')"
                                                           @corpChange="corpChange($event,'destination')"
                                                           @remoteMethod="destinationBportsListfun"
                                                           @remoteMethod="destinationBportsListfun"

+ 4 - 0
src/views/iosBasicData/reportClose/AIreportClose/bgdetails.vue

@@ -658,6 +658,10 @@
                     businessType:'BGAI',
                     businessType:'BGAI',
                     createUser:'', // 制单人id
                     createUser:'', // 制单人id
                     createUserName:'', // 制单人名称
                     createUserName:'', // 制单人名称
+                    customsDeclarationGoodsList:[],
+                    feeCenterListD:[],
+                    feeCenterListC:[]
+
                 },
                 },
                 bigtabs:'wt', // tabs切换
                 bigtabs:'wt', // tabs切换
                 corpData:[], // 经营单位数据
                 corpData:[], // 经营单位数据

+ 5 - 5
src/views/iosBasicData/reportClose/SEreportClose/assembly/feecenter.vue

@@ -1122,7 +1122,7 @@
                     reportCode:this.reportformsObj.classifyCode,
                     reportCode:this.reportformsObj.classifyCode,
                     groupCode:this.reportformsObj.groupCode,
                     groupCode:this.reportformsObj.groupCode,
                     corpIds:row.id,
                     corpIds:row.id,
-                    type:'HYCK'
+                    type:'BGSE'
                 }).then(res=>{
                 }).then(res=>{
                     this.handleReportPreview(this.reportformsObj.url,res.data.data.data)
                     this.handleReportPreview(this.reportformsObj.url,res.data.data.data)
                 })
                 })
@@ -1139,7 +1139,7 @@
                     reportCode:val.classifyCode,
                     reportCode:val.classifyCode,
                     groupCode:val.groupCode,
                     groupCode:val.groupCode,
                     itemIds:idArr.join(','),
                     itemIds:idArr.join(','),
-                    type:'HYCK'
+                    type:'BGSE'
                 }).then(res=>{
                 }).then(res=>{
                     this.handleReportPreview(val.url,res.data.data.data)
                     this.handleReportPreview(val.url,res.data.data.data)
                 })
                 })
@@ -1166,7 +1166,7 @@
                     }
                     }
                     this.$nextTick(()=>{
                     this.$nextTick(()=>{
                         this.$refs.reportformsList.onLoad(page,{
                         this.$refs.reportformsList.onLoad(page,{
-                            businessType:'HYCK',
+                            businessType:'BGSE',
                             classifyCode:'费用',
                             classifyCode:'费用',
                             groupCode:groupCode
                             groupCode:groupCode
                         })
                         })
@@ -1177,13 +1177,13 @@
                     getFeeCenterCorpIds({
                     getFeeCenterCorpIds({
                         billId:this.assemblyForm.id,
                         billId:this.assemblyForm.id,
                         dc:dc,
                         dc:dc,
-                        type:'HYCK',
+                        type:'BGSE',
                     }).then(res=>{
                     }).then(res=>{
                         this.printingLoading = false
                         this.printingLoading = false
                         this.PrintingData = res.data.data
                         this.PrintingData = res.data.data
                     })
                     })
                     this.reportsListfun({
                     this.reportsListfun({
-                        businessType:'HYCK',
+                        businessType:'BGSE',
                         classifyCode:'费用',
                         classifyCode:'费用',
                         groupCode:groupCode
                         groupCode:groupCode
                     })
                     })

+ 0 - 1
src/views/iosBasicData/reportClose/SEreportClose/bgdetails.vue

@@ -1343,7 +1343,6 @@
                 console.log("从url加载报表");
                 console.log("从url加载报表");
                 // report.loadFile("/reports/stimulsoft/demos/SimpleList.mrt");
                 // report.loadFile("/reports/stimulsoft/demos/SimpleList.mrt");
                 report.load(url)
                 report.load(url)
-
                 data.pageOne = 'Page : 1 of 1'
                 data.pageOne = 'Page : 1 of 1'
                 // 处理超长数据
                 // 处理超长数据
                 if (data.hshipperDetails) {
                 if (data.hshipperDetails) {