Merge remote-tracking branch 'origin/dev' into dev

src/router/views/index.js

@@ -3183,14 +3183,14 @@ export default [{
       component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/agingAnalysis/index')
     }]
   },
-  // 财务利润(F)
+  // 业务利润(F)
   {
     path: '/iosBasicData/financeProfit/index',
     component: Layout,
     hidden: true,
     children: [{
       path: '/iosBasicData/financeProfit/index',
-      name: '财务利润(F)',
+      name: '业务利润(F)',
       meta: {
         i18n: '/iosBasicData/financeProfit/index',
         keepAlive: true,

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -63,7 +63,7 @@
       </template>
       //螺纹
       <template slot="remarksOneForm" slot-scope="{type,disabled}">
-        <el-select v-model="goodsForm.remarksOne" placeholder="请选择" size="small" :disabled="disabled"
+        <el-select v-model="goodsForm.remarksOne" placeholder="请选择" size="small" :disabled="disabled" clearable
           @change="propsChange(goodsForm)">
           <el-option v-for="item in ThreadList" :key="item.id" :label="item.dictValue" :value="item.dictValue">
           </el-option>
@@ -71,7 +71,7 @@
       </template>
       //介质
       <template slot="customTwoForm" slot-scope="{type,disabled}">
-        <el-select v-model="goodsForm.customTwo" placeholder="请选择" size="small" :disabled="disabled"
+        <el-select v-model="goodsForm.customTwo" placeholder="请选择" size="small" :disabled="disabled" clearable
           @change="propsChange(goodsForm)">
           <el-option v-for="item in mediumList" :key="item.id" :label="item.dictValue" :value="item.dictValue">
           </el-option>
@@ -79,7 +79,7 @@
       </template>
       //颜色
       <template slot="customThreeForm" slot-scope="{type,disabled}">
-        <el-select v-model="goodsForm.customThree" placeholder="请选择" size="small" :disabled="disabled"
+        <el-select v-model="goodsForm.customThree" placeholder="请选择" size="small" :disabled="disabled" clearable
           @change="propsChange(goodsForm)">
           <el-option v-for="item in colorList" :key="item.id" :label="item.dictValue" :value="item.dictValue">
           </el-option>
@@ -87,7 +87,7 @@
       </template>
       //电压
       <template slot="customFourForm" slot-scope="{type,disabled}">
-        <el-select v-model="goodsForm.customFour" placeholder="请选择" size="small" :disabled="disabled"
+        <el-select v-model="goodsForm.customFour" placeholder="请选择" size="small" :disabled="disabled" clearable
           @change="propsChange(goodsForm)">
           <el-option v-for="item in stencilList" :key="item.id" :label="item.dictValue" :value="item.dictValue">
           </el-option>

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

@@ -997,7 +997,7 @@
               this.bbDisabled = false;
             }
           }
-          if (userObj.user_name == 'admin') {
+          if (userObj.user_name == 'admin' || userObj.user_name == '报表管理') {
             this.bbDisabled = false;
           }
           this.$refs.crud.rowEdit(scope.row, scope.$index);

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

@@ -997,7 +997,7 @@
               this.bbDisabled = false;
             }
           }
-          if (userObj.user_name == 'admin') {
+          if (userObj.user_name == 'admin' || userObj.user_name == '报表管理') {
             this.bbDisabled = false;
           }
           this.$refs.crud.rowEdit(scope.row, scope.$index);

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

@@ -666,10 +666,15 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="危险品包装等级" prop="dgPackingLevel" >
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgPackingLevel"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入危险品包装等级" ></el-input>
+                                <search-query :datalist="dgPackingLevelData"
+                                              :selectValue="assemblyForm.dgPackingLevel"
+                                              :disabled="detailData.seeDisabled"
+                                              :buttonIf="false"
+                                              :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
+                                              placeholder="请输入危险品包装等级"
+                                              @corpChange="corpChange($event,'dgPackingLevel')"
+                                              @corpFocus="dgPackingLevelWorkDicts">
+                                </search-query>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -770,6 +775,7 @@ import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 import {NdayDate} from "@/util/date";
 import {regularFloating, regularInteger} from "@/util/regularJudgment";
 import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
+import {getWorkDicts} from "@/api/system/dictbiz";
 
     export default {
         props:{
@@ -846,6 +852,8 @@ import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
                 packingUnitData:[],
                 // 航线
                 lineData:[],
+                // 危险品包装等级
+                dgPackingLevelData:[],
 
                 marksIndex:1
             }
@@ -853,6 +861,8 @@ import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
         created() {
             // // 船公司
             this.carrierBcorpslistByTypefun()
+            // 危险品包装等级
+            this.dgPackingLevelWorkDicts()
         },
         methods:{
             // 易燃易爆品闪点类型为数字
@@ -1174,7 +1184,7 @@ import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
                     .then(_ => {
                         this.$set(this.assemblyForm,'dgImdgCode','')
                         this.$set(this.assemblyForm,'dgUnCode','')
-                        this.$set(this.assemblyForm,'dgPackingLevel','')
+                        this.$set(this.assemblyForm,'dgPackingLevel','0')
                         this.$set(this.assemblyForm,'dgFlashPoint','')
                         this.$set(this.assemblyForm,'dgFlashPointUnit','')
                         this.$set(this.assemblyForm,'dgContacts','')
@@ -1391,6 +1401,12 @@ import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
                     this.lineData = res.data.data.records
                 })
             },
+            // 危险品包装等级
+            dgPackingLevelWorkDicts(){
+                getWorkDicts('dangerous_goods_grade').then(res=>{
+                    this.dgPackingLevelData = res.data.data
+                })
+            },
 
         }
 

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

@@ -997,7 +997,7 @@
               this.bbDisabled = false;
             }
           }
