From 2aaca921ebb74c8bc7bdc035e778554daf0baa93 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 15 Oct 2024 14:05:08 +0800
Subject: [PATCH] md

---
 src/views/emis/emisRegion/emisRegionForm.vue  |  6 +--
 .../emisSettleBill/panel/SiteConfimPanel.vue  |  8 ++-
 .../emisWaybill/statpanel/DestStatPanel.vue   | 46 +++++++++++++---
 .../statpanel/ScanDtlAllListPanel.vue         | 53 +++++++++++++-----
 .../statpanel/ScanDtlListPanel.vue            | 54 ++++++++++++++-----
 .../emisWaybill/statpanel/SendStatPanel.vue   | 52 +++++++++++++++---
 .../emisWaybillAjustApply/adjustPanel.vue     | 32 +++++------
 7 files changed, 192 insertions(+), 59 deletions(-)

diff --git a/src/views/emis/emisRegion/emisRegionForm.vue b/src/views/emis/emisRegion/emisRegionForm.vue
index 3943a0d5..ca9df35e 100644
--- a/src/views/emis/emisRegion/emisRegionForm.vue
+++ b/src/views/emis/emisRegion/emisRegionForm.vue
@@ -49,7 +49,7 @@
                    <ProvincePicker v-model="form.parentCode" :countryCode="form.countryCode" ></ProvincePicker>
                 </div>
                 <div style="display:inline-flex" v-if="form.regionType==3">
-                   <ProvincePicker v-model="provinceCode" :countryCode="form.countryCode" ></ProvincePicker>
+                   <!-- <ProvincePicker v-model="provinceCode" :countryCode="form.countryCode" ></ProvincePicker> -->
                    <CityPicker v-model="form.parentCode" :parentCode="provinceCode" ></CityPicker>
                 </div>
                 <div style="display:inline-flex" v-if="form.regionType==4">
@@ -61,12 +61,12 @@
                 <!-- <RegionPcdTreePicker :placeholder="$t('国家')" size="mini" :regionType="form.regionType" :countryCode="form.countryCode" v-model="form.parentCode"></RegionPcdTreePicker> -->
               </el-form-item>
             </el-col>
-            <el-col :span="12"  v-if="form.regionType==1 || form.regionType==2" >
+            <el-col :span="12"  v-if="form.regionType==1 || form.regionType==2 || form.regionType==3" >
               <el-form-item label="寄件片区" prop="sendAreaId"  label-width="100px">
                   <CountryAreaPicker :placeholder="$t('区域')" :countryCode="form.countryCode" v-model="form.sendAreaId" ></CountryAreaPicker>
               </el-form-item>
             </el-col>
-            <el-col :span="12"  v-if="form.regionType==1 || form.regionType==2" >
+            <el-col :span="12"  v-if="form.regionType==1 || form.regionType==2 || form.regionType==3" >
               <el-form-item label="派件片区" prop="areaId" label-width="100px">
                   <CountryAreaPicker :placeholder="$t('区域')" :countryCode="form.countryCode" v-model="form.areaId" ></CountryAreaPicker>
               </el-form-item>
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index d36f5954..fb1b4163 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -22,6 +22,12 @@
             <el-form-item label="账单月份" prop="billMonth">
               <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
             </el-form-item>
+            <el-form-item   :label="$t('支付方式')" prop="settleType" label-width="100px">
+              <el-select  clearable v-model="queryParams.settleType" placeholder="支付方式" style="width:100%">
+                <el-option key="1" label="现金" value="1"></el-option>
+                  <el-option key="2" label="月结" value="2"></el-option>
+              </el-select>
+            </el-form-item>
 
             <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
               <el-select  clearable v-model="queryParams.chargeStatus" placeholder="核销状态" style="width:100%">
@@ -163,7 +169,7 @@
             <el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" width="200" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('账单月份')" align="center" prop="billMonth" width="80" />
-            <el-table-column :label="$t('账单期间')" align="center" prop="billMonth" width="200" :show-overflow-tooltip="true">
+            <el-table-column :label="$t('账单期间')" align="center" prop="billRange" width="200" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                   <div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
               </template>
