修改禅道1886bug

src/util/messageReminder.js

@@ -31,7 +31,7 @@ export const popupReminder = (form,data)=>{
   let sum = '请输入'
   for(let item of data) {
     if (!form[item.value]) {
-      sum +=item.name.toUpperCase()+','
+      sum +=item.name.toUpperCase()+' ，'
     }
   }
   if(sum.length>0){

src/views/iosBasicData/AirtransportExport/bills/assembly/businessReports.vue

@@ -875,6 +875,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.businessType='KYJK'
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

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

@@ -1030,6 +1030,11 @@
                             overHidden:true,
                         },
                         {
+                            label: '客户类型',
+                            prop:'corpType',
+                            overHidden:true,
+                        },
+                        {
                             label: '费用',
                             prop:'feeCnName',
                             overHidden:true,
@@ -1297,6 +1302,7 @@
                         });
                         this.feesselectionList = [] // 清空多选
                         this.templateRightData = [] // 清空数据
+                        this.lefttemplate={}
                         this.$emit('billsDetailfun')
                         this.templateVisible = false
                     })

src/views/iosBasicData/AirtransportImport/bills/assembly/businessReports.vue

@@ -875,6 +875,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.businessType='KYJK'
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

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

@@ -1025,6 +1025,11 @@
                             overHidden:true,
                         },
                         {
+                            label: '客户类型',
+                            prop:'corpType',
+                            overHidden:true,
+                        },
+                        {
                             label: '费用',
                             prop:'feeCnName',
                             overHidden:true,
@@ -1292,6 +1297,7 @@
                         });
                         this.feesselectionList = [] // 清空多选
                         this.templateRightData = [] // 清空数据
+                        this.lefttemplate={}
                         this.$emit('billsDetailfun')
                         this.templateVisible = false
                     })

src/views/iosBasicData/OceanFreightImport/bills/assembly/businessReports.vue

@@ -875,6 +875,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.businessType='HYJK'
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

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

@@ -1040,6 +1040,11 @@
                             overHidden:true,
                         },
                         {
+                            label: '客户类型',
+                            prop:'corpType',
+                            overHidden:true,
+                        },
+                        {
                             label: '费用',
                             prop:'feeCnName',
                             overHidden:true,
@@ -1331,6 +1336,7 @@
                         });
                         this.feesselectionList = [] // 清空多选
                         this.templateRightData = [] // 清空数据
+                        this.lefttemplate={}
                         this.$emit('billsDetailfun')
                         this.templateVisible = false
                     })

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

@@ -332,7 +332,7 @@
                                     <span style="color: #1e9fff">HS CODE</span>
                                 </span>
                                     <el-col :span="12">
-                                        <search-query :datalist="commodityData"
+                                        <!-- <search-query :datalist="commodityData"
                                                       :selectValue="assemblyForm.hscode"
                                                       :filterable="true"
                                                       :clearable="true"
@@ -345,7 +345,13 @@
                                                       @remoteMethod="remoteMethod($event,'commodity')"
                                                       @corpChange="corpChange($event,'commodity')"
                                                       @corpFocus="remoteMethod($event,'commodity')">
-                                        </search-query>
+                                        </search-query> -->
+                                        <el-select v-model="assemblyForm.hscode" placeholder="请选择HS CODE" size="small" @change="hsCodeChang"
+                                            allow-create filterable :loading="hsLoading" remote :remote-method="searchHsQuery">
+                                            <el-option v-for="(item, index) in commodityData" :key="index"
+                                                :label="item.hsCode" :value="item.hsCode">
+                                            </el-option>
+                                        </el-select>
                                     </el-col>
                                     <el-col :span="11">
                                         <span style="padding-left: 20px"></span>