-          if (userObj.user_name == 'admin') {
+          if (userObj.user_name == 'admin' || userObj.user_name == '报表管理') {
             this.bbDisabled = false;
           }
           this.$refs.crud.rowEdit(scope.row, scope.$index);

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

@@ -376,6 +376,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     numberOfCopy:'ONE', // 副本份数 默认 ONE
                     cargoType:'dry', // 货物类型默认普货
                     marks:'N/M',
+                    dgPackingLevel:'0', // 危险品包装等级
                     filesList:[], // 文件中心
                     feeCenterListD:[], // 收
                     feeCenterListC:[], // 付

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

@@ -839,10 +839,15 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="危险品包装等级" prop="dgPackingLevel" >
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgPackingLevel"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入危险品包装等级" ></el-input>
+                                <search-query :datalist="dgPackingLevelData"
+                                              :selectValue="assemblyForm.dgPackingLevel"
+                                              :disabled="detailData.seeDisabled"
+                                              :buttonIf="false"
+                                              :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
+                                              placeholder="请输入危险品包装等级"
+                                              @corpChange="corpChange($event,'dgPackingLevel')"
+                                              @corpFocus="dgPackingLevelWorkDicts">
+                                </search-query>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -943,6 +948,7 @@ import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 import {NdayDate} from "@/util/date";
 import {regularFloating, regularInteger} from "@/util/regularJudgment";
 import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
+import {getWorkDicts} from "@/api/system/dictbiz";
 
     export default {
         props:{
@@ -1030,6 +1036,8 @@ import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
                 lineData:[],
                 // COLOADER
                 coloaderCnNameData:[],
+                // 危险品包装等级
+                dgPackingLevelData:[],
 
                 marksIndex:1
             }
@@ -1057,6 +1065,8 @@ import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
             // this.vesselBvesselsListfun()
             // // 航线
             // this.lineBlinesListfun()
+            // 危险品包装等级
+            this.dgPackingLevelWorkDicts()
         },
         methods:{
             // 易燃易爆品闪点类型为数字
@@ -1431,7 +1441,7 @@ import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
                     .then(_ => {
                         this.$set(this.assemblyForm,'dgImdgCode','')
                         this.$set(this.assemblyForm,'dgUnCode','')
-                        this.$set(this.assemblyForm,'dgPackingLevel','')
+                        this.$set(this.assemblyForm,'dgPackingLevel','0')
                         this.$set(this.assemblyForm,'dgFlashPoint','')
                         this.$set(this.assemblyForm,'dgFlashPointUnit','')
                         this.$set(this.assemblyForm,'dgContacts','')
@@ -1703,6 +1713,12 @@ import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
                     this.lineData = res.data.data.records
                 })
             },
+            // 危险品包装等级
+            dgPackingLevelWorkDicts(){
+                getWorkDicts('dangerous_goods_grade').then(res=>{
+                    this.dgPackingLevelData = res.data.data
+                })
+            },
 
         }
 

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

@@ -387,19 +387,24 @@
                     <el-row :gutter="20">
                         <el-col :span="12">
                             <el-form-item :label="`${inttraText} 客户名称`" prop="hNotify2CnName" >
