md

.env.development

@@ -9,10 +9,10 @@ VUE_APP_VERSION = '20240516'
 #VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PDOMAIN = 'tanex56'
 VUE_APP_DATA_FROM = 'pc'
-# VUE_APP_BASE_API = 'http://47.102.220.189:58089/api/bizsvr'
+VUE_APP_BASE_API = 'http://47.102.220.189:58089/api/bizsvr'
-VUE_APP_BASE_API = 'https://api.emis.tanex56.com/api/bizsvr'
+# VUE_APP_BASE_API = 'https://api.emis.tanex56.com/api/bizsvr'
 
-VUE_APP_WS_HOST = 'wss://47.102.220.189:58089/api/bizsvr'
+VUE_APP_WS_HOST = 'ws://47.102.220.189:58089/api/bizsvr'
 
 VUE_APP_PRINTER_HOST = '192.168.88.100:17080'
 

src/components/XdTable/index.vue

@@ -613,6 +613,7 @@ export default {
     this.updateTable()
     this.initSort();
     this.tableDom=this.getTableDom();
+    this.columnDrop();
   },
   methods: {
 
@@ -837,12 +838,29 @@ export default {
     getTablePosition() {
       return this.tableDom.getBoundingClientRect();
     },
-    handleSelect(rows) {
+    /**
-      // console.log(rows)
+     * 列拖拽
-    },
+     */
-    handleSelectionChange(rows) {
+     columnDrop() {
-      // console.log(rows)
+      const _this = this;
+      var xdTableObj = document.getElementById(this.tableId);
+      // var tbHeader1=xdTableObj.getElementsByClassName("el-table__body-wrapper")[0];
+      const wrapperTr = xdTableObj.querySelector('.el-table__header-wrapper tr');
+      this.sortable = Sortable.create(wrapperTr, {
+        animation: 180,
+        delay: 0,
+        onEnd: evt => {
+          // 跳过显示的列数量，如开头我们用了一个多选框
+          const empty = 1
+          const oldItem = _this.dropCol[evt.oldIndex- empty];
+          this.newCol=evt.newIndex-1
+          _this.dropCol.splice(evt.oldIndex- empty, 1);
+          _this.dropCol.splice(evt.newIndex- empty, 0, oldItem);
+          console.log(_this.dropCol)
+        }
+      });
     },
+
     handleCopySelect(data,event) {
       handleClipboard(this.currentSelectStr, event)
       this.contextVisible=false;

src/views/emis/EmisBaseTools/TransLinePicker.vue

@@ -1,13 +1,20 @@
 <template>
       <el-select
+      ref="selectRef"
+
       style="width:100%"
       filterable
       clearable
+      remote
+      :remote-method="queryData"
       v-model="svalue"
       :placeholder="placeholder"
       @focus="onFocus"
       @blur="onBlur"
-      @change="onChange">
+      @change="onChange"
+      @visible-change="reverseArrow"
+
+      >
       <el-option v-for="item in optionItems" :key="item.lineCode" :label="item.lineName" :value="item.lineCode" />
     </el-select>
 <!-- style="width:100%" -->
@@ -51,6 +58,8 @@
         queryParams: {
           pageNum: 1,
           pageSize: 50,
+          lineCode:null,
+          lineName:null,
           country:this.countryCode,
           fromCountry:this.fromCountry
         }
@@ -75,6 +84,10 @@
         this.queryData();
       }
     },
+    mounted(){
+      let rulesDom = this.$refs["selectRef"].$el.querySelector(".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"); // 找到dom
+      rulesDom.classList.add("el-icon-arrow-up"); // 对dom新增class
+    },
     methods: {
       onFocus(val){
         this.optionItems=[];
@@ -89,7 +102,8 @@
         this.$emit("onChange",this.filterMap[this.svalue]);
         this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
       },
-      queryData() {
+      queryData(val) {
+        this.queryParams.lineName=val;
         listSimpleEmisTransLine( this.queryParams).then(response => {
           this.optionItems = response.rows;
           this.optionItems.forEach(item => {
@@ -97,6 +111,16 @@
           });
         });
       },
+      reverseArrow(flag) {
+        let rulesDom = this.$refs["selectRef"].$el.querySelector(
+          ".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"
+        ); // 找到dom
+        if (flag) {
+          rulesDom.classList.add("is-reverse"); // 对dom新增class
+        } else {
+          rulesDom.classList.remove("is-reverse"); // 对dom新增class
+        }
+      },
 
     }
   };

src/views/emis/emisWaybill/centerWaybillList.vue

@@ -570,7 +570,7 @@
     </XdTable>
 
 
-    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
       <TraceWaybillDetailView  :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
 

src/views/emis/emisWaybill/dispatchWaybillList.vue

@@ -567,10 +567,9 @@
       <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
-
     </XdTable>
 
-    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
       <TraceWaybillDetailView  :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
 

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -543,7 +543,7 @@
 
     </XdTable>
 
-    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
       <TraceWaybillDetailView  :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
 

src/views/emis/emisWaybill/sendWaybillListNew.vue

@@ -571,7 +571,7 @@
     </XdTable>
 
 
-    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
       <TraceWaybillDetailView  :key="resetRefreshId" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
 <!--

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1499,7 +1499,7 @@ methods: {
   /** 提交按钮 */
   submitForm() {
     this.form.sendDate =this.sendDate;
-    this.$refs["form"].validate(valid => {
+    this.$refs["form"].validate((valid,obj) => {
       if (valid) {
 
         if(this.form.destinationCountry!=this.form.reciever.country){
@@ -1522,6 +1522,23 @@ methods: {
         }
 
       }
+      else {
+        var fail = [];
+        for (let key in obj) {
+          fail.push(obj[key][0].message);
+        }
+        this.$notify({
+            title: '校验失败',
+            message: '<span style="color:red;font-weight:600">'+fail[0]+'</span>',
+            type: 'error',
+            dangerouslyUseHTMLString: true,
+            showClose: false,
+            duration: 2000,
+            // position: 'bottom-right',
+            offset: 100
+          });
+        return false;
+      }
     });
   },
   startTimer(){
@@ -1692,14 +1709,17 @@ methods: {
 
   handleCalcFeeItem(row){
 
+    console.log("===>handleCalcFeeItem==>",row);
     if(row!=null){
-
       if(row.calcExp){
         let expr=row.calcExp;
         expr=expr.replace("s",row.initialWeightFee);
         expr=expr.replace("d",row.addWeightPrice);
         expr=expr.replace("w",this.form.settlementWeight);
+
         row.realFee=parseFloat(eval(expr)).toFixed(2);
+
+        console.log("===>row.calcExp==>expr==>row.realFee:",row.calcExp,expr,row.realFee);
       }
     }
 
@@ -2082,5 +2102,22 @@ methods: {
     pointer-events: auto;
   }
 
+// .notify-success{
+//     top: 1.7rem !important;
+//     right: 0.32rem !important;
+//     width: 2rem !important;
+//     height: 0.96rem !important;
+//     background: rgba(131, 213, 134, 0.1) !important;
+//     border-radius: 0.04rem 0px 0px 0.04rem !important;
+// }
+// .notify-error{
+//     top: 2.7rem !important;
+//     right: 0.32rem !important;
+//     width: 2rem !important;
+//     height: 0.96rem !important;
+//     background:  rgba(255, 31, 36, 0.05) !important;
+//     border-radius: 0.04rem 0px 0px 0.04rem !important;
+// }
+
 </style>