货代bug 2023-12-3

src/views/approveDataH/index.vue

@@ -37,7 +37,12 @@
 <!--        </el-button>-->
         <el-button type="text" size="small" :disabled="scope.row.operate" @click.stop="jumpPage(scope.row)">查看
         </el-button>
-          <el-button type="text" size="small" v-if="scope.row.checkType == 'HYCK-DJ'" :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row)">
+          <el-button type="text" size="small" v-if="scope.row.checkType == 'HYCK-DJ'"
+                     :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row,'HYCK-DJ')">
+              审批
+          </el-button>
+          <el-button type="text" size="small" v-else-if="scope.row.checkType == 'HYCK-FFSQ'"
+                     :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row,'HYCK-FFSQ')">
               审批
           </el-button>
           <el-button type="text" size="small" v-else :disabled="scope.row.auditStatus != 'S'" @click.stop="openCheck(scope.row)">
@@ -52,19 +57,19 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
       </check-schedule>
     </el-dialog>
-
+      <!--单个审批-->
     <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
       <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationTypeFFSQ"
         @choceCheckFun="choceCheckFFSQ">
       </check>
     </el-dialog>
+      <!--报表+审批-->
     <reportContainerlos style="width: 100%; height: 100vh" ref="reportContainer">
         <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationType"
                @choceCheckFun="choceCheckFun">
         </check>
     </reportContainerlos>
-
       <!--<el-dialog-->
       <!--    title="打印"-->
       <!--    :visible.sync="selectPrintingDialog"-->
