轮胎和货代bug 2024-3-26

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -622,6 +622,7 @@ export default {
           searchProp: 'leaseCommencementDateList',
           overHidden: true,
           search: true,
+          disabled: false,
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           type: "date",

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

@@ -636,6 +636,11 @@
                 type:Boolean,
                 default:false,
             },
+            // 拷贝的详情数据
+            copyFormData:{
+                type:Object,
+                default: {}
+            },
         },
         data(){
             return {
@@ -1358,6 +1363,10 @@
                         return;
                     }
                 }
+                // 判断拷贝详情的数据是否要参数
+                if (popupReminder(this.copyFormData,this.messageData)) {
+                    return this.$message.warning('请先点击右上角保存按钮保存数据')
+                }
                 let obj = {
                     edit:true
                 }
@@ -1428,6 +1437,10 @@
                         return;
                     }
                 }
+                // 判断拷贝详情的数据是否要参数
+                if (popupReminder(this.copyFormData,this.messageData)) {
+                    return this.$message.warning('请先点击右上角保存按钮保存数据')
+                }
                 let obj = {
                     edit:true
                 }

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

@@ -226,7 +226,7 @@
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy"
                              v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1" >
-                    <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
+                    <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
                     <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" ></document-center>
@@ -332,6 +332,7 @@ import {
                 billsListAllData:[], // 分单列表数据
                 pageLoading:false, // 全屏的动画
                 saveLoading:false,
+                copyFormData:{}, // 详情的备份数据
                 // 详情数据
                 form:{
                     billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -1546,6 +1547,7 @@ import {
             async billsDetailfun(id){
                 const res = await aeabillsDetail(id)
                 this.form = res.data.data;
+                this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
                 // 如果已经请核就禁用按钮
                 // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                 //     this.detailData.seeDisabled = true

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

@@ -630,6 +630,11 @@
                 type:Boolean,
                 default:false,
             },
+            // 拷贝的详情数据
+            copyFormData:{
+                type:Object,
+                default: {}
+            },
         },
         data(){
             return {
@@ -1353,6 +1358,10 @@
                         return;
                     }
                 }
+                // 判断拷贝详情的数据是否要参数
+                if (popupReminder(this.copyFormData,this.messageData)) {
+                    return this.$message.warning('请先点击右上角保存按钮保存数据')
+                }
                 let obj = {
                     edit:true
                 }
@@ -1423,6 +1432,10 @@
                         return;
                     }
                 }
+                // 判断拷贝详情的数据是否要参数
+                if (popupReminder(this.copyFormData,this.messageData)) {
+                    return this.$message.warning('请先点击右上角保存按钮保存数据')
+                }
                 let obj = {
                     edit:true
                 }

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

@@ -226,7 +226,7 @@
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy"
                              v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1" >
-                    <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
+                    <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
                     <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" ></document-center>
@@ -333,6 +333,7 @@ import {
                 billsListAllData:[], // 分单列表数据
                 pageLoading:false, // 全屏的动画
                 saveLoading:false,
+                copyFormData:{}, // 详情的备份数据
                 // 详情数据
                 form:{
                     billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -1541,6 +1542,7 @@ import {
             async billsDetailfun(id){
                 const res = await aeabillsDetail(id)
                 this.form = res.data.data;
+                this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
                 // 如果已经请核就禁用按钮
                 // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                 //     this.detailData.seeDisabled = true

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -62,6 +62,7 @@
                                                   :disabled="editSave || !form.corpId"
                                                   :filterable="true"
                                                   :buttonIf="false"
+                                                  :allowCreate="true"
                                                   placeholder="请选择开户帐号"
                                                   :forParameter="{ key:'id', label:'accountBankNo', value:'id'}"
                                                   @corpChange="corpChange($event,'bankId')"

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

@@ -644,6 +644,11 @@
                 type:Boolean,
                 default:false,
             },
+            // 拷贝的详情数据
+            copyFormData:{
+                type:Object,
+                default: {}
+            },
         },
         data(){
             return {
@@ -1388,6 +1393,10 @@
                         return;
                     }
                 }
+                // 判断拷贝详情的数据是否要参数
+                if (popupReminder(this.copyFormData,this.messageData)) {
+                    return this.$message.warning('请先点击右上角保存按钮保存数据')
+                }
                 let obj = {
                     edit:true
                 }
@@ -1458,6 +1467,10 @@
                         return;
                     }
                 }