-                                <search-query :datalist="inttraData"
-                                              :selectValue="assemblyForm[`inttra${inttraTitle}CorpName`]"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              :placeholder="`请选择${inttraText} 客户名称`"
-                                              @remoteMethod="remoteMethod($event,`inttra${inttraTitle}`)"
-                                              @corpChange="corpChange($event,`inttra${inttraTitle}`)"
-                                              @corpFocus="remoteMethod($event,`inttra${inttraTitle}`)" >
-                                </search-query>
+                                <!--<search-query :datalist="inttraData"-->
+                                <!--              :selectValue="assemblyForm[`inttra${inttraTitle}CorpName`]"-->
+                                <!--              :filterable="true"-->
+                                <!--              :clearable="true"-->
+                                <!--              :remote="true"-->
+                                <!--              :disabled="detailData.seeDisabled"-->
+                                <!--              :buttonIf="false"-->
+                                <!--              :forParameter="{key:'id',label:'cnName',value:'cnName'}"-->
+                                <!--              :placeholder="`请选择${inttraText} 客户名称`"-->
+                                <!--              @remoteMethod="remoteMethod($event,`inttra${inttraTitle}`)"-->
+                                <!--              @corpChange="corpChange($event,`inttra${inttraTitle}`)"-->
+                                <!--              @corpFocus="remoteMethod($event,`inttra${inttraTitle}`)" >-->
+                                <!--</search-query>-->
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpName`]"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable :placeholder="`请输入${inttraText} 客户名称`"
+                                          @input="inttraTitleInput($event,'CorpName')" ></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -407,23 +412,26 @@
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpAddr`]"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${inttraText} 客户地址`" ></el-input>
+                                          clearable :placeholder="`请输入${inttraText} 客户地址`"
+                                          @input="inttraTitleInput($event,'CorpAddr')" ></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="`${inttraText} 客户联系人`" >
+                            <el-form-item :label="`${inttraText} 联系人`" >
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpContacts`]"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${inttraText} 客户联系人`" ></el-input>
+                                          clearable :placeholder="`请输入${inttraText} 联系人`"
+                                          @input="inttraTitleInput($event,'CorpContacts')" ></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="`${inttraText} 客户联系人电话`" >
+                            <el-form-item :label="`${inttraText} 联系电话`" >
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpTel`]"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${inttraText} 客户联系人电话`" ></el-input>
+                                          clearable :placeholder="`请输入${inttraText} 联系人电话`"
+                                          @input="inttraTitleInput($event,'CorpTel')" ></el-input>
                             </el-form-item>
                         </el-col>
 
@@ -646,6 +654,15 @@
                     this.assemblyForm[name] = value?value:''
                 }
             },
+            // INTTRA EDI弹窗 输入框监听
+            inttraTitleInput(value,name){
+                if (this.assemblyForm.serviceTerms == 'DOOR to DOOR') {
+                    this.$set(this.assemblyForm,`inttraDoorTo${name}`,value)
+                    this.$set(this.assemblyForm,`inttraToDoor${name}`,value)
+                }else {
+                    this.$set(this.assemblyForm,`inttra${this.inttraTitle}${name}`,value)
+                }
+            },
             // 发送INTTRA EDI弹窗开启
             inttraAdd(){
                 if (!this.assemblyForm.serviceTerms) {
@@ -656,16 +673,20 @@
                     });
                     return
                 }