diff --git a/src/views/emis/emisWaybill/statpanel/DestStatPanel.vue b/src/views/emis/emisWaybill/statpanel/DestStatPanel.vue
index aeee6027..eeb2bbd4 100644
--- a/src/views/emis/emisWaybill/statpanel/DestStatPanel.vue
+++ b/src/views/emis/emisWaybill/statpanel/DestStatPanel.vue
@@ -69,10 +69,10 @@
             <el-table-column :label="$t('录单日期')" align="center" prop="sendDate" width="100" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('目的财务中心')" align="center" prop="destinationCenterName" width="120" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" width="150" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('票数')" align="center" prop="totalNum" width="100" />
-            <el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" width="100" />
-            <el-table-column :label="$t('结算重量')" align="center" prop="totalSettlementWeight" width="100" />
-            <el-table-column :label="$t('体积重量')" align="center" prop="totalVolumeWeight" width="100" />
+            <el-table-column :label="$t('票数')" align="center" prop="totalNum" width="120" :sortable="true"/>
+            <el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" width="120" :sortable="true"/>
+            <el-table-column :label="$t('结算重量')" align="center" prop="totalSettlementWeight" width="120" :sortable="true"/>
+            <el-table-column :label="$t('体积重量')" align="center" prop="totalVolumeWeight" width="120" :sortable="true"/>
       </XdTable>
 
   </XdPageContainer>