+                // 判断拷贝详情的数据是否要参数
+                if (popupReminder(this.copyFormData,this.messageData)) {
+                    return this.$message.warning('请先点击右上角保存按钮保存数据')
+                }
                 let obj = {
                     edit:true
                 }

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

@@ -257,7 +257,7 @@
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy"
                              v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1" >
-                    <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
+                    <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
                     <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" ></document-center>
@@ -358,6 +358,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 billsListAllData:[], // 分单列表数据
                 pageLoading:false, // 全屏的动画
                 saveLoading:false,
+                copyFormData:{}, // 详情的备份数据
                 // 详情数据
                 form:{
                     billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -1522,6 +1523,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             async billsDetailfun(id){
                 const res = await billsDetail(id)
                 this.form = res.data.data;
+                this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
                 // 如果已经请核就禁用按钮
                 // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                 //     this.detailData.seeDisabled = true

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

@@ -656,6 +656,11 @@
                 type:Boolean,
                 default:false,
             },
+            // 拷贝的详情数据
+            copyFormData:{
+                type:Object,
+                default: {}
+            },
         },
         data(){
             return {
@@ -1399,6 +1404,10 @@
                         return;
                     }
                 }
+                // 判断拷贝详情的数据是否要参数
+                if (popupReminder(this.copyFormData,this.messageData)) {
+                    return this.$message.warning('请先点击右上角保存按钮保存数据')
+                }
                 let obj = {
                     edit:true
                 }
@@ -1469,6 +1478,10 @@
                         return;
                     }
                 }
+                // 判断拷贝详情的数据是否要参数
+                if (popupReminder(this.copyFormData,this.messageData)) {
+                    return this.$message.warning('请先点击右上角保存按钮保存数据')
+                }
                 let obj = {
                     edit:true
                 }

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

@@ -258,7 +258,7 @@
 
                 <el-tab-pane label="费用信息" name="fy"
                              v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1" >
-                    <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
+                    <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">
                     <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" ></document-center>
@@ -360,6 +360,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 billsListAllData:[], // 分单列表数据
                 pageLoading:false, // 全屏的动画
                 saveLoading:false,
+                copyFormData:{}, // 详情的备份数据
                 // 详情数据
                 form:{
                     billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -1619,6 +1620,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             async billsDetailfun(id){
                 const res = await billsDetail(id)
                 this.form = res.data.data;
+                this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
                 // 如果已经请核就禁用按钮
                 // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                 //     this.detailData.seeDisabled = true

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -30,6 +30,8 @@
                               :selectValue="query.businessType"
                               :clearable="true"
                               :buttonIf="false"
+                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
+                              @corpFocus="businessTypeFocus"
                               @corpChange="corpChange($event,'businessType')">
                 </search-query>
             </template>
@@ -115,7 +117,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 24,
                 border: true,
                 index: false,
                 selection: true,
@@ -311,21 +313,7 @@ export default {
                 }
             ],
             // 业务类型
-            businessTypeData:[
-                {
-                    label:'海运出口',
-                    value:'HYCK'
-                },{
-                    label:'海运进口',
-                    value:'HYJK'
-                },{
-                    label:'空运出口',
-                    value:'KYCK'
-                },{
-                    label:'空运进口',
-                    value:'KYJK'
-                }
-            ],
+            businessTypeData:[],
             clientIdData:[], // 委托人
             corpIdData:[], // 结算单位
             srcIdData:[], // 业务员
@@ -415,6 +403,12 @@ export default {
                 this.corpIdData = res.data.data.records
             })
         },
