货代bug 2023-12-4

src/api/iosBasicData/rateManagement.js

@@ -40,3 +40,13 @@ export function delItem(data) {
     data: data
   })
 }
+// 币别明细删除
+export function bcurexrateDetails(data) {
+  return request({
+    url: '/api/blade-los/bcurexrate/remove',
+    method: 'post',
+    params: {
+      ids: data
+    }
+  })
+}

src/views/iosBasicData/CollectionSettlement/finstlbillsDetails.vue

@@ -585,7 +585,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)))
@@ -624,7 +624,7 @@ export default {
                 dc:dc
             }).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)))
@@ -751,7 +751,7 @@ export default {
                 type: "warning"
             }).then(()=>{
                 this.pageLoading = true
-                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):[] // 业务类型
                 settlementApprove(this.form).then(res=>{
                     this.pageLoading = false
                     this.$message.success('操作成功');
@@ -769,7 +769,7 @@ export default {
                 type: "warning"
             }).then(()=>{
                 this.pageLoading = true
-                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):[] // 业务类型
                 revokeSettlementApprove(this.form).then(res=>{
                     this.pageLoading = false
                     this.$message.success('操作成功');

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -573,7 +573,7 @@ export default {
             this.pageLoading = true
             finstlbillsDetail(id).then(res=>{
                 this.form = res.data.data
-                this.form.businessTypes = 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)))
@@ -616,7 +616,7 @@ export default {
                 dc:dc
             }).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)))
@@ -746,7 +746,7 @@ export default {
                 type: "warning"
             }).then(()=>{
                 this.pageLoading = true
-                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                 finstlbillsConfirmSettlement(this.form).then(res=>{
                     this.pageLoading = false
                     this.$message.success('操作成功');
@@ -764,7 +764,7 @@ export default {
                 type: "warning"
             }).then(()=>{
                 this.pageLoading = true
-                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                 finstlbillsRevokeSettlement(this.form).then(res=>{
                     this.pageLoading = false
                     this.$message.success('操作成功');

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

@@ -111,7 +111,7 @@
                 label="发票USD">
             </el-table-column>
             <el-table-column
-                prop="ETD"
+                prop="etd"
                 label="ETD">
             </el-table-column>
             <el-table-column

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -19,6 +19,7 @@
                 <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>
+                <span v-if="form.status == '3'" style="font-size: 12px;padding-right: 10px;" >申请通过</span>
                 <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>
@@ -207,10 +208,19 @@
                                 </el-col>
                                 <el-col :span="5">
                                     <el-form-item label="船 名" prop="vesselCnName" >
-                                        <el-input style="width: 100%;" v-model="form.vesselCnName"
-                                                  size="small" autocomplete="off"
-                                                  :disabled="editSave"
-                                                  clearable placeholder="请选择船名" ></el-input>
+                                        <search-query :datalist="vesselData"
+                                                      :selectValue="form.vesselCnName"
+                                                      :filterable="true"
+                                                      :clearable="true"
+                                                      :remote="true"
+                                                      :disabled="editSave"
+                                                      :buttonIf="false"
+                                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                      placeholder="请选择船名"
+                                                      @remoteMethod="vesselBvesselsListfun"
+                                                      @corpChange="corpChange($event,'vessel')"
+                                                      @corpFocus="vesselBvesselsListfun" >
+                                        </search-query>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
@@ -219,6 +229,7 @@
                                                   size="small" autocomplete="off"
                                                   :disabled="editSave"
                                                   clearable placeholder="请选择航次" ></el-input>
+
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
@@ -366,6 +377,7 @@
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
     import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
     import {getList as getreportsList} from "@/api/iosBasicData/reports";
+    import {getBvesselsList} from "@/api/iosBasicData/bvessels";
 
     export default {
         components: {reportContainer, reportformsList, reports, SearchQuery,expand,finstlbillsitems},
@@ -414,6 +426,7 @@
                         value:'SI'
                     }
                 ],
+                vesselData:[], // 船名数据
                 rules: {
                     corpCnName: [
                         {required: true, message: '请输入付费对象', trigger: 'blur'},
@@ -576,6 +589,15 @@
                         }
                     }
                 }
+                else if (name == 'vessel') {
+                    for(let item of this.vesselData) {
+                        if (item.cnName == value) {
+                            this.$set(this.form,'vesselId',item.id)
+                            this.$set(this.form,'vesselCnName',item.cnName)
+                            this.$set(this.form,'vesselEnName',item.enName)
+                        }
+                    }
+                }
                 else {
                     this.$set(this.form,name,value)
                 }
@@ -706,6 +728,9 @@
                         // 账单编号
                         item.accBillNo = item.billNo
                         item.currentStlCurCode = item.curCode // 币别
+                        item.currentStlExrate = item.exrate // 汇率
+                        // quantity
+                        // quantityCntrTypesDescr
                         item.lineNo = Number(index) + 1
                         item.pType = item.businessType
                         item.billNo = item.businessBillDivideNo?item.businessBillDivideNo:item.businessBillNo
@@ -763,7 +788,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
-                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                    this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                     settlementApprove(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
@@ -781,7 +806,7 @@
                     type: "warning"
                 }).then(()=>{
                     this.pageLoading = true
-                    this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
+                    this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                     revokeSettlementApprove(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
@@ -832,6 +857,12 @@
                     }
                 })
             },
+            // 船名
+            vesselBvesselsListfun(cnName){
+                getBvesselsList(1,10,{cnName}).then(res=>{
+                    this.vesselData = res.data.data.records
+                })
+            },
             // 预览报表
             handleReportPreview(url,data){
                 console.log(url,1670)

src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -64,8 +64,7 @@
               type="primary"
               @click="createExRate"
               :disabled="detailData.status == 1"
-              >产生汇率项目</el-button
-            >
+              >产生汇率项目</el-button>
           </template>
         </avue-form>
       </basic-container>
@@ -350,6 +349,7 @@ export default {
     // 删除
     rowDel(row){
         console.log(row,'删除')
+
     },
     cellStyle() {
       return "padding:0;height:40px;";

src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -64,6 +64,10 @@
                     <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="addRows">录入明细
                     </el-button>
                 </template> -->
+          <template slot="menuLeft">
+              <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="addRow">录入明细
+              </el-button>
+          </template>
           <template slot-scope="{type,size,row,index,disabled}" slot="menu">
             <el-button :size="size" :disabled="disabled" :type="type"
               :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="$refs.crud.rowEdit(row, index)">{{
@@ -714,7 +718,11 @@ export default {
     ,
     addRow() {
       console.log('1234');
-      this.data.push({ $cellEdit: true })
+      this.data.push({
+          $cellEdit: true,
+          contacts:this.data[this.data.length - 1].contacts,
+          tel:this.data[this.data.length - 1].tel,
+      })
     }
     ,
     rowCell(row, index) {
@@ -910,6 +918,7 @@ export default {
     ,
     //新增客户联系人保存触发
     rowSave(row, done, loading) {
+        console.log(row,913)
       done(row);
     }
     ,

src/views/tirePartsMall/basicData/customerInformation/js/optionList.js

@@ -220,15 +220,19 @@ export const option2 = {
   addBtnText: "录入明细",
   refreshBtn: false,
   dialogDrag: true,
-  addBtn: true,
+  addBtn: false,
   span: 8,
   height: 600,
-  addRowBtn: false,
   editBtn: false,
   delBtn: false,
   menuWidth: 140,
   dialogTop: 25,
   dialogWidth: "80%",
+  addRowBtn:false,
+  cellBtn:true,
+  rowKey: "index",
+  cancelBtn:false,
+  // saveBtn:false,
   column: [{
     label: '联系人',
     prop: 'contacts',