货代 2024-3-15

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/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/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/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/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -44,6 +44,17 @@
                               @corpChange="corpChange($event,'customerName')">
                 </search-query>
             </template>
+            <template slot="brandNameSearch">
+                <search-query :datalist="brandData"
+                              :selectValue="query.brandName"
+                              :clearable="true"
+                              :buttonIf="false"
+                              :forParameter="{key:'id',label:'cname',value:'cname'}"
+                              placeholder="请选择品牌"
+                              @corpFocus="listAllfun"
+                              @corpChange="corpChange($event,'brandName')">
+                </search-query>
+            </template>
             <!--<template slot="goodsNameSearch">-->
             <!--    <search-query :datalist="goodsData"-->
             <!--                  :selectValue="query.goodsName"-->
@@ -111,6 +122,7 @@ 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},
@@ -142,7 +154,7 @@ export default {
                     // searchIndex: 2,
                     // highlightCurrentRow: true,
                     border:true,
-                    searchMenuSpan:18,
+                    searchMenuSpan:12,
                     addBtn: false,
                     showSummary: true,
                     summaryText: "合计",
@@ -210,8 +222,11 @@ export default {
                         searchOrder:7
                     },{
                         label: '品牌',
-                        prop: 'brandNames',
+                        prop: 'brandName',
                         overHidden: true,
+                        search:true,
+                        searchslot:true,
+                        searchOrder:6.1,
                     },{
                         label: '商品名称',
                         prop: 'goodsName',
@@ -285,6 +300,7 @@ export default {
                     }]
                 },
                 customerData:[], // 客户数据
+                brandData:[], // 品牌数据
                 goodsData:[], // 商品名称
                 salerData:[], // 业务员
                 actualPaymentStatusData:[], // 结算状态
@@ -361,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=>{
@@ -390,7 +412,7 @@ export default {
             },
             // 单据状态
             statusWorkDictsfun(){
-                getWorkDicts('document_status').then(res=>{
+                getWorkDicts('sales_Status').then(res=>{
                     this.statusData = res.data.data
                 })
             },