+        // 业务类型
+        businessTypeFocus(){
+            getWorkDicts('profit_business_type_los').then(res=>{
+                this.businessTypeData = res.data.data
+            })
+        },
         // 委托人
         clientIdListfun(cnName){
             getBcorpsList(1,10,{cnName,status: 0}).then(res=>{

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -845,8 +845,10 @@
           </el-form-item>
           <el-form-item label="币别" prop="curId">
             <!-- <el-input v-model="corpsAttnForm.curId"></el-input> -->
-            <search-query ref="SearchQuery" :datalist="rateOptions" title="币别" :filterable="true" :clearable="true"
-              :remote="true" :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+            <search-query ref="SearchQuery"
+                          :selectValue="corpsAttnForm.curId"
+                          :datalist="rateOptions" title="币别" :filterable="true" :clearable="true"
+              :remote="true" :forParameter="{ key: 'id', label: 'code', value: 'id', disabled: 'status' }"
               :disabledStatus="1" @remoteMethod="rateListfun" @corpChange="rateChange">
               <rateManagement></rateManagement>
             </search-query>
@@ -1514,10 +1516,14 @@ export default {
       },
       // 银行信息币别回调
     rateChange(value) {
+       if (!value) {
+           this.$set(this.corpsAttnForm,'curId',null)
+           this.$set(this.corpsAttnForm,'curNo',null)
+       }
       for (let item of this.rateOptions) {
-        if (item.code == value) {
-          this.corpsAttnForm.curId = item.id
-          this.corpsAttnForm.curNo = item.code
+        if (item.id == value) {
+            this.$set(this.corpsAttnForm,'curId',item.id)
+            this.$set(this.corpsAttnForm,'curNo',item.code)
         }
       }
     },

src/views/iosBasicData/paymentDetail/index.vue

@@ -36,6 +36,8 @@
                               :selectValue="query.businessType"
                               :clearable="true"
                               :buttonIf="false"
+                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
+                              @corpFocus="businessTypeFocus"
                               @corpChange="corpChange($event,'businessType')">
                 </search-query>
             </template>
@@ -136,7 +138,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 12,
                 border: true,
                 index: false,
                 selection: true,
@@ -321,21 +323,7 @@ export default {
                 }
             ],
             // 业务类型
-            businessTypeData:[
-                {
-                    label:'海运出口',
-                    value:'HYCK'
-                },{
-                    label:'海运进口',
-                    value:'HYJK'
-                },{
-                    label:'空运出口',
-                    value:'KYCK'
-                },{
-                    label:'空运进口',
-                    value:'KYJK'
-                }
-            ],
+            businessTypeData:[],
             clientIdData:[], // 委托人
             corpIdData:[], // 结算单位
             srcTypeData:[], // 业务来源
@@ -401,14 +389,17 @@ export default {
                 if (value == 'OWN') {
                     // 公司
                     this.srcforParameter = { key:'id', label:'title', value:'title'}
+                    this.findObject(this.option.column, "srcId").label = '公司'
                     this.ownDeptLazyTreefun()
                 }else if (value == 'AGENT') {
                     // 代理
                     this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
+                    this.findObject(this.option.column, "srcId").label = '代理'
                     this.agentBcorpsListfun()
                 }else if (value == 'SALES') {
                     // 业务员
                     this.srcforParameter = { key:'id', label:'name', value:'name'}
+                    this.findObject(this.option.column, "srcId").label = '业务员'
                     this.salesUserGetListfun()
                 }else {}
                 this.$set(this.query,name,value)
@@ -486,6 +477,12 @@ export default {
                 this.corpIdData = res.data.data.records
             })
         },
+        // 业务类型
+        businessTypeFocus(){
+            getWorkDicts('profit_business_type_los').then(res=>{
+                this.businessTypeData = res.data.data
+            })
+        },
         // 委托人
         clientIdListfun(cnName){
             getBcorpsList(1,10,{cnName,status: 0}).then(res=>{

src/views/iosBasicData/paymentSummary/index.vue

@@ -39,6 +39,8 @@
                               :selectValue="query.businessType"
                               :clearable="true"
                               :buttonIf="false"
+                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
+                              @corpFocus="businessTypeFocus"
                               @corpChange="corpChange($event,'businessType')">
                 </search-query>
             </template>
@@ -149,7 +151,7 @@
                     calcHeight: 30,
                     tip: false,
                     searchShow: true,
-                    searchMenuSpan: 6,
+                    searchMenuSpan: 12,
                     border: true,
                     index: false,
                     selection: true,
@@ -299,21 +301,7 @@
                     }
                 ],
                 // 业务类型
-                businessTypeData:[
-                    {
-                        label:'海运出口',
-                        value:'HYCK'
-                    },{
-                        label:'海运进口',
-                        value:'HYJK'
-                    },{
-                        label:'空运出口',
-                        value:'KYCK'
-                    },{
-                        label:'空运进口',
-                        value:'KYJK'
-                    }
-                ],
+                businessTypeData:[],
                 clientIdData:[], // 委托人
                 corpIdData:[], // 结算单位
                 srcTypeData:[], // 业务来源
@@ -390,14 +378,17 @@
                     if (value == 'OWN') {
                         // 公司
                         this.srcforParameter = { key:'id', label:'title', value:'title'}
+                        this.findObject(this.option.column, "srcId").label = '公司'
                         this.ownDeptLazyTreefun()
                     }else if (value == 'AGENT') {
                         // 代理
                         this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
+                        this.findObject(this.option.column, "srcId").label = '代理'
                         this.agentBcorpsListfun()
                     }else if (value == 'SALES') {
                         // 业务员
                         this.srcforParameter = { key:'id', label:'name', value:'name'}
+                        this.findObject(this.option.column, "srcId").label = '业务员'
                         this.salesUserGetListfun()
                     }else {}
                     this.$set(this.query,name,value)
@@ -475,6 +466,12 @@
                     this.corpIdData = res.data.data.records
                 })
             },