-                console.log(this.assemblyForm.serviceTerms,659)
-                if (this.assemblyForm.serviceTerms == 'DOOR to DOOR' || this.assemblyForm.serviceTerms == 'DOOR to CY') {
-                    this.inttraTitle = 'ToDoor'
+                if (this.assemblyForm.serviceTerms == 'DOOR to CY') {
+                    this.inttraTitle = 'DoorTo'
                     this.inttraText = 'DOOR TO'
-                    this.inttraBcorpslistByType()
+                    // this.inttraBcorpslistByType()
                     this.inttraVisible = true
                 }else if (this.assemblyForm.serviceTerms == 'CY to DOOR') {
-                    this.inttraTitle = 'DoorTo'
+                    this.inttraTitle = 'ToDoor'
                     this.inttraText = 'TO DOOR'
-                    this.inttraBcorpslistByType()
+                    // this.inttraBcorpslistByType()
+                    this.inttraVisible = true
+                }else if (this.assemblyForm.serviceTerms == 'DOOR to DOOR') {
+                    this.inttraTitle = 'ToDoor'
+                    this.inttraText = 'DOOR TO DOOR'
+                    // this.inttraBcorpslistByType()
                     this.inttraVisible = true
                 }else {
                     this.$confirm('请选择其他的服务方式',{
@@ -688,10 +709,21 @@
                 }
                 this.$confirm(title)
                     .then(_ => {
-                        this.$set(this.assemblyForm,`inttra${this.inttraTitle}CorpName`,'')
-                        this.$set(this.assemblyForm,`inttra${this.inttraTitle}CorpAddr`,'')
-                        this.$set(this.assemblyForm,`inttra${this.inttraTitle}CorpContacts`,'')
-                        this.$set(this.assemblyForm,`inttra${this.inttraTitle}CorpTel`,'')
+                        if (this.assemblyForm.serviceTerms == 'DOOR to DOOR') {
+                            this.$set(this.assemblyForm,'inttraDoorToCorpName','')
+                            this.$set(this.assemblyForm,'inttraDoorToCorpAddr','')
+                            this.$set(this.assemblyForm,'inttraDoorToCorpContacts','')
+                            this.$set(this.assemblyForm,'inttraDoorToCorpTel','')
+                            this.$set(this.assemblyForm,'inttraToDoorCorpName','')
+                            this.$set(this.assemblyForm,'inttraToDoorCorpAddr','')
+                            this.$set(this.assemblyForm,'inttraToDoorCorpContacts','')
+                            this.$set(this.assemblyForm,'inttraToDoorCorpTel','')
+                        }else {
+                            this.$set(this.assemblyForm,`inttra${this.inttraTitle}CorpName`,'')
+                            this.$set(this.assemblyForm,`inttra${this.inttraTitle}CorpAddr`,'')
+                            this.$set(this.assemblyForm,`inttra${this.inttraTitle}CorpContacts`,'')
+                            this.$set(this.assemblyForm,`inttra${this.inttraTitle}CorpTel`,'')
+                        }
                         this.inttraVisible = false
                     })
                     .catch(_ => {});

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

@@ -1007,7 +1007,7 @@
               this.bbDisabled = false;
             }
           }
-          if (userObj.user_name == 'admin') {
+          if (userObj.user_name == 'admin' || userObj.user_name == '报表管理') {
             this.bbDisabled = false;
           }
           this.$refs.crud.rowEdit(scope.row, scope.$index);

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

@@ -378,6 +378,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     seaType:'E', // 进出口 默认出口 E=出口 I=进口"
                     cargoType:'dry', // 货物类型默认普货
                     marks:'N/M',
+                    dgPackingLevel:'0', // 危险品包装等级
                     filesList:[], // 文件中心
                     feeCenterListD:[], // 收
                     feeCenterListC:[], // 付
@@ -958,7 +959,31 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                         this.$set(this.form,'hshipperCntyCode',this.$refs.bcorps[0].selectionList[0].cntyCode)
                     }else {
                         console.log('详情确认')
+                        console.log(this.$refs.bcorps,962)
                         this.$refs.bcorps[0].$refs.detail.submitForm()
+                        this.form.corpCnName = this.$refs.bcorps[0].$refs.detail.formData.cnName
+                        this.form.corpEnName = this.$refs.bcorps[0].$refs.detail.formData.enName
+                        this.form.corpId = this.$refs.bcorps[0].$refs.detail.formData.id
+                        this.form.corpCode = this.$refs.bcorps[0].$refs.detail.formData.code
+                        // 获取 客户op数据
+                        this.getBcorpsattnListfun()
+                        // 业务来源参数带出
+                        this.$set(this.form,'srcType',this.$refs.bcorps[0].$refs.detail.formData.sourceType)
+                        this.$set(this.form,'srcId',this.$refs.bcorps[0].$refs.detail.formData.srcId)
+                        this.$set(this.form,'srcCnName',this.$refs.bcorps[0].$refs.detail.formData.srcCnName)
+                        this.$set(this.form,'srcEnName',this.$refs.bcorps[0].$refs.detail.formData.srcEnName)
+                        this.columnforfun('srcType').disabled = false
+                        this.columnforfun('srcCnName').disabled = false
+                        // 航线带出往来单位的优势航线
+                        this.$set(this.form,'lineCnName',this.$refs.bcorps[0].$refs.detail.formData.advantageRoute)
+                        // 带出发货人数据
+                        this.$set(this.form,'hshipperId',this.$refs.bcorps[0].$refs.detail.formData.id)
+                        this.$set(this.form,'hshipperCnName',this.$refs.bcorps[0].$refs.detail.formData.cnName)
+                        this.$set(this.form,'hshipperEnName',this.$refs.bcorps[0].$refs.detail.formData.enName)
+                        this.$set(this.form,'hshipperCode',this.$refs.bcorps[0].$refs.detail.formData.code)
+                        this.$set(this.form,'hshipperDetails',this.$refs.bcorps[0].$refs.detail.formData.details)
+                        this.$set(this.form,'hshipperCntyName',this.$refs.bcorps[0].$refs.detail.formData.cntyName)
+                        this.$set(this.form,'hshipperCntyCode',this.$refs.bcorps[0].$refs.detail.formData.cntyCode)
                     }
                 }
                 this.$refs.searchQueryRef[0].corpVisible = false

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -386,6 +386,8 @@ export default {
                 this.$set(this.query,'isBusinessDate',0)
                 this.$set(this.query,'isToExamineDate',1)
             }
+            this.page.currentPage = 1;
+            this.onLoad(this.page, this.query);
         },
         // 收付单选
         dcInput(){
@@ -401,6 +403,9 @@ export default {
             this.findObject(this.option.column, "amountAlready").label = `已${dcName}款人民币`
             this.findObject(this.option.column, "amountUsdNot").label = `未${dcName}款美金`
             this.findObject(this.option.column, "amountNot").label = `未${dcName}款人民币`
+
+            this.page.currentPage = 1;
+            this.onLoad(this.page, this.query);
         },
         // 接口获取数据
         // 结算单位

src/views/iosBasicData/bcorps/index.vue

@@ -21,7 +21,7 @@
         <basic-container class="page-crad">
           <!-- :on-change="handleChange" -->
           <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-            id="out-table" :header-cell-class-name="headerClassName" :search.sync="search" :before-open="beforeOpen"
+            id="out-table" :header-cell-class-name="headerClassName" :search.sync="query" :before-open="beforeOpen"
             v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
             @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
             @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
@@ -138,7 +138,6 @@ export default {
         }
       },
       excelForm: {},