@@ -369,11 +369,41 @@ export default {
       this.multiple = !selection.length
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
-    handleSortChange(column) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
+
+    getProperty(obj, str) {
+      str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
+      let arr = str.split(".");
+      for (let i in arr) {
+        obj = obj[arr[i]] || "";
+      }
+      return obj;
     },
+   sortFun: function (attr, rev) {
+      //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序
+      if (rev == undefined||rev==null) {
+          rev = 1;
+      } else {
+          rev = (rev) ? 1 : -1;
+      }
+      let that=this;
+      return function (a, b) {
+          a = that.getProperty(a,attr);
+          b = that.getProperty(b,attr);
+          if (a < b) {
+              return rev * -1;
+          }
+          if (a > b) {
+              return rev * 1;
+          }
+          return 0;
+      }
+    },
+   // 排序 查询字段是表格中字段名字 动态取值排序顺序
+   handleSortChange(column) {
+      this.sendStatList = this.sendStatList.sort(
+            this.sortFun(column.prop, column.order === 'ascending')
+      );
+   },
     handleFormChanged(){
         this.openForm = false;
         this.getList();
diff --git a/src/views/emis/emisWaybill/statpanel/ScanDtlAllListPanel.vue b/src/views/emis/emisWaybill/statpanel/ScanDtlAllListPanel.vue
index 39c8f9c2..f4c11685 100644
--- a/src/views/emis/emisWaybill/statpanel/ScanDtlAllListPanel.vue
+++ b/src/views/emis/emisWaybill/statpanel/ScanDtlAllListPanel.vue
@@ -66,14 +66,14 @@
             <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
             <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
             <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
-            <el-table-column :label="$t('收件扫描次数')" align="center" prop="gotCount" min-width="120" />
-            <el-table-column :label="$t('发件扫描次数')" align="center" prop="sendCount" min-width="120" />
-            <el-table-column :label="$t('到件扫描次数')" align="center" prop="arrivalCount" min-width="120" />
-            <el-table-column :label="$t('派件扫描次数')" align="center" prop="sentCount" min-width="120" />
-            <el-table-column :label="$t('转件扫描次数')" align="center" prop="transferCount" min-width="120" />
-            <el-table-column :label="$t('问题件扫描次数')" align="center" prop="issueCount" min-width="120" />
-            <el-table-column :label="$t('留仓扫描次数')" align="center" prop="holdCount" min-width="120" />
-            <el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="80" >
+            <el-table-column :label="$t('收件扫描次数')" align="center" prop="gotCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('发件扫描次数')" align="center" prop="sendCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('到件扫描次数')" align="center" prop="arrivalCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('派件扫描次数')" align="center" prop="sentCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('转件扫描次数')" align="center" prop="transferCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('问题件扫描次数')" align="center" prop="issueCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('留仓扫描次数')" align="center" prop="holdCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="120" :sortable="true">
               <template slot-scope="scope">
                   <el-tag v-if="scope.row.waybillDetail.blSign=='1'" type="success">已签收</el-tag>
                   <el-tag v-else type="danger">未签收</el-tag>
@@ -209,11 +209,40 @@ export default {
       this.multiple = !selection.length
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
-    handleSortChange(column) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
+    getProperty(obj, str) {
+      str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
+      let arr = str.split(".");
+      for (let i in arr) {
+        obj = obj[arr[i]] || "";
+      }
+      return obj;
     },
+   sortFun: function (attr, rev) {
+      //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序
+      if (rev == undefined||rev==null) {
+          rev = 1;
+      } else {
+          rev = (rev) ? 1 : -1;
+      }
+      let that=this;
+      return function (a, b) {
+          a = that.getProperty(a,attr);
+          b = that.getProperty(b,attr);
+          if (a < b) {
+              return rev * -1;
+          }
+          if (a > b) {
+              return rev * 1;
+          }
+          return 0;
+      }
+    },
+   // 排序 查询字段是表格中字段名字 动态取值排序顺序
+   handleSortChange(column) {
+      this.scanStatDtlList = this.scanStatDtlList.sort(
+            this.sortFun(column.prop, column.order === 'ascending')
+      );
+   },
     handleFormChanged(){
         this.openForm = false;
         this.getList();
diff --git a/src/views/emis/emisWaybill/statpanel/ScanDtlListPanel.vue b/src/views/emis/emisWaybill/statpanel/ScanDtlListPanel.vue
index c83a20fa..53892565 100644
--- a/src/views/emis/emisWaybill/statpanel/ScanDtlListPanel.vue
+++ b/src/views/emis/emisWaybill/statpanel/ScanDtlListPanel.vue
@@ -35,14 +35,14 @@
             <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
             <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
             <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
-            <el-table-column :label="$t('收件扫描次数')" align="center" prop="gotCount" min-width="120" />
-            <el-table-column :label="$t('发件扫描次数')" align="center" prop="sendCount" min-width="120" />
-            <el-table-column :label="$t('到件扫描次数')" align="center" prop="arrivalCount" min-width="120" />
-            <el-table-column :label="$t('派件扫描次数')" align="center" prop="sentCount" min-width="120" />
-            <el-table-column :label="$t('转件扫描次数')" align="center" prop="transferCount" min-width="120" />
-            <el-table-column :label="$t('问题件扫描次数')" align="center" prop="issueCount" min-width="120" />
-            <el-table-column :label="$t('留仓扫描次数')" align="center" prop="holdCount" min-width="120" />
-            <el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="80" >
+            <el-table-column :label="$t('收件扫描次数')" align="center" prop="gotCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('发件扫描次数')" align="center" prop="sendCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('到件扫描次数')" align="center" prop="arrivalCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('派件扫描次数')" align="center" prop="sentCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('转件扫描次数')" align="center" prop="transferCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('问题件扫描次数')" align="center" prop="issueCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('留仓扫描次数')" align="center" prop="holdCount" min-width="150" :sortable="true"/>
+            <el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="120" :sortable="true">
               <template slot-scope="scope">
                   <el-tag v-if="scope.row.waybillDetail.blSign=='1'" type="success">已签收</el-tag>
                   <el-tag v-else type="danger">未签收</el-tag>
@@ -167,11 +167,41 @@ export default {
       this.multiple = !selection.length
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
-    handleSortChange(column) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
+
+    getProperty(obj, str) {
+      str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
+      let arr = str.split(".");
+      for (let i in arr) {
+        obj = obj[arr[i]] || "";
+      }
+      return obj;
     },
+   sortFun: function (attr, rev) {
+      //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序
+      if (rev == undefined||rev==null) {
+          rev = 1;
+      } else {
+          rev = (rev) ? 1 : -1;
+      }
+      let that=this;
+      return function (a, b) {
+          a = that.getProperty(a,attr);
+          b = that.getProperty(b,attr);
+          if (a < b) {
+              return rev * -1;
+          }
+          if (a > b) {
+              return rev * 1;
+          }
+          return 0;
+      }
+    },
+   // 排序 查询字段是表格中字段名字 动态取值排序顺序
+   handleSortChange(column) {
+      this.scanStatDtlList = this.scanStatDtlList.sort(
+            this.sortFun(column.prop, column.order === 'ascending')
+      );
+   },
     handleFormChanged(){
         this.openForm = false;
         this.getList();
diff --git a/src/views/emis/emisWaybill/statpanel/SendStatPanel.vue b/src/views/emis/emisWaybill/statpanel/SendStatPanel.vue
index 4f46d429..8b141155 100644
--- a/src/views/emis/emisWaybill/statpanel/SendStatPanel.vue
+++ b/src/views/emis/emisWaybill/statpanel/SendStatPanel.vue
@@ -69,10 +69,10 @@
             <el-table-column :label="$t('录单日期')" align="center" prop="sendDate" width="100" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('寄件财务中心')" align="center" prop="sendCenterName" width="120" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" width="150" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('票数')" align="center" prop="totalNum" width="100" />
-            <el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" width="100" />
-            <el-table-column :label="$t('结算重量')" align="center" prop="totalSettlementWeight" width="100" />
-            <el-table-column :label="$t('体积重量')" align="center" prop="totalVolumeWeight" width="100" />
+            <el-table-column :label="$t('票数')" align="center" prop="totalNum" width="120"  :sortable="true" />
+            <el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" width="120"  :sortable="true" />
+            <el-table-column :label="$t('结算重量')" align="center" prop="totalSettlementWeight" width="120"  :sortable="true"/>
+            <el-table-column :label="$t('体积重量')" align="center" prop="totalVolumeWeight" width="120"  :sortable="true"/>
       </XdTable>
 
   </XdPageContainer>
@@ -345,11 +345,47 @@ export default {
       this.multiple = !selection.length
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
-    handleSortChange(column) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
+    // handleSortChange(column) {
+    //   this.queryParams.orderByColumn = column.prop;
+    //   this.queryParams.isAsc = column.order;
+    //   this.getList();
+    // },
+
+    getProperty(obj, str) {
+      str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标
+      let arr = str.split(".");
+      for (let i in arr) {
+        obj = obj[arr[i]] || "";
+      }
+      return obj;
     },
+   sortFun: function (attr, rev) {
+      //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序
+      if (rev == undefined||rev==null) {
+          rev = 1;
+      } else {
+          rev = (rev) ? 1 : -1;
+      }
+      let that=this;
+      return function (a, b) {
+          a = that.getProperty(a,attr);
+          b = that.getProperty(b,attr);
+          if (a < b) {
+              return rev * -1;
+          }
+          if (a > b) {
+              return rev * 1;
+          }
+          return 0;
+      }
+    },
+   // 排序 查询字段是表格中字段名字 动态取值排序顺序
+   handleSortChange(column) {
+      this.sendStatList = this.sendStatList.sort(
+            this.sortFun(column.prop, column.order === 'ascending')
+      );
+   },
+
     handleFormChanged(){
         this.openForm = false;
         this.getList();
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index 0d344129..c6f85cc6 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -410,21 +410,7 @@
                   </el-row>
               </el-col>
 
-              <!-- <el-col :span="24" v-if="applyType&&applyTypeArr.includes('9')" >
-                  <el-row :gutter="0" class="md-row">
-                    <el-col :span="3" class="md-title">
-                      <span>运费调整</span>
-                    </el-col>
-                    <el-col :span="7" class="md-value">
-                      <span >{{billDetail.freight}}</span>
-                    </el-col>
-                    <el-col :span="14">
-                      <el-form-item  :label="$t('运费')" prop="freight" >
-                        <el-input v-model="form.freight" type="text" placeholder=""/>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-              </el-col> -->
+
 
 
               <el-col :span="24" v-if="applyType&&(applyTypeArr.includes('2'))" >
@@ -1028,6 +1014,22 @@
                   </el-row>
               </el-col>
 
+              <el-col :span="24" v-if="applyType&&applyTypeArr.includes('9')" >
+                  <el-row :gutter="0" class="md-row">
+                    <el-col :span="3" class="md-title">
+                      <span>录单备注和费用备注</span>
+                    </el-col>
+                    <el-col :span="7" class="md-value">
+                      <span >录单备注:{{billDetail.remark}}</span><br>
+                      <span >费用备注:{{billDetail.feeRemark}}</span>
+
+                    </el-col>
+                    <el-col :span="14" style="text-align:center">
+                      <span >录单备注：{{form.remark}}</span><br>
+                      <span >费用备注：{{form.feeRemark}}</span>
+                    </el-col>
+                  </el-row>
+              </el-col>
 
               <el-col :span="24" v-if="applyType&&applyTypeArr.length>0">
                   <el-row :gutter="0" class="md-row">