@@ -968,6 +974,7 @@ import {getWorkDicts} from "@/api/system/dictbiz";
         components:{bcorps, SearchQuery, precontainers,bcorpstypedefine},
         data(){
             return {
+                hsLoading:false,
                 // 设置当前时间选择的范围
                 etdPickerOptions:{
                     disabledDate(time) {
@@ -1067,6 +1074,7 @@ import {getWorkDicts} from "@/api/system/dictbiz";
             // this.lineBlinesListfun()
             // 危险品包装等级
             this.dgPackingLevelWorkDicts()
+            this.getHsCode()
         },
         methods:{
             // 易燃易爆品闪点类型为数字
@@ -1119,9 +1127,9 @@ import {getWorkDicts} from "@/api/system/dictbiz";
                     this.cyBcorpsattnListfun()
                 }
                 // 货物
-                else if (name == 'commodity') {
-                    this.commodityBcommodityListfun(value)
-                }
+                // else if (name == 'commodity') {
+                //     this.commodityBcommodityListfun(value)
+                // }
                 // 包装
                 else if (name == 'packingUnit') {
                     this.packingUnitBpackagesListfun(value)
@@ -1220,22 +1228,22 @@ import {getWorkDicts} from "@/api/system/dictbiz";
                         }
                     }
                 }
-                else if (name == 'commodity') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'hscode','')
-                        this.$set(this.assemblyForm,'commodityShName','')
-                        this.$set(this.assemblyForm,'commodityCnName','')
-                        this.$set(this.assemblyForm,'commodityEnName','')
-                    }
-                    for(let item of this[name + 'Data']) {
-                        if (item.hsCode == value) {
-                            this.$set(this.assemblyForm,'hscode',item.hsCode)
-                            this.$set(this.assemblyForm,'commodityShName',item.cnName)
-                            this.$set(this.assemblyForm,'commodityCnName',item.cnName)
-                            this.$set(this.assemblyForm,'commodityEnName',item.enName)
-                        }
-                    }
-                }
+                // else if (name == 'commodity') {
+                //     if (!value) {
+                //         this.$set(this.assemblyForm,'hscode','')
+                //         this.$set(this.assemblyForm,'commodityShName','')
+                //         this.$set(this.assemblyForm,'commodityCnName','')
+                //         this.$set(this.assemblyForm,'commodityEnName','')
+                //     }
+                //     for(let item of this[name + 'Data']) {
+                //         if (item.hsCode == value) {
+                //             this.$set(this.assemblyForm,'hscode',item.hsCode)
+                //             this.$set(this.assemblyForm,'commodityShName',item.cnName)
+                //             this.$set(this.assemblyForm,'commodityCnName',item.cnName)
+                //             this.$set(this.assemblyForm,'commodityEnName',item.enName)
+                //         }
+                //     }
+                // }
                 // 船名
                 else if (name == 'vessel') {
                     if (!value) {
@@ -1671,6 +1679,7 @@ import {getWorkDicts} from "@/api/system/dictbiz";
             },
             // 包装数据
             packingUnitBpackagesListfun(cnName) {
+                console.log(cnName)
                 bpackagesList(1,10,{cnName,status: 0}).then(res=>{
                     this.packingUnitData = res.data.data.records
                 })
@@ -1681,6 +1690,36 @@ import {getWorkDicts} from "@/api/system/dictbiz";
                     this.commodityData = res.data.data.records
                 })
             },
+            getHsCode(){
+                bcommodityList(1,10,{status: 0}).then(res=>{
+                    this.commodityData = res.data.data.records
+                })
+            },
+            searchHsQuery(query){
+                this.hsLoading=true;
+                    setTimeout(()=>{
+                     
+                    bcommodityList(1,10,{hsCode:query,status: 0}).then(res=>{
+                            console.log('模糊查询')
+                         this.commodityData = res.data.data.records
+                    })
+                         this.hsLoading=false;
+                    },200)
+            },
+            hsCodeChang(query){
+                let obj=this.commodityData.find(e=>e.hsCode==query)
+                if(obj){
+                    console.log(11111)
+                    if(obj.hsCode==query){
+                        this.$set(this.assemblyForm,'commodityCnName',obj.enName)
+                    this.$set(this.assemblyForm,'commodityEnName',obj.cnName)
+                }
+                }else{
+                    console.log(2222)
+                    this.$set(this.assemblyForm,'commodityCnName','')
+                    this.$set(this.assemblyForm,'commodityEnName','')
+                }
+            },
             // 获取船公司数据
             carrierBcorpslistByTypefun(cnName){
                 let corpTypeName = '船公司'

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

@@ -891,6 +891,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.businessType='HYCK'
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

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

@@ -1051,6 +1051,11 @@
                             overHidden:true,
                         },
                         {
+                            label: '客户类型',
+                            prop:'corpType',
+                            overHidden:true,
+                        },
+                        {
                             label: '费用',
                             prop:'feeCnName',
                             overHidden:true,
@@ -1326,11 +1331,13 @@
             },
             // 模板导入
             templateExport(){
+            
                 if (!this.lefttemplate.id) {
-                    this.$message.warning('请选择左侧数据')
+                    this.$message.warning('请选择左侧客户')
                     return
                 }
                 if (this.feesselectionList.length > 0) {
+                    console.log(this.lefttemplate)
                     feecenterTemplateImport({
                         ...this.lefttemplate,
                         feesTemplateItemsList:this.feesselectionList,
@@ -1342,6 +1349,7 @@
                         });
                         this.feesselectionList = [] // 清空多选
                         this.templateRightData = [] // 清空数据
+                        this.lefttemplate={}//左侧数据
                         this.$emit('billsDetailfun')
                         this.templateVisible = false
                     })

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -286,7 +286,7 @@ import bfeesdefine from "@/views/iosBasicData/bfeesdefine/index.vue";
 import bbusinesstype from "@/views/iosBasicData/bbusinesstype/index.vue";
 import bunits from "@/views/iosBasicData/bunits/index.vue";
 import {getWorkDicts} from "@/api/system/dictbiz";