@@ -192,15 +197,27 @@ export default {
   },
   methods: {
       // 点击审核弹出打印表格
-      printWindowfun(row){
+      printWindowfun(row,type){
           // 当时选择的数据
           this.reportsData = row
           this.checkData = row
-          getreportsList(1, 10, {
-              businessType:'HYCK',
-              classifyCode:'业务',
-              groupCode:'销售报告'
-          }).then(res=>{
+          let obj = {}
+          if (type == 'HYCK-DJ') {
+              obj = {
+                  businessType:'HYCK',
+                  classifyCode:'业务',
+                  groupCode:'销售报告'
+              }
+          }else if (type == 'HYCK-FFSQ') {
+              obj = {
+                  businessType:'FFSQ',
+                  classifyCode:'付费申请',
+                  groupCode:'付费申请'
+              }
+          }else {
+
+          }
+          getreportsList(1, 10, obj).then(res=>{
               this.reportRadio(res.data.data.records[0])
           })
           // this.selectPrintingDialog = true
@@ -217,9 +234,8 @@ export default {
           //     })
           // })
       },
-
+      // 获取报表数据
       reportRadio(val){
-          console.log(val,222)
           reportsGetReportData({
               billId:this.reportsData.billId,
               reportCode:val.classifyCode,
@@ -241,7 +257,6 @@ export default {
     // 预览报表
      handleReportPreview(url,data){
         this.reportlist = data // 存一下数据 打印的时候需要传
-        console.log(data,220)
 
       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='

src/views/exportTrade/purchaseContract/index.vue

@@ -8,7 +8,7 @@
             <avue-crud v-show="tabsType == 'first'" :option="procureOption" :data="procureData" @refresh-change="listBYStatusfun"  >
                 <template slot-scope="scope" slot="menu">
                     <el-button type="text" size="small"
-                               @click.stop="procureViewfun(scope.row)">查看
+                               @click.stop="procureViewfun(scope.row)">采购
                     </el-button>
                 </template>
             </avue-crud>

src/views/exportTrade/salesContract/config/mainList.json

@@ -355,7 +355,7 @@
       "overHidden": true
     },
     {
-      "label": "销售备注",
+      "label": "船务备注",
       "prop": "shippingRemark",
       "minWidth": 80,
       "overHidden": true,

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -202,11 +202,11 @@
                         <el-row>
                             <el-col span="24">
                                 <div style="text-align: right">
-                                    <el-button  size="small" type="" style="margin-right: 8px" :disabled="settlementdistar"
+                                    <el-button  size="small" type="" style="margin-right: 8px" :disabled="settlementdistar || editSave"
                                                 :loading="saveLoading" @click="ResetFilter">重置条件
                                     </el-button>
-                                    <el-checkbox v-model="appendType" :disabled="settlementdistar" false-label="检索" true-label="追加">追加</el-checkbox>
-                                    <el-button  size="small" type="primary"  style="margin-right: 8px" :disabled="settlementdistar"
+                                    <el-checkbox v-model="appendType" :disabled="settlementdistar || editSave" false-label="检索" true-label="追加">追加</el-checkbox>
+                                    <el-button  size="small" type="primary"  style="margin-right: 8px" :disabled="settlementdistar || editSave"
                                                 :loading="saveLoading" @click="finstlbillslistAccBillV1fun(appendType)" >检 索
                                     </el-button>
                                 </div>
@@ -280,7 +280,7 @@
         <!--设计报表弹窗-->
         <el-dialog append-to-body title="设计报表" class="el-dialogDeep" :visible.sync="DesignreportDialog" width="70%"
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <reports :id="form.id" :disabled="editSave" businessValue="FFSQ"></reports>
+            <reports :id="form.id" businessValue="FFSQ"></reports>
         </el-dialog>
 
         <!--预览-->
@@ -321,7 +321,7 @@ import expand from "@/components/basic-container/expand.vue";
 import finstlbillsitems from "@/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue";
 import reports from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
-import {reportsGetReportData} from "@/api/iosBasicData/reports";
+import {getList as getreportsList, reportsGetReportData} from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import { generateFinStlBills} from "@/api/iosBasicData/fininvoices";
 
@@ -397,7 +397,6 @@ export default {
     methods:{
         // 打印
         reportRadio(val){
-            console.log(val,505)
             // 获取报表数据
             reportsGetReportData({
                 billId:this.form.id,
@@ -409,20 +408,30 @@ export default {
         },
         // 报表预览
         previewreportfun(){
-            this.saveLoading = true
-            this.selectPrintingDialog = true
-            this.saveLoading = false
-            let page = {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
-            }
-            this.$nextTick(()=>{
-                this.$refs.reportformsList.onLoad(page,{
-                    businessType:'FFSQ',
-                    classifyCode:'付费申请',
-                    groupCode:'付费申请'
-                })
+            getreportsList(1,10,{
+                businessType:'FFSQ',
+                classifyCode:'付费申请',
+                groupCode:'付费申请'
+            }).then(res=>{
+                if (res.data.data.records.length == 1){
+                    this.reportRadio(res.data.data.records[0])
+                }else {
+                    this.saveLoading = true
+                    this.selectPrintingDialog = true
+                    this.saveLoading = false
+                    let page = {
+                        pageSize: 10,
+                        currentPage: 1,
+                        total: 0
+                    }
+                    this.$nextTick(()=>{
+                        this.$refs.reportformsList.onLoad(page,{
+                            businessType:'FFSQ',
+                            classifyCode:'付费申请',
+                            groupCode:'付费申请'
+                        })
+                    })
+                }
             })
         },
         // 批量删除
@@ -564,7 +573,7 @@ export default {
             this.pageLoading = true
             finstlbillsDetail(id).then(res=>{
                 this.form = res.data.data
-                this.form.businessTypes = this.form.businessTypes.split(',') // 业务类型转换成数组显示
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.split(','):'' // 业务类型转换成数组显示
                 this.tableData = this.form.finStlBillsItemsList.map(item=>{
                     item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
                     item.currentStlAmountNet = Number(item.unsettledAmount) - (Number(item.unsettledAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
@@ -731,7 +740,7 @@ export default {
         },
         // 结算确认
         finstlbillsConfirmSettlementfun(){
-            this.$confirm("确定进行对账操作?", {
+            this.$confirm("确定进行结算操作?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"

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

@@ -175,7 +175,7 @@
                 label="操作"
                 width="100" v-if="brfalse">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="deletefun(scope.row,scope.index)">删除</el-button>
+                    <el-button type="text" size="small" :disabled="editSave" @click="deletefun(scope.row,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
 

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -19,10 +19,10 @@
                 <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == '1'"
                             :loading="saveLoading" @click="revokeSettlementApprovefun">撤销申请
                 </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="form.isCleared == 1" v-if="editSave"
+                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="!(form.status == '0' || form.status == '4')" v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="form.isCleared == 1" v-else
+                <el-button  size="small" type="primary" style="margin-right: 8px" :disabled="!(form.status == '0' || form.status == '4')" v-else
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
             </div>
@@ -221,17 +221,34 @@
                                                   clearable placeholder="请选择航次" ></el-input>
                                     </el-form-item>
                                 </el-col>
+                                <el-col :span="5">
+                                    <el-form-item label="单据编号" prop="billNo" >
+                                        <el-input style="width: 100%;" v-model="form.billNo"
+                                                  size="small" autocomplete="off"
+                                                  :disabled="true"
+                                                  clearable placeholder="请选择单据编号" ></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="4">
+                                    <el-form-item label="修改人" prop="updateUserName" >
+                                        <el-input style="width: 100%;" v-model="form.updateUserName"
+                                                  size="small" autocomplete="off"
+                                                  :disabled="true"
+                                                  clearable placeholder="请选择修改人" ></el-input>
+                                    </el-form-item>
+                                </el-col>
                             </el-row>
                         </expand>
 
                         <el-row>
                             <el-col span="24">
                                 <div style="text-align: right">
-                                    <el-button  size="small" type="" style="margin-right: 8px"
+                                    <el-button  size="small" type="" style="margin-right: 8px" :disabled="editSave"
                                                 :loading="saveLoading" @click="ResetFilter">重置条件
                                     </el-button>
-                                    <el-checkbox v-model="appendType" false-label="检索" true-label="追加">追加</el-checkbox>
-                                    <el-button  size="small" type="primary"  style="margin-right: 8px"
+                                    <el-checkbox v-model="appendType" :disabled="editSave"
+                                                 false-label="检索" true-label="追加">追加</el-checkbox>
+                                    <el-button  size="small" type="primary"  style="margin-right: 8px" :disabled="editSave"
                                                 :loading="saveLoading" @click="finstlbillslistAccBillV1fun(appendType)" >检 索
                                     </el-button>
                                 </div>
@@ -304,7 +321,7 @@
         <!--设计报表弹窗-->
         <el-dialog append-to-body title="设计报表" class="el-dialogDeep" :visible.sync="DesignreportDialog" width="70%"
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <reports :id="form.id" :disabled="editSave" businessValue="FFSQ"></reports>
+            <reports :id="form.id" businessValue="FFSQ"></reports>
         </el-dialog>
 
         <!--预览-->
@@ -458,23 +475,26 @@
                     classifyCode:'付费申请',
                     groupCode:'付费申请'
                 }).then(res=>{
-                    this.reportRadio(res.data.data.records[0])
+                    if (res.data.data.records.length == 1) {
+                        this.reportRadio(res.data.data.records[0])
+                    }else {
+                        this.saveLoading = true
+                        this.selectPrintingDialog = true
+                        this.saveLoading = false
+                        let page = {
+                            pageSize: 10,
+                            currentPage: 1,
+                            total: 0
+                        }
+                        this.$nextTick(()=>{
+                            this.$refs.reportformsList.onLoad(page,{
+                                businessType:'FFSQ',
+                                classifyCode:'付费申请',
+                                groupCode:'付费申请'
+                            })
+                        })
+                    }
                 })
-                // this.saveLoading = true
-                // // this.selectPrintingDialog = true
-                // this.saveLoading = false
-                // let page = {
-                //     pageSize: 10,
-                //     currentPage: 1,
-                //     total: 0
-                // }
-                // this.$nextTick(()=>{
-                //     this.$refs.reportformsList.onLoad(page,{
-                //         businessType:'FFSQ',
-                //         classifyCode:'付费申请',
-                //         groupCode:'付费申请'
-                //     })
-                // })
             },
             // 批量删除
             batchDeletefun(){

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -560,6 +560,7 @@ export default {
                     invType:'全电发票',
                     taxRate:0,
                     invoiceDate:getCurrentDate(),
+                    isExchangeToCny:0
                 },
                 tableData:[], // 费用明细数据
                 InvoicingList:[], // 开票明细数据
@@ -966,7 +967,7 @@ export default {
                 }
                 obj.type = '3'
                 obj.corpCnName = this.form.corpId // 结算单位
-                obj.billNo = this.form.bookingNo // 账单号
+                obj.billNo = this.form.businessNo // 业务编号
                 obj.businessBillNo = this.form.billNo // 业务编号
                 obj.mblno = this.form.mblno // 主单编号
                 obj.hblno = this.form.hblno // 分单编号
@@ -978,7 +979,8 @@ export default {
                     let arr = res.data.data.map((item,index)=>{
                         item.lineNo = Number(index) + 1 // 行号
                         item.accBillId = item.id
-                        item.accBillNo = item.billNo
+                        item.accBillNo = item.billNo // JOB NO
+                        item.billNo = item.businessBillNo // 账单编号
                         item.accDate = item.createTime
                         item.currentCurCode = item.curCode
                         item.currentExrate = item.exrate

src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -81,6 +81,16 @@
           :table-loading="loading"
           :cell-style="cellStyle"
         >
+            <template 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>
+            </template>
         </avue-crud>
       </basic-container>
     </div>
@@ -108,6 +118,7 @@ export default {
       option: {
         menuBtn: false,
         labelWidth: 100,
+        disabled:false,
         column: [
         {
               label: "货币代码",
@@ -327,11 +338,19 @@ export default {
       this.getDetail(this.detailData.id);
     }
     if (this.detailData.status == 1) {
-      this.option.disabled = true;
+         this.$set(this.option,'disabled',true)
     }
     this.optionList.height = 450;
   },
   methods: {
+    // 编辑明细
+    editFun(row){
+        console.log(row,'编辑')
+    },
+    // 删除
+    rowDel(row){
+        console.log(row,'删除')
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -339,7 +358,8 @@ export default {
         this.allloading = true
       dataDetail(id)
         .then(res => {
-          this.form = res.data.data;
+          this.form = res.data.data
+          this.form.annual = this.form.annual + ''
           this.dataList = res.data.data.curExrateList
             ? res.data.data.curExrateList
             : [];
@@ -401,8 +421,9 @@ export default {
         if (res.data.code == 200) {
           this.onLock(data).then(re => {
             if (re.data.code == 200) {
-              this.detailData.status = 2;
-              this.option = this.$options.data().option;
+                this.$set(this.detailData,'status',2)
+                this.$set(this.option,'disabled',false)
+              // this.option = this.$options.data().option;
             }
           });
         }
@@ -516,13 +537,12 @@ export default {
         },
   },
   watch: {
-
     "form.paritiesType":{
         // 执行方法
         handler(row,newValue) {
-            console.log(row,522)
             if (row == "日汇率") {
                 this.findObject(this.option.column, "moon").display = true;
+                // this.findObject(this.option.column, "annual").disabled = true;
             } else if (row == "月汇率") {
                 this.findObject(this.option.column, "moon").display = false;
             } else {
@@ -530,7 +550,7 @@ export default {
             }
         },
         deep: true, // 深度监听
-        immediate: true  // 第一次改变就执行
+        immediate: false  // 第一次改变就执行
     },
 
   }

src/views/iosBasicData/rateManagement/index.vue

@@ -49,7 +49,7 @@
         </template>
       </avue-crud>
     </basic-container>
-    <detailPage v-if="!isShow" ref="detail" @goBack="goBack" @copyOrder="copyOrder" :detailData="detailData"></detailPage>
+    <detailPage v-if="!isShow" ref="detail" @goBack="goBack" :detailData="detailData"></detailPage>
   </div>
 </template>
 
@@ -92,7 +92,7 @@ export default {
         searchIndex: 3,
         calcHeight: 30,
         addBtnText: "新建币别及汇率",
-        addBtn:true,
+        addBtn:false,
         stripe: true,
         menuWidth:140,
         column: [

src/views/iosBasicData/rateManagement/js/optionList.js

@@ -33,7 +33,8 @@ export const optionList = {
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  menu: false,
+  menu: true,
+  menuWidth:120,
   stripe: true,
   dialogFullscreen: true,
   column: [{
@@ -64,13 +65,15 @@ export const optionList = {
     width: 150,
     overHidden: true,
     showColumn: false,
-  }, {
-    label: "日",
-    prop: "exrateDay",
-    width: 150,
-    overHidden: true,
-    showColumn: false,
-  }, {
+  },
+  //   {
+  //   label: "日",
+  //   prop: "exrateDay",
+  //   width: 150,
+  //   overHidden: true,
+  //   showColumn: false,
+  // },
+    {
     label: "应收汇率",
     prop: "exrateReceivable",
     width: 150,