-      search: {},
       excelLoading: false,
       excelOption: {
         submitBtn: false,
@@ -516,10 +515,10 @@ export default {
     // 导出
     handleExport() {
       var condition = ''
-      for (const key in this.search) {
-        var value = this.search[key]
+      for (const key in this.query) {
+        var value = this.query[key]
         if (value) {
-          condition += `&${key}=${this.search[key]}`
+          condition += `&${key}=${this.query[key]}`
         }
       }
 
@@ -570,11 +569,11 @@ export default {
       // // console.log(data, 904)
       // reqiestData.corpType = data.id
       // if (this.search.corpType == null) {
-      this.search.corpType = data.id
+      this.query.corpType = data.id
       // } else {
       //   this.search.corpType = null
       // }
-      this.onLoad(this.page, this.search);
+      this.onLoad(this.page, this.query);
       // this.onLoad(this.page, reqiestData);
     },
     // 获取客户类别
@@ -663,8 +662,8 @@ export default {
     },
     beforeOpen(done, type) {
       this.detailData = {};
-      if (this.search.corpType != null) {
-        this.detailData.corpType = this.search.corpType
+      if (this.query.corpType != null) {
+        this.detailData.corpType = this.query.corpType
       }
       this.isShow = false;
       // if (["edit", "view"].includes(type)) {

src/views/iosBasicData/financeProfit/index.vue

@@ -17,6 +17,9 @@
                    @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 336)"
                    @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 336)"
                    @on-load="onLoad" >
+            <template slot="menuLeft">
+                <el-button type="success" size="small" plain @click="exportfun" >导出</el-button>
+            </template>
             <template slot="header">
                 <el-table
                     :data="commodityData"
@@ -163,6 +166,7 @@
     import {getList as userGetList} from '@/api/system/user'
     import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
     import {blinesList} from "@/api/iosBasicData/blines";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {TreeSelect, SearchQuery},
@@ -535,29 +539,29 @@
                         prop:'amountDrLoc'
                     },
                     {
-                        id:7,
-                        label:'实付人民币',
-                        prop:'realAmountCr'
+                        id:10,
+                        label:'实收人民币',
+                        prop:'realAmountDr'
                     },
                     {
-                        id:8,
-                        label:'实付美元',
-                        prop:'realAmountCrUsd'
+                        id:11,
+                        label:'实收美元',
+                        prop:'realAmountDrUsd'
                     },
                     {
-                        id:9,
-                        label:'实付合计',
-                        prop:'realAmountCrLoc'
+                        id:12,
+                        label:'实收合计',
+                        prop:'realAmountDrLoc'
                     },
                     {
                         id:7,
                         label:'实付人民币',
-                        prop:'realAmountDr'
+                        prop:'realAmountCr'
                     },
                     {
                         id:8,
                         label:'实付美元',
-                        prop:'realAmountDrUsd'
+                        prop:'realAmountCrUsd'
                     },
                     {
                         id:9,
@@ -565,7 +569,12 @@
                         prop:'realAmountCrLoc'
                     },
                     {
-                        id:9,
+                        id:13,
+                        label:'单票利润',
+                        prop:'amountProfitLoc'
+                    },
+                    {
+                        id:14,
                         label:'实际单票利润',
                         prop:'realAmountProfitLoc'
                     },
@@ -578,6 +587,16 @@
             this.getLazylistfun() // 获取部门数据
         },
         methods:{
+            // 导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/financeStatistics/financeProfitExport',//跳转目标窗口的地址
+                    query: {
+                        ...this.query
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 获取字典数据
             getWorkDictsfun(){
                 // 获取业务类型
@@ -600,6 +619,9 @@
                     this.$set(this.query,'costMerge',null)
                     this.$set(this.query,'consistentCorpMerge',null)
                 }
+
+                this.page.currentPage = 1;
+                this.onLoad(this.page, this.query);
             },
             // 业务员下拉
             srcCorpFocus(value,name){

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -161,30 +161,36 @@
                         <el-col v-for="(item, index) in feestemplateData.column" :key="index" :span="item.span ? item.span : 12"
                                 :class="{ isShow: item.display }" >
                             <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                                <div v-if="item.prop == 'corpId'">
-                                    <search-query ref="SearchQuery"
+                                <div v-if="item.prop == 'corpCnName'">
+                                    <search-query ref="SearchCorp"
                                                   :datalist="corpData"
                                                   :selectValue="feestemplateForm[item.prop]"
                                                   title="客户"
                                                   :filterable="true"
                                                   :clearable="true"
                                                   :remote="true"
-                                                  :forParameter="{key:'id',label:'cnName',value:'id'}"
-                                                  @remoteMethod="getBcorpsListfun" @corpChange="corpCorpChange" >
-                                        <bcorps></bcorps>
+                                                  :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  @remoteMethod="getBcorpsListfun" @corpChange="corpCorpChange"
+                                                  @eldialogConfirm="eldialogConfirm(item.prop)" >
+                                        <bcorps ref="bcorps"
+                                                :eldialog="true"
+                                                @selectionChange="eldialogMultipleChoice($event,'bcorps')" ></bcorps>
                                     </search-query>
                                 </div>
-                                <div v-else-if="item.prop == 'feeId'">
-                                    <search-query ref="SearchQuery"
+                                <div v-else-if="item.prop == 'feeCnName'">
+                                    <search-query ref="SearchFee"
                                                   :datalist="feeData"
                                                   :selectValue="feestemplateForm[item.prop]"
                                                   title="费用"
                                                   :filterable="true"
                                                   :clearable="true"
                                                   :remote="true"
-                                                  :forParameter="{key:'id',label:'cnName',value:'id'}"
-                                                  @remoteMethod="bfeesListfun" @corpChange="feeCorpChange" >
-                                        <bfeesdefine></bfeesdefine>
+                                                  :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  @remoteMethod="bfeesListfun" @corpChange="feeCorpChange"
+                                                  @eldialogConfirm="eldialogConfirm(item.prop)" >
+                                        <bfeesdefine ref="bfeesdefine"
+                                                     :eldialog="true"
+                                                     @selectionChange="eldialogMultipleChoice($event,'feeCnName')" ></bfeesdefine>
                                     </search-query>
                                 </div>
                                 <div v-else-if="item.prop == 'quantityRule'">
@@ -226,7 +232,7 @@
                                                   @eldialogConfirm="eldialogConfirm(item.prop)" >
                                         <bunits ref="bunits"
                                                 :eldialog="true"
-                                                @selectionChange="eldialogMultipleChoice($event,item.prop)"></bunits>
+                                                @selectionChange="eldialogMultipleChoice($event,'bunits')"></bunits>
                                     </search-query>
                                 </div>
 
@@ -411,7 +417,7 @@ export default {
                 column:[
                     {
                         label: "客户",
-                        prop: "corpId",
+                        prop: "corpCnName",
                         type:'select',
                         rules: [{
                             required: true,
@@ -426,7 +432,7 @@ export default {
                     },
                     {
                         label: "费用",
-                        prop: "feeId",
+                        prop: "feeCnName",
                         rules: [{
                             required: true,
                             message: "",
@@ -557,7 +563,7 @@ export default {
         // 客户选择之后的回调
         corpCorpChange(value){
             for(let item of this.corpData) {
-                if (item.id == value) {
+                if (item.cnName == value) {
                     this.$set(this.feestemplateForm,'corpId',item.id)
                     this.$set(this.feestemplateForm,'corpEnName',item.enName)
                     this.$set(this.feestemplateForm,'corpCnName',item.cnName)
@@ -599,22 +605,49 @@ export default {
             }
         },
         // 查找弹窗里选择导出
-        eldialogConfirm(){
-            this.$set(this.feestemplateForm,'unitId',this.$refs.bunits[0].selectionList[0].id)
-            this.$set(this.feestemplateForm,'unitNo',this.$refs.bunits[0].selectionList[0].code)
-            this.$refs.SearchUnitNo[0].corpVisible = false
+        eldialogConfirm(name){
+            if (name == 'corpCnName') {
+                if (this.$refs.bcorps[0].isShow) {
+                    console.log('列表确认')
+                    this.$set(this.feestemplateForm,'corpId',this.$refs.bcorps[0].selectionList[0].id)
+                    this.$set(this.feestemplateForm,'corpEnName',this.$refs.bcorps[0].selectionList[0].enName)
+                    this.$set(this.feestemplateForm,'corpCnName',this.$refs.bcorps[0].selectionList[0].cnName)
+                }else {
+                    console.log('详情确认')
+                    this.$refs.bcorps[0].$refs.detail.submitForm()
+                    this.$set(this.feestemplateForm,'corpCnName',this.$refs.bcorps[0].$refs.detail.formData.cnName)
+                    this.$set(this.feestemplateForm,'corpEnName',this.$refs.bcorps[0].$refs.detail.formData.enName)
+                    this.$set(this.feestemplateForm,'corpId',this.$refs.bcorps[0].$refs.detail.formData.id)
+                }
+                this.$refs.SearchCorp[0].corpVisible = false
+            }else if (name == 'feeCnName') {
+                this.$set(this.feestemplateForm,'feeId',this.$refs.bfeesdefine[0].selectionList[0].id)
+                this.$set(this.feestemplateForm,'feeCode',this.$refs.bfeesdefine[0].selectionList[0].code)
+                this.$set(this.feestemplateForm,'feeEnName',this.$refs.bfeesdefine[0].selectionList[0].enName)
+                this.$set(this.feestemplateForm,'feeCnName',this.$refs.bfeesdefine[0].selectionList[0].cnName)
+                // 核算要素
+                this.$set(this.feestemplateForm,'elementsId',this.$refs.bfeesdefine[0].selectionList[0].accElementId)
+                this.$set(this.feestemplateForm,'elementsCnName',this.$refs.bfeesdefine[0].selectionList[0].accElementName)
+                this.$set(this.feestemplateForm,'elementsCode',this.$refs.bfeesdefine[0].selectionList[0].elementsCode)
+                this.$set(this.feestemplateForm,'elementsEnName',this.$refs.bfeesdefine[0].selectionList[0].elementsEnName)
+                this.$refs.SearchFee[0].corpVisible = false
+            }else if (name == 'bunits') {
+                this.$set(this.feestemplateForm,'unitId',this.$refs.bunits[0].selectionList[0].id)
+                this.$set(this.feestemplateForm,'unitNo',this.$refs.bunits[0].selectionList[0].code)
+                this.$refs.SearchUnitNo[0].corpVisible = false
+            }else {}
         },
         // 下拉多选弹窗数据多选回调
         eldialogMultipleChoice(list,name){
             let arr = []
             if (list.length > 1) {
-                this.$refs.bunits[0].$refs.crud.toggleSelection() // 先清空所以选择的数据
+                this.$refs[name][0].$refs.crud.toggleSelection() // 先清空所以选择的数据
                 arr = [list[list.length -1]] // 获取最新点击的数组
-                this.$refs.bunits[0].$refs.crud.toggleSelection(arr,true) // 把刚点击的数组变成选择状态
+                this.$refs[name][0].$refs.crud.toggleSelection(arr,true) // 把刚点击的数组变成选择状态
             }else {
                 arr = list
             }
-            this.$refs.bunits[0].selectionList = arr
+            this.$refs[name][0].selectionList = arr
         },
         // 获取详情数据
         losbfeestemplateDetailfun(id){

src/views/iosBasicData/paymentDetail/index.vue

@@ -457,6 +457,8 @@ export default {
                 this.$set(this.query,'isBusinessDate',0)
                 this.$set(this.query,'isToExamineDate',1)
             }
+            this.page.currentPage = 1;
+            this.onLoad(this.page, this.query);
         },
         // 收付单选
         dcInput(){
@@ -472,6 +474,9 @@ export default {
             this.findObject(this.option.column, "amountAlready").label = `已${dcName}款人民币`
             this.findObject(this.option.column, "amountUsdNot").label = `未${dcName}款美金`
             this.findObject(this.option.column, "amountNot").label = `未${dcName}款人民币`
+
+            this.page.currentPage = 1;
+            this.onLoad(this.page, this.query);
         },
         // 接口获取数据
         // 结算单位

src/views/iosBasicData/paymentSummary/index.vue

@@ -19,6 +19,8 @@
                    @on-load="onLoad" >
             <template slot="menuLeft">
                 <el-button type="success" size="small" plain @click="exportfun" >导出</el-button>
+                <el-button type="primary" size="small" plain >打印报表</el-button>
+                <el-button type="info" size="small" plain >设计报表</el-button>
             </template>
             <template slot-scope="{disabled,size}" slot="dcSearch">
                 <el-radio v-model="query.dc" label="D" @input="dcInput" >应收</el-radio>
@@ -422,6 +424,8 @@
                     this.$set(this.query,'isBusinessDate',0)
                     this.$set(this.query,'isToExamineDate',1)
                 }
+                this.page.currentPage = 1;
+                this.onLoad(this.page, this.query);
             },
             // 收付单选
             dcInput(){
@@ -437,6 +441,9 @@
                 this.findObject(this.option.column, "amountAlready").label = `已${dcName}款人民币`
                 this.findObject(this.option.column, "amountUsdNot").label = `未${dcName}款美金`
                 this.findObject(this.option.column, "amountNot").label = `未${dcName}款人民币`
+
+                this.page.currentPage = 1;
+                this.onLoad(this.page, this.query);
             },
             // 接口获取数据
             // 结算单位

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -44,30 +44,38 @@
                               @corpChange="corpChange($event,'customerName')">
                 </search-query>
             </template>
-            <template slot="goodsNameSearch">
-                <search-query :datalist="goodsData"
-                              :selectValue="query.goodsName"
-                              :filterable="true"
+            <template slot="brandNameSearch">
+                <search-query :datalist="brandData"
+                              :selectValue="query.brandName"
                               :clearable="true"
-                              :remote="true"
                               :buttonIf="false"
                               :forParameter="{key:'id',label:'cname',value:'cname'}"
-                              placeholder="请选择商品名称"
-                              @remoteMethod="SPgetListfun"
-                              @corpFocus="SPgetListfun"
-                              @corpChange="corpChange($event,'goodsName')">
+                              placeholder="请选择品牌"
+                              @corpFocus="listAllfun"
+                              @corpChange="corpChange($event,'brandName')">
                 </search-query>
             </template>
+            <!--<template slot="goodsNameSearch">-->
+            <!--    <search-query :datalist="goodsData"-->
+            <!--                  :selectValue="query.goodsName"-->
+            <!--                  :filterable="true"-->
+            <!--                  :clearable="true"-->
+            <!--                  :remote="true"-->
+            <!--                  :buttonIf="false"-->
+            <!--                  :forParameter="{key:'id',label:'cname',value:'cname'}"-->
+            <!--                  placeholder="请选择商品名称"-->
+            <!--                  @remoteMethod="SPgetListfun"-->
+            <!--                  @corpFocus="SPgetListfun"-->
+            <!--                  @corpChange="corpChange($event,'goodsName')">-->
+            <!--    </search-query>-->
+            <!--</template>-->
             <template slot="salerNameSearch">
                 <search-query :datalist="salerData"
                               :selectValue="query.salerName"
-                              :filterable="true"
                               :clearable="true"
-                              :remote="true"
                               :buttonIf="false"
                               :forParameter="{key:'id',label:'name',value:'name'}"
                               placeholder="请选择业务员"
-                              @remoteMethod="YWYgetListfun"
                               @corpFocus="YWYgetListfun"
                               @corpChange="corpChange($event,'salerName')">
                 </search-query>
@@ -113,6 +121,8 @@ import {getList as YWYgetList} from "@/api/system/user"
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import {getWorkDicts} from "@/api/system/dictbiz";
 import { getToken } from "@/util/auth";
+import {getSalesman} from "@/api/landTransportation";
+import { listAll } from "@/api/tirePartsMall/basicData/listingManagement";
 
 export default {
     components: {SearchQuery},
@@ -143,7 +153,8 @@ export default {
                     // searchIcon: true,
                     // searchIndex: 2,
                     // highlightCurrentRow: true,
-                    searchMenuSpan:18,
+                    border:true,
+                    searchMenuSpan:12,
                     addBtn: false,
                     showSummary: true,
                     summaryText: "合计",
@@ -211,8 +222,11 @@ export default {
                         searchOrder:7
                     },{
                         label: '品牌',
-                        prop: 'brandNames',
+                        prop: 'brandName',
                         overHidden: true,
+                        search:true,
+                        searchslot:true,
+                        searchOrder:6.1,
                     },{
                         label: '商品名称',
                         prop: 'goodsName',
@@ -286,6 +300,7 @@ export default {
                     }]
                 },
                 customerData:[], // 客户数据
+                brandData:[], // 品牌数据
                 goodsData:[], // 商品名称
                 salerData:[], // 业务员
                 actualPaymentStatusData:[], // 结算状态
@@ -362,6 +377,12 @@ export default {
                 })
                 window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
             },
+            // 获取品牌数据
+            listAllfun(){
+                listAll().then(res=>{
+                    this.brandData = res.data.data
+                })
+            },
             // 获取客户数据
             KHgetListfun(cname){
                 KHgetList({current: 1, size: 20, corpType: 'KH', cname:cname?cname:null}).then(res=>{
@@ -370,8 +391,11 @@ export default {
             },
             // 获取业务员数据
             YWYgetListfun(realName){
-                YWYgetList(1,10,{realName:realName?realName:null}).then(res=>{
-                    this.salerData = res.data.data.records
+                // YWYgetList(1,10,{realName:realName?realName:null}).then(res=>{
+                //     this.salerData = res.data.data.records
+                // })
+                getSalesman().then(res=>{
+                    this.salerData = res.data.data
                 })
             },
             // 获取商品数据
@@ -388,7 +412,7 @@ export default {
             },
             // 单据状态
             statusWorkDictsfun(){
-                getWorkDicts('document_status').then(res=>{
+                getWorkDicts('sales_Status').then(res=>{
                     this.statusData = res.data.data
                 })
             },

src/views/wel/home/xindongPower/xindongPower.vue

@@ -15,7 +15,7 @@
                 <div style="color: #53b2da" class="statisticsBottom">
                     <span>当月成交额：¥{{typeFalse?'****':statisticsData.dealAmountM}}元</span>
                 </div>
-                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1" @click="typeFalse = !typeFalse">
+                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1" @click="typeFalse = !typeFalse">
                     <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
                 </div>
             </div>
@@ -32,7 +32,7 @@
                 <div style="color: #69d1a0" class="statisticsBottom">
                     <span>当月轮胎销售量：{{typeFalse?'****':statisticsData.salesNumM}}条</span>
                 </div>
-                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1" @click="typeFalse = !typeFalse">
+                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1" @click="typeFalse = !typeFalse">
                     <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
                 </div>
             </div>
@@ -49,7 +49,7 @@
                 <div style="color: #c865d7" class="statisticsBottom">
                     <span>当月线上收款金额：¥{{typeFalse?'****':statisticsData.stlAmountM}}元</span>
                 </div>
-                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1" @click="typeFalse = !typeFalse">
+                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1" @click="typeFalse = !typeFalse">
                     <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
                 </div>
             </div>
@@ -66,7 +66,7 @@
                 <div style="color: #f09d68" class="statisticsBottom">
                     <span>当月利润：¥{{typeFalse?'****':statisticsData.profitM}}元</span>
                 </div>
-                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1" @click="typeFalse = !typeFalse">
+                <div class="position" v-if="saberUserInfo.role_name.indexOf('admin') != -1 || saberUserInfo.role_name.indexOf('老板') != -1 || saberUserInfo.role_name.indexOf('首页数据') != -1" @click="typeFalse = !typeFalse">
                     <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
                 </div>
             </div>
@@ -299,7 +299,7 @@
             // });
             // 获取当前登录人数据
             this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
-            if (this.saberUserInfo.role_name.indexOf('admin') == -1 && this.saberUserInfo.role_name.indexOf('老板') == -1) {
+            if (this.saberUserInfo.role_name.indexOf('admin') == -1 && this.saberUserInfo.role_name.indexOf('老板') == -1 && this.saberUserInfo.role_name.indexOf('首页数据') == -1) {
                 this.typeFalse = true
             }