+            // 业务类型
+            businessTypeFocus(){
+                getWorkDicts('profit_business_type_los').then(res=>{
+                    this.businessTypeData = res.data.data
+                })
+            },
             // 委托人
             clientIdListfun(cnName){
                 getBcorpsList(1,10,{cnName,status: 0}).then(res=>{

src/views/tirePartsMall/basicData/customerInformation/components/limitrecord.vue

@@ -2,9 +2,9 @@
   <basic-container>
     <el-tabs v-model="tabData" type="card" @tab-click="handleClick">
         <el-tab-pane label="修改额度" name="XGED">
-            <avue-form ref="formEditRef" v-model="formEidt" :option="optionEidt">
+            <avue-form ref="formEditRef" v-model="formEidtData" :option="optionEidt">
                 <template slot="amountUpdate">
-                    <el-input v-model="formEidt.amountUpdate" size="small" clearable
+                    <el-input v-model="formEidtData.amountUpdate" size="small" clearable
                               placeholder="请输入修改额度" @input="amountInput" ></el-input>
                 </template>
             </avue-form>
@@ -95,7 +95,9 @@
                   },
               ]
           },
-          formEidt:{}, // 表单数据
+          formEidtData:{
+              amountOld:this.amountOld?this.amountOld:0
+          }, // 表单数据
         form: {},
         query: {},
         loading: true,
