md

src/components/Pagination/index.vue

@@ -42,7 +42,7 @@ export default {
     // 移动端页码按钮的数量端默认值5
     pagerCount: {
       type: Number,
-      default: document.body.clientWidth < 992 ? 5 : 7
+      default: document.body.clientWidth < 992 ? 3 : 4
     },
     layout: {
       type: String,

src/components/XdTable/index.vue

@@ -100,15 +100,13 @@
       <!-- 统计数据 -->
 
       <div v-if="showStatInfo" style="display: inline-flex; width: 100%;">
-        <div style="width:50%" >
+        <div style="width:40%" >
            <div class="pagination-container"><slot name="statInfo" /></div>
         </div>
-        <div style="width:50%;overflow: hidden;"  >
+        <div style="width:60%;overflow: hidden;"  >
-          <!-- :pagerCount="3" -->
           <pagination
             v-show="total>0 && showPagination"
             :total="total"
-            :pager-count="3"
             :page-sizes="[10,20,50,100,300,500,1000,2000,5000]"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -217,7 +215,7 @@ export default {
     },
     showStatInfo: {
       type: Boolean,
-      default: false,
+      default: true,
     },
     canHideColumns: {
       type: Boolean,
@@ -595,9 +593,14 @@ export default {
       // console.log("===> this.fullUrl==>", this.fullUrl,this.saveStorageName)
       this.isNeedDbSaveTpl=false;
     }
-    this.getTbShowlList();
+    // 读取本地缓存数据
     this.initStorage()
+
+    // 查看是否有默认模版
+    this.initTbShowlList();
+
     this.updateTable()
+
     this.initSort();
     this.initKeyDown();
     this.tableDom=this.getTableDom();
@@ -678,13 +681,15 @@ export default {
           this.reload();
         }
       },
-      getTbShowlList() {
+      initTbShowlList() {
         if(!this.isNeedDbSaveTpl){
           return;
         }
         let queryParams = {
           tagId:this.saveStorageName
         };
+
+        console.log("===>initTbShowlList=1111=>");
         this.storeTplList=[];
         listSysCustomizeTpl(queryParams).then(response => {
           if(response.rows&&response.rows.length>0){
@@ -696,13 +701,18 @@ export default {
               this.curentTbShowTpl=selTplItem.tplCode;
             }
 
+            console.log("===>initTbShowlList=2222=>",this.storeTplList);
+            console.log("===>this.curentTbShowTpl=2222=>",this.curentTbShowTpl);
+
+
           }
         });
       },
       savaTbShowTpl(){
         if(!this.form.tplName){
-          this.$modal.msgError("模版名称必填");
+          this.form.tplName='默认'
-          return;
+          // this.$modal.msgError("模版名称必填");
+          // return;
         }
 
         // 判断模版是否存在，若存在则覆盖
@@ -718,7 +728,7 @@ export default {
           updateSysCustomizeTpl(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.openTbShowTplDlg=false;
-            this.getTbShowlList();
+            this.initTbShowlList();
             this.curentTbShowTpl=this.form.tplCode;
           });
         } else {
@@ -728,7 +738,7 @@ export default {
           addSysCustomizeTpl(this.form).then(response => {
             this.$modal.msgSuccess("新增成功");
             this.openTbShowTplDlg=false;
-            this.getTbShowlList();
+            this.initTbShowlList();
             this.curentTbShowTpl=this.form.tplCode;
           });
         }
@@ -738,7 +748,7 @@ export default {
         this.$modal.confirm('是否确认删除').then(function() {
           return delSysCustomizeTpl(ids);
         }).then(() => {
-          this.getTbShowlList();
+          this.initTbShowlList();
           this.openTbShowTplDlg=false;
           this.changeTbShowTpl(null);
 
@@ -1112,9 +1122,10 @@ export default {
         const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
         storage[this.saveStorageName] = this.storageList
         window.localStorage.setItem('tableStorage', JSON.stringify(storage))
+      }else{
+        // 清除本地缓存
+        window.localStorage.removeItem('tableStorage')
       }
-
-      // this.setHeaderSortable();
     },
 
   }

src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue

@@ -1,10 +1,12 @@
 <template>
-  <div :id="createdId">
+  <div >
+    <!-- :id="createdId" -->
     <el-popover
           placement="bottom"
           trigger="click"
           ref="popoverRef"
           :popper-options="{ boundariesElement: '.el-form', removeOnDestroy: true }"
+          @show="queryData"
         >
         <div >
             <el-table
@@ -109,7 +111,7 @@ import { getStaffList } from "@/api/emis/emisStaff";
          pageSize:5,
          empCode:null,
          searchValue:null,
-         ownerSiteCode:this.sideCode,
+         ownerSiteCode:null,
          postCode:this.postCode
        }
      };
@@ -124,7 +126,8 @@ import { getStaffList } from "@/api/emis/emisStaff";
           }
      },
      siteCode(newVal){
-      this.queryParams.ownerSiteCode=newVal;
+      this.queryParams.ownerSiteCode=this.sideCode;
+      console.log("===>====>")
       this.defaultItems=null;
      },
      postCode(newVal){
@@ -134,13 +137,17 @@ import { getStaffList } from "@/api/emis/emisStaff";
    },
    mounted() {
     // 给个随机id 判断是否clickoutside
-    this.createdId = String(new Date().getTime())
+    // this.createdId = String(new Date().getTime())
    },
    created() {
+    this.queryParams.ownerSiteCode=this.sideCode;
+
     if(this.value!=null && this.isInit){
       this.svalue=this.value;
       this.queryData(null,this.svalue);
     }
+
+
    },
    methods: {
     onClick(){

src/views/emis/emisSettleBill/MergeBillForm.vue

@@ -16,9 +16,37 @@
                 </el-col>
                 <el-col :span="24">
                       <el-form-item label="账单月份" prop="billMonth"  label-width="60px" >
-                        <el-input v-model="form.billMonth" placeholder="" disabled />
+                        <!-- <el-input v-model="form.billMonth" placeholder="" disabled /> -->
+                        <el-date-picker  size="mini" style="width:120px" v-model="form.billMonth" type="month" placeholder="" value-format="yyyy-MM"></el-date-picker>
                       </el-form-item>
                 </el-col>
+                <el-col :span="24">
+                  <el-form-item label="开始日期" prop="startDate" label-width="60px">
+                    <el-date-picker
+                      style="width:100%"
+                      clearable
+                      v-model="form.settleStartDate"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      default-time = "00:00:00"
+                      placeholder="请选择开始日期"
+                      >
+                    </el-date-picker>
+                  </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                  <el-form-item label="结束日期" prop="endDate" label-width="60px">
+                    <el-date-picker
+                      style="width:100%"
+                      clearable
+                      v-model="form.settleEndDate"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      default-time = "23:59:59"
+                      placeholder="请选择结束日期">
+                    </el-date-picker>
+                  </el-form-item>
+              </el-col>
                 <el-col :span="24">
                       <el-form-item label="应收金额" prop="recMoney"  label-width="60px">
                         <el-input v-model="form.recMoney" placeholder="" disabled />
@@ -114,7 +142,7 @@
                     <span v-text="getIndex(scope.$index)"> </span>
                 </template>
           </el-table-column>
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="130" :show-overflow-tooltip="true" />
         <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" width="80" />
         <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" width="80" />
@@ -173,7 +201,9 @@ export default {
      // 结算子账单表格数据
      emisSettleSubBillList: [],
 
-      emisSettleBillOptions: [],
+     emisSettleBillOptions: [],
+
+     selectList:[],
 
       billCodeStr:null,
       // 遮罩层
@@ -255,6 +285,7 @@ export default {
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
+      this.selectList=selection
     },
 
     // 取消按钮
@@ -321,8 +352,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             let postData={
-              settleBillName:this.form.settleBillName
+              id:this.form.id,
+              settleBillName:this.form.settleBillName,
+              billMonth:this.form.billMonth,
+              settleStartDate:this.form.settleStartDate,
+              settleEndDate:this.form.settleEndDate,
             }
+
             updateEmisSettleBill(postData).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.initData();
@@ -334,6 +370,18 @@ export default {
     },
     handleRemovceBillCode(){
 
+      if(this.emisSettleSubBillList.length<=1){
+          this.$modal.msgError("不允许操作,至少保留一单数据");
+          return;
+      }
+
+      if(!this.billCodeStr){
+          if(this.selectList&&this.selectList.length>0){
+            let tmpBillCodeArr = this.selectList.map(item => item.billCode);
+            this.billCodeStr=tmpBillCodeArr.join(",");
+          }
+      }
+
       let postData={
             settleBillNo: this.form.settleBillNo,
             params:{
@@ -341,6 +389,9 @@ export default {
             }
         }
 
+
+        // this.selectList
+
         // 生成合账单号
         removeSubBillFromSettleBill(postData).then(response => {
               this.$modal.msgSuccess("操作成功");

src/views/emis/emisWaybill/waybillDetailReadOnly.vue

@@ -206,7 +206,7 @@
                           </el-table>
 
             </el-descriptions-item>
-            <el-descriptions-item label="运费" :span="4"><span style="color:red;font-weight:bold;font-size:15px">{{ form.freight }}</span></el-descriptions-item>
+            <el-descriptions-item label="运费(CNY)" :span="4"><span style="color:red;font-weight:bold;font-size:15px">{{ form.freight }}</span></el-descriptions-item>
 
             <el-descriptions-item label="费用备注" :span="4">{{ form.feeRemark }}</el-descriptions-item>
 

src/views/emis/emisWaybill/waybillModify.vue

@@ -802,8 +802,6 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue';
 
-
-
 import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
 
 // import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
@@ -1834,17 +1832,14 @@ methods: {
         }
 
         newFee=newFee.toFixed(2);
-        feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+",";
+        // feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+",";
-
+        // feeRemark = feeRemark.slice(0, -1);
-        feeRemark = feeRemark.slice(0, -1);
-
-
 
         totalFee=Number(totalFee)+Number(newFee);
       }
     }
 
-    this.form.feeRemark=feeRemark;
+    // this.form.feeRemark=feeRemark;
     this.form.freight = totalFee.toFixed(2);
   },
   // 计算体积重量

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1215,28 +1215,29 @@ methods: {
 
           let childOrderList=[]
           let subBillArr=this.form.billCodeSub.split(',');
-
+          // 小于50单可以预览子单
-          for(let i=0;i<subBillArr.length;i++){
+          if(subBillArr.length<50){
-            let item=subBillArr[i];
+            for(let i=0;i<subBillArr.length;i++){
-            if(item!=null && item!=''){
+              let item=subBillArr[i];
-              childOrderList.push(item);
+              if(item!=null && item!=''){
-              // billCount=billCount+1;
+                childOrderList.push(item);
+                // billCount=billCount+1;
+              }
             }
-          }
 
-          if(childOrderList&&childOrderList.length>0){
+            if(childOrderList&&childOrderList.length>0){
-            let subBillItem ={
+              let subBillItem ={
-              "tplCode":"TAN-GC-130",
+                "tplCode":"TAN-GC-130",
-              "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+                "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
-              "orderList":childOrderList.toString()
+                "orderList":childOrderList.toString()
+              }
+              printDataList.push(subBillItem);
             }
-            printDataList.push(subBillItem);
           }
 
           let billCount=2+childOrderList.length;
           // 预览主子单
           this.$refs.tanexPrinter.printPreviewAdv(printDataList,billCount)
-
         }
       }
       else{
@@ -1834,17 +1835,14 @@ methods: {
         }
 
         newFee=newFee.toFixed(2);
-        feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+",";
+        // feeRemark= feeRemark+item.feeName+'('+item.currency+"):" + item.realFee+",";
-
+        // feeRemark = feeRemark.slice(0, -1);
-        feeRemark = feeRemark.slice(0, -1);
-
-
 
         totalFee=Number(totalFee)+Number(newFee);
       }
     }
 
-    this.form.feeRemark=feeRemark;
+    // this.form.feeRemark=feeRemark;
     this.form.freight = totalFee.toFixed(2);
   },
   // 计算体积重量