From 9036b0e878cb4cf0916c3a834834fea30b68aee2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 11 Jun 2025 19:08:15 +0800
Subject: [PATCH] md

---
 src/layout/components/TopNotice/index.vue     |  4 +
 .../EmisSupplierMultiplePicker.vue            |  6 +-
 src/views/emis/emisCommissionDtl/index.vue    | 76 ++++++++++++++++---
 src/views/emis/emisCommissionProfit/index.vue | 43 +++++++----
 .../CenterInvoiceRecordDealListPanel.vue      | 10 ++-
 .../emisTransPlanRuleForm.vue                 | 18 ++---
 .../emisWaybillAjustApply/adjustPanel.vue     | 14 ++--
 .../emisWaybillAjustApplyForm.vue             | 17 ++++-
 8 files changed, 136 insertions(+), 52 deletions(-)

diff --git a/src/layout/components/TopNotice/index.vue b/src/layout/components/TopNotice/index.vue
index 0d970434..eb675515 100644
--- a/src/layout/components/TopNotice/index.vue
+++ b/src/layout/components/TopNotice/index.vue
@@ -232,6 +232,10 @@ export default {
 
     showNotice(item){
       this.setAddReadTimes(item.noticeId);
+      this.$router.push({
+        path: item.clickPath,
+      });
+
     },
     exit() {
       if (this.ws) {
diff --git a/src/views/emis/EmisBaseTools/EmisSupplierMultiplePicker.vue b/src/views/emis/EmisBaseTools/EmisSupplierMultiplePicker.vue
index 807c9538..e26ac20c 100644
--- a/src/views/emis/EmisBaseTools/EmisSupplierMultiplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisSupplierMultiplePicker.vue
@@ -55,8 +55,8 @@ data() {
     queryParams:{
       pageNum: 1,
       pageSize: 50,
-      custNo:this.value,
-      custName:null
+      code:this.value,
+      name:null
     }
   };
 },
@@ -76,7 +76,7 @@ created() {
 methods: {
   confirmOk(){
 
-    let selIdStr="";
+    let selCodeStr="";
     let selNameStr="";
 
     if(this.svalue&&this.svalue.length>0){
diff --git a/src/views/emis/emisCommissionDtl/index.vue b/src/views/emis/emisCommissionDtl/index.vue
index 91883648..3ec76b12 100644
--- a/src/views/emis/emisCommissionDtl/index.vue
+++ b/src/views/emis/emisCommissionDtl/index.vue
@@ -27,7 +27,14 @@
               <el-date-picker  size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
       </el-form-item>
 
-      <el-form-item label="支付方式" prop="paymentType" >
+      <el-form-item   :label="$t('支付方式')" prop="paymentType" >
+        <el-select  clearable v-model="queryParams.paymentType" placeholder="支付方式" style="width:100%">
+          <el-option key="1" label="现金" :value="'1,3,6'+''"></el-option>
+          <el-option key="2" label="月结" :value="'2,4,5'+''"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <!-- <el-form-item label="支付方式" prop="paymentType" >
           <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
             <el-option
               v-for="dict in dict.type.emis_payment_type"
@@ -36,7 +43,7 @@
               :value="dict.value"
             ></el-option>
           </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
 
       <!-- <el-form-item label="" prop="empCode">
@@ -74,7 +81,13 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
+
+
+
            >
+<!--
+                show-summary
+          :summary-method="getSummaries" -->
 
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
@@ -165,18 +178,18 @@
             <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.calcFeeType"/>
           </template>
       </el-table-column> -->
-      <!-- <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
+      <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
             <span v-if="scope.row.paymentType==1 || scope.row.paymentType==3 || scope.row.paymentType==6">现金</span>
             <span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">月结</span>
           </template>
-      </el-table-column> -->
+      </el-table-column>
 
-      <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
+      <!-- <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -353,9 +366,25 @@ export default {
       }
     };
   },
+  watch: {
+      $route () {
+	      if(this.$route.query.action=='queryProfitDtl'){
+          this.queryParams.empName=this.$route.query.empName;
+          this.queryParams.billMonth=this.$route.query.billMonth;
+          this.queryParams.paymentType=this.$route.query.paymentType;
+          this.getList();
+	      }
+	    }
+  },
   created() {
     this.formBatch.calcType='1';
 
+    if(this.$route.query.action=='queryProfitDtl'){
+          this.queryParams.empName=this.$route.query.empName;
+          this.queryParams.billMonth=this.$route.query.billMonth;
+          this.queryParams.paymentType=this.$route.query.paymentType;
+	   }
+
     this.getList();
   },
   methods: {
@@ -505,12 +534,35 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-   /** 导出按钮操作 */
-    // handleExport() {
-    //   this.download('emis/emisBaseInvoiceChInfo/export', {
-    //     ...this.queryParams
-    //   }, `emisBaseInvoiceChInfo_${new Date().getTime()}.xlsx`)
-    // },
+    //指定列求和
+    getSummaries(param) {
+       const { columns, data } = param;
+       const sums = [];
+       columns.forEach((column, index) => {
+             if (index === 0) {
+               sums[index] = '合计';
+               return;
+             }
+             if (
+               column.property === 'money'
+               ) {
+                 const values = data.map(item => Number(item.money));
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2);
+             }
+
+       });
+     console.log(sums);
+     return sums
+   },
+
     handleExport() {
       const loadingInstance = this.$loading({
             text: '正在导出...'
diff --git a/src/views/emis/emisCommissionProfit/index.vue b/src/views/emis/emisCommissionProfit/index.vue
index 03f720bd..72f63664 100644
--- a/src/views/emis/emisCommissionProfit/index.vue
+++ b/src/views/emis/emisCommissionProfit/index.vue
@@ -86,8 +86,16 @@
 
       <el-table-column :label="$t('员工名称')" align="center" prop="empName" width="100" />
       <el-table-column :label="$t('月份')" align="center" prop="billMonth" width="100" />
-      <el-table-column :label="$t('现金提成')" align="center" prop="money" width="100" />
-      <el-table-column :label="$t('月结提成')" align="center" prop="monthMoney" width="100" />
+      <el-table-column :label="$t('现金提成')" align="center" prop="money" width="100" >
+        <template slot-scope="scope">
+          <div  class="link-type" @click="handleShowDtlList(scope.row,'1,3,6')">{{ scope.row.money }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('月结提成')" align="center" prop="monthMoney" width="100" >
+         <template slot-scope="scope">
+          <div  class="link-type" @click="handleShowDtlList(scope.row,'2,4,5')">{{ scope.row.monthMoney }}</div>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="170" />
       <el-table-column :label="$t('更新时间')" align="center" prop="updateTime" width="170" />
 
@@ -173,20 +181,6 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 更新站点时间范围
-      daterangeStartDate: [],
-      // 更新站点时间范围
-      daterangeEndDate: [],
-      // 更新站点时间范围
-      daterangeAuditDate: [],
-      // 更新站点时间范围
-      daterangeConfirmCenterDate: [],
-      // 更新站点时间范围
-      daterangeConfirmSiteDate: [],
-      // 更新站点时间范围
-      daterangeCreateTime: [],
-      // 更新站点时间范围
-      daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -225,6 +219,7 @@ export default {
       },
     };
   },
+
   created() {
     this.getList();
   },
@@ -245,6 +240,22 @@ export default {
       });
     },
 
+    handleShowDtlList(row,paymentType){
+        let item0=row;
+        this.$router.push(
+          {
+            path: '/Commission/EmisCommissionDtl',
+            query: {
+              action: "queryProfitDtl",
+              empName: item0.empName,
+              billMonth: item0.billMonth,
+              paymentType:paymentType,
+              '_t':(new Date()).getTime()
+            }
+          }
+        );
+    },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
index 993a76bc..edf95e3e 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
@@ -82,6 +82,14 @@
         />
       </el-form-item>
 
+      <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="queryParams.remark"
+              :placeholder="$t('备注')"
+              clearable
+            />
+          </el-form-item>
+
 
     </SearchForm>
 
@@ -232,7 +240,7 @@
       <el-table-column :label="$t('申请站点')" align="center" prop="createSiteName" min-width="100" :show-overflow-tooltip="true"/>
       <!-- <el-table-column :label="$t('纸质发票邮寄地址')" align="center" prop="recieveAddress" min-width="100" /> -->
       <el-table-column :label="$t('邮箱')" align="center" prop="email" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="180" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="170" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('审核人')" align="center" prop="auditManName" min-width="100" />
       <el-table-column :label="$t('操作人')" align="center" prop="opManName" min-width="100" />
diff --git a/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue b/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue
index 7065d73b..f6b1874a 100644
--- a/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue
+++ b/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue
@@ -10,17 +10,13 @@
           <el-col :span="12">
             <el-form-item label="产品类型" prop="productType">
                <TransProductMultiplePicker placeholder="产品类型" v-model="form.productType" :transLineCode="form.lineCode"></TransProductMultiplePicker>
-                <!-- <TransProductPicker placeholder="产品类型" v-model="form.productType" :transLineCode="form.lineCode" ></TransProductPicker> -->
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="供应商" prop="supplierCode">
-
                 <EmisSupplierMultiplePicker :placeholder="$t('请选择')"  v-model="form.supplierCode"  ></EmisSupplierMultiplePicker>
-
-              /Users/alan/work/git/tanex56/emis-frontend/src/views/emis/EmisBaseTools/EmisSupplierMultiplePicker.vue
-
-                <!-- <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="form.supplierCode"  ></EmisSupplierPicker> -->
+              <!-- /Users/alan/work/git/tanex56/emis-frontend/src/views/emis/EmisBaseTools/EmisSupplierMultiplePicker.vue -->
+              <!-- <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="form.supplierCode"  ></EmisSupplierPicker> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -82,7 +78,6 @@
 import { listEmisTransPlanRule, getEmisTransPlanRule, delEmisTransPlanRule, addEmisTransPlanRule, updateEmisTransPlanRule } from "@/api/emis/emisTransPlanRule";
 
 import emisTransPlanRuleForm from '@/views/emis/emisTransPlanRule/emisTransPlanRuleForm';
-import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
 
 import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
@@ -91,6 +86,10 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
 import TransProductMultiplePicker from '@/views/emis/EmisBaseTools/TransProductMultiplePicker.vue';
 
+
+import EmisSupplierMultiplePicker from '@/views/emis/EmisBaseTools/EmisSupplierMultiplePicker';
+// import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
+
 import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 export default {
@@ -103,6 +102,7 @@ export default {
   components: {
     emisTransPlanRuleForm,
     EmisSupplierPicker,
+    EmisSupplierMultiplePicker,
     EmisSiteSimplePicker1,
     EmisSiteSimplePicker2,
     TransLinePicker,
@@ -124,9 +124,7 @@ export default {
         id: [
           { required: true, message: "id不能为空", trigger: "blur" }
         ],
-        delFlag: [
-          { required: true, message: "删除标志（0代表存在不能为空", trigger: "blur" }
-        ],
+
       }
     };
   },
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index d80e6452..4adf7595 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -25,7 +25,7 @@
                       <span >{{billDetail.reciever.countryName}}</span>
                     </el-col>
                     <el-col :span="14">
-                      <el-form-item label="目的国" prop="transLine">
+                      <el-form-item label="目的国" prop="transLine" v-if="form.reciever!=null">
                         <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
                       </el-form-item>
                     </el-col>
@@ -41,7 +41,7 @@
                       <span >{{billDetail.transLineTypeName}}</span>
                     </el-col>
                     <el-col :span="14">
-                      <el-form-item label="线路" prop="transLine">
+                      <el-form-item label="线路" prop="transLine" v-if="form.reciever!=null">
                         <TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" isInitiated="true"  @onChange="calcBillFee" ></TransLinePicker>
                       </el-form-item>
                     </el-col>
@@ -599,7 +599,7 @@
                         <span>寄件信息调整</span>
                       </el-col>
                       <el-col :span="7" class="md-value">
-                        <span>
+                        <span v-if="billDetail.sender!=null">
                             {{ billDetail.sender.name }}
                             {{ billDetail.sender.phone }}
                             {{ billDetail.sender.company }}
@@ -612,7 +612,7 @@
                       </el-col>
                       <el-col :span="14">
 
-                        <el-row :gutter="0" style="display: flex;flex-wrap: wrap;background: #fdfdfd;padding:15px">
+                        <el-row v-if="form.sender!=null" :gutter="0" style="display: flex;flex-wrap: wrap;background: #fdfdfd;padding:15px" >
                             <el-col :span="12">
                               <el-form-item :label="$t('寄件人')" prop="sender.name">
                                 <CustomerAddressSimplePicker0 addressType="1" :useSiteCode="form.sendSiteCode" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
@@ -657,7 +657,7 @@
                         <span>收件信息调整</span>
                       </el-col>
                       <el-col :span="7" class="md-value">
-                        <span>
+                        <span v-if="billDetail.reciever!=null">
                             {{ billDetail.reciever.name }}
                             {{ billDetail.reciever.phone }}
                             {{ billDetail.reciever.company }}
@@ -670,7 +670,7 @@
                       </el-col>
                       <el-col :span="14">
 
-                        <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
+                        <el-row v-if="form.reciever!=null" :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
                             <el-col :span="12">
                               <el-form-item  :label="$t('收件人')" prop="reciever.name">
                                 <CustomerAddressSimplePicker1 addressType="2" :useSiteCode="form.sendSiteCode"  :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
@@ -720,7 +720,7 @@
                       </el-col>
                       <el-col :span="14">
 
-                        <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
+                        <el-row  v-if="form.reciever!=null" :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
 
                             <el-col :span="12">
                               <el-form-item  :label="$t('目的地')"  prop="destinationCode">
diff --git a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue
index b0d46c22..67204d49 100644
--- a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue
+++ b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue
@@ -141,9 +141,20 @@ export default {
             this.form = response.data;
             this.form.jsonDataObj=JSON.parse(this.form.jsonData);
             console.log("===>this.form.jsonDataObj ==>",this.form.jsonDataObj);
-            this.billDetail=this.form.jsonDataObj.oldValue;
-            this.form.jsonDataObj.oldValue=Object.assign({},this.billDetail);
-            this.form.jsonDataObj.newValue=Object.assign({},this.form.jsonDataObj.newValue);
+
+            if(this.form.jsonDataObj.oldValue!=null){
+              this.billDetail=this.form.jsonDataObj.oldValue;
+              this.form.jsonDataObj.oldValue=Object.assign({},this.billDetail);
+            }else{
+              this.$set(this.form.jsonDataObj,'oldValue',{})
+            }
+
+
+            if(this.form.jsonDataObj.newValue!=null){
+              this.form.jsonDataObj.newValue=Object.assign({},this.form.jsonDataObj.newValue);
+            }else{
+              this.$set(this.form.jsonDataObj,'newValue',{})
+            }
 
             // 再次申请
             console.log("===>this.isReApply ==>",this.isReApply);