@@ -186,7 +188,7 @@
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(340), this.optionList);
-        this.$set(this.formEidt,'amountOld',this.amountOld?this.amountOld:0)
+        // this.$set(this.formEidtData,'amountOld',this.amountOld?this.amountOld:0)
     },
     methods: {
         // tabs 切换
@@ -199,8 +201,8 @@
         },
       // 修改额度input 监听
       amountInput(value){
-          this.$set(this.formEidt,'amountUpdate',regularBurdenfloating(value))
-          this.$set(this.formEidt,'amountNew',Number(this.formEidt.amountOld) + Number(this.formEidt.amountUpdate))
+          this.$set(this.formEidtData,'amountUpdate',regularBurdenfloating(value))
+          this.$set(this.formEidtData,'amountNew',Number(this.formEidtData.amountOld) + Number(this.formEidtData.amountUpdate))
       },
       rowSave(row, done, loading) {
         limitrecordSubmit(row).then(() => {

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

@@ -639,31 +639,36 @@ export default {
                 done()
                 if (valid) {
                     limitrecordSubmit({
-                        ...this.$refs.limitrecord.formEidt,
+                        ...this.$refs.limitrecord.formEidtData,
                         pid:this.form.id
                     }).then(res=>{
                         this.$message.success('修改成功')
-                        this.$set(this.$refs.limitrecord,'formEidt',{})
+                        this.$refs.limitrecord.$refs.formEditRef.resetForm()
                         this.dialogVisibleED = false
                         this.getDetail(this.form.id)
                     })
                 }
             })
         }else {
-            this.$set(this.$refs.limitrecord,'formEidt',{})
+            this.$refs.limitrecord.$refs.formEditRef.resetForm()
             this.dialogVisibleED = false
             this.getDetail(this.form.id)
         }
     },
     // 额度弹窗取消
     cancellationEDfun(){
-        this.$set(this.$refs.limitrecord,'formEidt',{})
+        this.$refs.limitrecord.$refs.formEditRef.resetForm()
         this.dialogVisibleED = false
         this.getDetail(this.form.id)
     },
     // 额度弹窗开启
     limitPopupfun(){
         this.dialogVisibleED = true
+        this.$nextTick(()=>{
+            this.$set(this.$refs.limitrecord,'formEidtData',{
+                amountOld:this.form.limitAmount
+            })
+        })
     },
     // 启用或禁用
     editEnable() {

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

@@ -73,14 +73,14 @@ export const option = {
     },
     {
       label: "信用额度",
-      prop: "creditLimit",
-      overHidden: true,
-    },
-    {
-      label: "使用信用额度",
-      prop: "useCreditLimit",
+      prop: "limitAmount",
       overHidden: true,
     },
+    // {
+    //   label: "使用信用额度",
+    //   prop: "useCreditLimit",
+    //   overHidden: true,
+    // },
     {
       label: "是否启用",
       prop: "enableOrNot",

src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -45,6 +45,7 @@
             <template slot-scope="{type,size,row,$index}" slot="menuLeft">
               <el-button type="primary" icon="el-icon-plus" size="small" @click="commoditySelection">选择产品
               </el-button>
+              <el-button type="primary" size="mini" icon="el-icon-top" @click="outExport">导出</el-button>
               <el-button class="el-icon-bottom" type="warning" size="small" @click="excelBoxfun('名称')">
                 按名称导入
               </el-button>
@@ -533,6 +534,7 @@ export default {
     }
   },
   methods: {
+      // 导入
       excelBoxfun(name){
           if (name == '名称') {
               this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/productLaunch/import-productLaunch'
@@ -543,6 +545,32 @@ export default {
           }
           this.excelBox = true
       },
+      // 导出
+      outExport() {
+          let config = { params: { ...this.search } }
+          if (config.params) {
+              for (const propName of Object.keys(config.params)) {
+                  const value = config.params[propName];
+                  if (value !== null && typeof (value) !== "undefined") {
+                      if (value instanceof Array) {
+                          for (const key of Object.keys(value)) {
+                              let params = propName + '[' + key + ']';
+                              config.params[params] = value[key]
+                          }
+                          delete config.params[propName]
+                      }
+                  }
+              }
+          }
+          const routeData = this.$router.resolve({
+              path: '/api/blade-sales-part/productLaunch/exportList',      //跳转目标窗口的地址
+              query: {
+                  ...config.params,    //括号内是要传递给新窗口的参数
+                  identification: this.url
+              }
+          })
+          window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      },
       // 商城图片上传
       onSuccess(response, file, fileList){
           let version = '2'

src/views/tirePartsMall/inventory/index.vue

@@ -14,21 +14,21 @@
             @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 268)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 268)" :page.sync="page">
             <template slot-scope="{type,size,row,$index}" slot="menuLeft">
-              <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
-                <!--<el-button type="primary" icon="el-icon-printer" size="small"-->
-                <!--           @click="handlePrint">打印</el-button>-->
                 <div style="display: flex;align-items: center;">
-                    <div style="font-size: 14px;color: #2d8cf0;margin-right: 30px;">
-                        <span>库存数量总计：</span>
-                        <span>{{stockSum.balanceQuantity}}</span>
-                    </div>
-                    <div style="font-size: 14px;color: #2d8cf0;">
-                        <span>库存金额总计：</span>
-                        <span>{{stockSum.inventoryAmount}}</span>
+                    <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
+                    <!--<el-button type="primary" icon="el-icon-printer" size="small"-->
+                    <!--           @click="handlePrint">打印</el-button>-->
+                    <div style="display: flex;align-items: center;">
+                        <div class="buttonBox">
+                            <span>库存数量总计：</span>
+                            <span>{{stockSum.balanceQuantity}}</span>
+                        </div>
+                        <div class="buttonBox" >
+                            <span>库存金额总计：</span>
+                            <span>{{stockSum.inventoryAmount}}</span>
+                        </div>
                     </div>
                 </div>
-
-
             </template>
             <template slot-scope="{ row }" slot="balanceQuantity">
               <span style="color: #409EFF;cursor: pointer" @click.stop="storeInventoryOpen(row)">{{ row.balanceQuantity }}
@@ -107,7 +107,7 @@ export default {
         highlightCurrentRow: true,
         dialogWidth: "70%",
         summaryText: "合计",
-        showSummary: false,
+        showSummary: true,
         sumColumnList: [
           {
             name: 'balanceQuantity',
@@ -429,6 +429,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.buttonBox {
+    font-size: 12px;
+    color: #909399;
+    margin-left: 10px;
+    border: 1px solid #d3d4d6;
+    border-radius: 3px;
+    padding: 6px 10px;
+    background: #f4f4f5;
+}
 .page-crad ::v-deep .basic-container__card {
   height: 94.2vh;
 }

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -49,6 +49,21 @@
         <div style="margin-top: 50px">
             <trade-card title="基础信息">
                 <avue-form :option="optionForm" v-model="form" ref="form">
+                    <tempalte slot="customerName" slot-scope="{ row }">
+                        <search-query :datalist="customerData"
+                                      :selectValue="form.customerName"
+                                      :clearable="true"
+                                      :buttonIf="false"
+                                      :filterable="true"
+                                      :remote="true"
+                                      :disabled="findObject(optionForm.column, 'customerName').disabled"
+                                      placeholder="请选择客户"
+                                      :forParameter="{key:'id',label:'cname',value:'cname'}"
+                                      @corpFocus="KHgetListfun"
+                                      @remoteMethod="KHgetListfun"
+                                      @corpChange="KHcorpChange">
+                        </search-query>
+                    </tempalte>
                     <template slot-scope="{row,index}" slot="contacts">
                         <el-select v-model="form.contacts" placeholder="请选择" size="small"
                                    style="width:60%" clearable filterable allow-create default-first-option
@@ -297,6 +312,10 @@ import { number } from "echarts";
 import {getCorpTypes} from "@/api/tirePartsMall/basicData/commodityInformation";
 import {getWorkDicts} from "../../../../api/system/dictbiz";
 import losbfeestemplate from "@/views/iosBasicData/losbfeestemplate/index.vue";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import {
+    getList as KHgetList
+} from "@/api/tirePartsMall/basicData/customerInformation";
 export default {
     name: "detailsPage",
 
@@ -391,65 +410,80 @@ export default {
                 paymentRecordsList: [],
                 outboundRecordsList: []
             },
+            customerData:[], // 客户数据
             optionForm: {
                 menuBtn: false,
                 span: 8,
                 disabled: false,
                 column: [{
-                    label: '客户',
-                    prop: "customerId",
+                    label: '客户1',
+                    prop: "customerName",
                     disabled: false,
-                    remote: true,
-                    type: 'select',
-                    props: {
-                        label: 'cname',
-                        value: 'id'
-                    },
-                    cascader: ['recAddress'],
-                    click: () => {
-                        this.$refs.form.dicInit()
-                    },
-                    change: (data) => {
-                        if (!this.onLoad.id) {
-                            // this.$set(this.optionContactsBack, "addBtn", true)
-                            // this['optionContacts'] = this['optionContactsBack'];
-                            // this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
-                        }
-                        if (this.$refs.form.DIC.customerId || !this.onLoad.id) {
-                            getCustom({ id: data.value }).then(res => {
-                                if (res.data.data) {
-                                    this.dicUrlWithCustomId = res.data.data.id ? res.data.data.id : ''
-                                    // this.form.storageId ? this.form.storageId : res.data.data.deliveryWarehouseId
-                                    // this.form.storageId = res.data.data.deliveryWarehouseId
-                                    this.form.storageId = this.form.storageId ? this.form.storageId : res.data.data.deliveryWarehouseId
-                                    this.form.contacts = res.data.data.corpsAttnList[0].cname
-                                    this.form.phone = res.data.data.corpsAttnList[0].tel
-                                    this.contactsOption = res.data.data.corpsAddrList
-                                    this.form.recAddress = res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress
-                                    this.form.salerId = res.data.data.salesmanId?res.data.data.salesmanId:''
-                                }
-                            })
-                        }
-
-                        // if (this.$refs.form.DIC.customerId || data.value) {
-                        //     for (let item of this.$refs.form.DIC.customerId) {
-                        //         if (item.id == data.value) {
-                        //             console.log(data);
-                        //             console.log(this.$refs.form);
-                        //             console.log(item);
-                        //             //   后端返回数据暂无联系人、地址等数据，无法下拉默认
-                        //             this.form.phone = item.tel
-                        //         }
-                        //     }
-                        // }
-                    },
-                    dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=1',
+                    formslot:true,
                     rules: [{
                         required: true,
                         message: " ",
                         trigger: "blur"
                     }]
-                }, {
+                },
+                // {
+                //     label: '客户',
+                //     prop: "customerId",
+                //     disabled: false,
+                //     remote: true,
+                //     type: 'select',
+                //     props: {
+                //         label: 'cname',
+                //         value: 'id',
+                //         res:'data.records'
+                //     },
+                //     cascader: ['recAddress'],
+                //     click: () => {
+                //         this.$refs.form.dicInit()
+                //     },
+                //     change: (data) => {
+                //         if (!this.onLoad.id) {
+                //             // this.$set(this.optionContactsBack, "addBtn", true)
+                //             // this['optionContacts'] = this['optionContactsBack'];
+                //             // this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
+                //         }
+                //         if (this.$refs.form.DIC.customerId || !this.onLoad.id) {
+                //             getCustom({ id: data.value }).then(res => {
+                //                 if (res.data.data) {
+                //                     this.dicUrlWithCustomId = res.data.data.id ? res.data.data.id : ''
+                //                     // this.form.storageId ? this.form.storageId : res.data.data.deliveryWarehouseId
+                //                     // this.form.storageId = res.data.data.deliveryWarehouseId
+                //                     this.form.storageId = this.form.storageId ? this.form.storageId : res.data.data.deliveryWarehouseId
+                //                     this.form.contacts = res.data.data.corpsAttnList[0].cname
+                //                     this.form.phone = res.data.data.corpsAttnList[0].tel
+                //                     this.contactsOption = res.data.data.corpsAddrList
+                //                     this.form.recAddress = res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress
+                //                     this.form.salerId = res.data.data.salesmanId?res.data.data.salesmanId:''
+                //                 }
+                //             })
+                //         }
+                //
+                //         // if (this.$refs.form.DIC.customerId || data.value) {
+                //         //     for (let item of this.$refs.form.DIC.customerId) {
+                //         //         if (item.id == data.value) {
+                //         //             console.log(data);
+                //         //             console.log(this.$refs.form);
+                //         //             console.log(item);
+                //         //             //   后端返回数据暂无联系人、地址等数据，无法下拉默认
+                //         //             this.form.phone = item.tel
+                //         //         }
+                //         //     }
+                //         // }
+                //     },
+                //     // dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=1',
+                //     dicUrl: '/api/blade-sales-part/corpsDesc/list?cname={{key}}&corpType=KH',
+                //     rules: [{
+                //         required: true,
+                //         message: " ",
+                //         trigger: "blur"
+                //     }]
+                // },
+                {
                     label: '业务员',
                     disabled:false,
                     prop: "salerId",
@@ -953,7 +987,7 @@ export default {
             }
         }
     },
-    components: { reportDialog, check, checkSchedule },
+    components: {SearchQuery, reportDialog, check, checkSchedule },
     props: {
         onLoad: Object,
         detailData: Object
@@ -1210,6 +1244,41 @@ export default {
         }
     },
     methods: {
+        // 客户监听
+        KHcorpChange(value){
+            for (let item of this.customerData) {
+                if (item.cname == value) {
+                    this.$set(this.form,'customerId',item.id)
+                    this.$set(this.form,'customerName',item.cname)
+
+                    if (this.$refs.form.DIC.customerId || !this.onLoad.id) {
+                        getCustom({ id: item.id }).then(res => {
+                            if (res.data.data) {
+                                this.dicUrlWithCustomId = res.data.data.id ? res.data.data.id : ''
+                                this.form.storageId = this.form.storageId ? this.form.storageId : res.data.data.deliveryWarehouseId
+                                this.form.contacts = res.data.data.corpsAttnList[0].cname
+                                this.form.phone = res.data.data.corpsAttnList[0].tel
+                                this.contactsOption = res.data.data.corpsAddrList
+                                this.form.recAddress = res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress
+                                this.form.salerId = res.data.data.salesmanId?res.data.data.salesmanId:''
+                            }
+                        })
+                    }
+
+                }
+            }
+        },
+        // 获取客户数据
+        KHgetListfun(cname){
+            KHgetList({
+                current:1,
+                size:10,
+                corpType:'KH',
+                cname:cname?cname:null,
+            }).then(res=>{
+                this.customerData = res.data.data.records
+            })
+        },
         // 获取详细明细信息
         getDetailsfun(){
             getDetails({
@@ -1542,7 +1611,7 @@ export default {
                     this.isDisabledTask = false;
                     this.viewDisabled = false;
                     this.optionForm.column.forEach(its => {
-                        if (its.prop == 'customerId') {
+                        if (its.prop == 'customerName') {
                             this.$set(its, 'disabled', true)
                         }
                         if (its.prop == 'storageId') {