-
+import {bcntrtypesList} from "@/api/iosBasicData/bcntrtypes";
 
 export default {
     components: {SearchQuery,bcorps,bfeesdefine,bbusinesstype,bunits},
@@ -582,10 +582,17 @@ export default {
             })
         },
         // 获取计算属性
-        getBunitsListfun(){
-            getBunitsList(1,10,{status:0}).then(res=>{
+        getBunitsListfun(code){
+            if(this.feestemplateForm.quantityRule==1||this.feestemplateForm.quantityRule==4){
+                bcntrtypesList(1,10,{code,status:0}).then(res=>{
                 this.unitNoData = res.data.data.records
             })
+            }else{
+                getBunitsList(1,10,{code,status:0}).then(res=>{
+                this.unitNoData = res.data.data.records
+                })
+            }
+           
         },
         // 客户选择之后的回调
         corpCorpChange(value){
@@ -630,7 +637,18 @@ export default {
         },
         // 数量规则下拉回调
         quantityRuleChange(value){
+            console.log(value)
+            if(value==1||value==4){
+                bcntrtypesList(1,10,{status:0}).then(res=>{
+                this.unitNoData = res.data.data.records
+            })
+            }else{
+                getBunitsList(1,10,{status:0}).then(res=>{
+                this.unitNoData = res.data.data.records
+                })
+            }
             this.$set(this.feestemplateForm,'quantityRule',value)
+            this.$set(this.feestemplateForm,'unitNo','')
         },
         // 币别选择之后的回调
         curCodeCorpChange(value) {

src/views/iosBasicData/psBcorps/detailsPage.vue

@@ -23,7 +23,7 @@
                 :disabled="item.disabled"></el-option>
             </el-select> -->
               <avue-input-tree :check-strictly="true" @change="corpTypeChange" multiple v-model="formData.corpTypeList"
-                placeholder="请选择客户分类" :props="{ label: 'cnName', value: 'id', disabled: 'status' }" :dic="customTypeData"
+                placeholder="请选择客户分类" :props="{ label: 'cnName', value: 'id', disabled: 'status' }" :dic="customTypeData" disabled
                 :style="{ width: '100%' }"></avue-input-tree>
             </el-form-item>
           </el-col>
@@ -1294,6 +1294,15 @@ export default {
     // 获取客户类别
     bcorpstypedefineList(1, 9999,{cnName:'PS客户'}).then(res => {
       this.customTypeData = res.data.data.records
+      if(!this.detailData.id){
+        this.customTypeData.forEach(e=>{
+          if(e.cnName=='PS客户'){
+            this.formData.corpTypeList=[e.id]
+            // this.$set(this.formData,'corpType',e.id)
+          }
+        })
+      }
+      
     })
     // 查询用户信息
     userList(1, 9999999).then((res) => {

src/views/iosBasicData/psBcorps/index.vue

@@ -716,11 +716,14 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      this.query.corpType='1782331795240189953';
+      // this.query.corpType='1782331795240189953';
+      this.query.type='1'
       BcorpsList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
+        console.log(res.data.data)
         this.page.total = data.total;
         this.data = data.records;
+        console.log(data)
         this.loading = false;
         this.selectionClear();
       });

src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -29,21 +29,17 @@
             </el-switch>
           </template>
           <template slot="button">
-            <el-button size="small" type="primary" @click="createExRate"
+            <el-button v-if="form.code != 'CNY'" size="small" type="primary" @click="createExRate"
               :disabled="detailData.status == 1 || dataList.length != 0">产生汇率项目</el-button>
+            <div v-else></div>
           </template>
         </avue-form>
       </basic-container>
-      <containerTitle title="基础明细"></containerTitle>
-      <basic-container>
-        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-          <el-tab-pane label="年" name="年汇率"></el-tab-pane>
-          <el-tab-pane label="月" name="月汇率"></el-tab-pane>
-          <el-tab-pane label="日" name="日汇率"></el-tab-pane>
-        </el-tabs>
-        <avue-crud ref="crud" v-model="crudForm" :option="optionList" id="out-table"
+      <containerTitle v-if="form.code != 'CNY'" title="基础明细"></containerTitle>
+      <basic-container v-if="form.code != 'CNY'">
+        <avue-crud ref="crud" v-model="crudForm" :option="optionList" id="out-table" :search.sync="search"
           :header-cell-class-name="headerClassName" :data="dataList" :table-loading="loading" :cell-style="cellStyle"
-          @row-save="rowSave" @row-update="rowUpdate" @selection-change="selectionChange">
+          @row-save="rowSave" @row-update="rowUpdate" @search-change="searchChange" @search-reset="resetChange">
           <!--<template slot="menuLeft">-->
           <!--    <el-button-->
           <!--        type="danger" plain-->
@@ -72,6 +68,9 @@ export default {
   data() {
     return {
       time: "",
+      search: {
+        annual:'2024'
+      },
       crudForm: {},
       loading: false,
       allloading: false,
@@ -288,7 +287,6 @@ export default {
       },
       optionList: optionList,
       selectionList: [],
-      activeName: '月汇率'
     };
   },
   props: {
@@ -310,8 +308,34 @@ export default {
     this.optionList.height = 450;
   },
   methods: {
-    handleClick(row) {
-      this.form.paritiesType = this.activeName
+    searchChange(params, done) {
+      // console.log(params)
+      if (params.paritiesType == "日汇率") {
+        this.findObject(this.option.column, "moon").display = true;
+        // this.findObject(this.option.column, "annual").display = false;
+      } else if (params.paritiesType == "月汇率") {
+        this.findObject(this.option.column, "moon").display = false;
+        // this.findObject(this.option.column, "annual").display = false;
+      } else {
+        this.findObject(this.option.column, "moon").display = false;
+        // this.findObject(this.option.column, "annual").display = true;
+      }
+      let obj = {
+        current: 1,
+        size: 35,
+        type: params.paritiesType,
+        code: this.form.code,
+        exrateYear: params.annual,
+        exrateMonth: params.moon
+      }
+      bcurexrateList(obj).then(res => {
+        this.dataList = res.data.data.records;
+        done();
+      })
+
+    },
+    resetChange() {
+
     },
     // 编辑明细
     editFun(row) {
@@ -360,9 +384,6 @@ export default {
         })
       })
     },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -592,77 +613,65 @@ export default {
   },
   watch: {
     "form.paritiesType": {
-      // 执行方法
-      handler(row, newValue) {
-        console.log(row)
-        this.activeName=row
-        let obj = {
-          current: 1,
-          size: 20,
-          type: row,
-          code: this.form.code,
-          exrateYear: this.form.annual,
-          
-        }
-        if(row=='日汇率'){
-          obj.exrateMonth=this.form.moon
-        }
-        if (row == "日汇率") {
-          this.findObject(this.option.column, "moon").display = true;
-          // this.findObject(this.option.column, "annual").display = false;
-        } else if (row == "月汇率") {
-          this.findObject(this.option.column, "moon").display = false;
-          // this.findObject(this.option.column, "annual").display = false;
-        } else {
-          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: false, // 深度监听
-      immediate: false  // 第一次改变就执行
-    },
-    "form.annual": {
-      // 执行方法
-      handler(row, newValue) {
-        let obj = {
-          current: 1,
-          size: 20,
-          type: this.form.paritiesType,
-          code: this.form.code,
-          exrateYear: row
-        }
-        if (this.form.code) {
-          // 查明细信息
-          bcurexrateList(obj).then(res => {
-            this.dataList = res.data.data.records;
-          })
-        }
+    // 执行方法
+    handler(row, newValue) {
+      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;
+      } else if (row == "月汇率") {
+        this.findObject(this.option.column, "moon").display = false;
+        // this.findObject(this.option.column, "annual").display = false;
+      } else {
+        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: false, // 深度监听
       immediate: false  // 第一次改变就执行
     },
-    "form.moon":{
+    // "form.annual": {
+    //   // 执行方法
+    //   handler(row, newValue) {
+    //     let obj = {
+    //       current: 1,
+    //       size: 20,
+    //       type: this.form.paritiesType,
+    //       code: this.form.code,
+    //       exrateYear: row
+    //     }
+    //     // if (this.form.code) {
+    //     //   // 查明细信息
+    //     //   bcurexrateList(obj).then(res => {
+    //     //     this.dataList = res.data.data.records;0
+    //     //   })
+    //     // }
+    //   },
+    //   deep: false, // 深度监听
+    //   immediate: false  // 第一次改变就执行
+    // },
+    "search.paritiesType": {
       handler(row, newValue) {
-        let obj = {
-          current: 1,
-          size: 20,
-          type: this.form.paritiesType,
-          code: this.form.code,
-          exrateYear: row,
-          exrateMonth:this.form.moon
-          
-        }
-        if (this.form.code) {
-          // 查明细信息
-          bcurexrateList(obj).then(res => {
-            this.dataList = res.data.data.records;
-          })
+        console.log(row)
+        if (row == "日汇率") {
+          this.findObject(this.optionList.column, "moon").search = true;
+          // this.findObject(this.option.column, "annual").display = false;
+        } else{
+          this.findObject(this.optionList.column, "moon").search =  false;
+          // this.findObject(this.option.column, "annual").display = false;
         }
       },
       deep: false, // 深度监听

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

@@ -25,7 +25,7 @@ const validateNumber = (rule, value, callback) => {
   }
 };
 export const optionList = {
-  searchMenuSpan: 18,
+  searchMenuSpan: 6,
   addBtn: false,
   border: true,
   align: "center",
@@ -40,7 +40,6 @@ export const optionList = {
   addRowBtn:false,
   cellBtn:true,
   rowKey: "id",
-  selection:true,
   column: [{
     label: "币种代码",
     prop: "code",
@@ -101,5 +100,106 @@ export const optionList = {
     width: 150,
     overHidden: true,
     cell:true,
-  }]
+  },
+  {
+    label: "汇率类型",
+    prop: "paritiesType",
+    type: "select",
+    width: 150,
+    overHidden: true,
+    search:true,
+    hide:true,
+    props: {
+      label: "dictValue",
+      value: "dictValue"
+    },
+    dicData: [
+      {
+        dictValue: "年汇率",
+        dictKey: 0
+      },
+      {
+        dictValue: "月汇率",
+        dictKey: 1
+      },
+      {
+        dictValue: "日汇率",
+        dictKey: 2
+      }
+    ]
+  },
+  {
+    label: "汇率年度",
+    prop: "annual",
+    type: "year",
+    valueFormat: "yyyy",
+    width: 150,
+    overHidden: true,
+    search:true,
+    hide:true
+  },
+  {
+    label: "月份",
+    prop: "moon",
+    type: "select",
+    width: 150,
+    overHidden: true,
+    search:false,
+    hide:true,
+    props: {
+      label: "dictValue",
+      value: "dictKey"
+    },
+    dicData: [
+      {
+        dictValue: "一月",
+        dictKey: 1
+      },
+      {
+        dictValue: "二月",
+        dictKey: 2
+      },
+      {
+        dictValue: "三月",
+        dictKey: 3
+      },
+      {
+        dictValue: "四月",
+        dictKey: 4
+      },
+      {
+        dictValue: "五月",
+        dictKey: 5
+      },
+      {
+        dictValue: "六月",
+        dictKey: 6
+      },
+      {
+        dictValue: "七月",
+        dictKey: 7
+      },
+      {
+        dictValue: "八月",
+        dictKey: 8
+      },
+      {
+        dictValue: "九月",
+        dictKey: 9
+      },
+      {
+        dictValue: "十月",
+        dictKey: 10
+      },
+      {
+        dictValue: "十一月",
+        dictKey: 11
+      },
+      {
+        dictValue: "十二月",
+        dictKey: 12
+      },
+    ],
+  },
+]
 }