md

.env.development

@@ -9,9 +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_WS_HOST = '47.102.220.189:58089/api/bizsvr'
+VUE_APP_WS_HOST = 'wss://47.102.220.189:58089/api/bizsvr'
 
 VUE_APP_PRINTER_HOST = '192.168.88.100:17080'
 

.env.production

@@ -11,6 +11,6 @@ VUE_APP_PDOMAIN = 'tanex56'
 VUE_APP_DATA_FROM = 'pc'
 VUE_APP_BASE_API = 'https://api.emis.tanex56.com/api/bizsvr'
 
-VUE_APP_WS_HOST = 'api.emis.tanex56.com/api/bizsvr'
+VUE_APP_WS_HOST = 'wss://api.emis.tanex56.com/api/bizsvr'
 
 VUE_APP_PRINTER_HOST = '127.0.0.1:17080'

src/components/XdTable/index.vue

@@ -306,7 +306,7 @@ export default {
                   // let startCellPos=getCellXY(evt.target)
 
                   // 设置单元格为选中
-                  setMouseCellSelect(evt.target);
+                  // setMouseCellSelect(evt.target);
 
                   // console.log("table pos:",left,top)
                   // console.log("cellPos pos:",startCellPos)
@@ -322,7 +322,6 @@ export default {
                   // 当前单元格选中
 
 
-
                   var _x = null;
                   var _y = null;
                   vnode.context.clearEventBubble(evt);
@@ -334,9 +333,9 @@ export default {
                       _x = (evt.x || evt.clientX);
                       _y = (evt.y || evt.clientY);
                       //为了确定是点击事件还是移动事件
-                      if(Math.abs(_x - startX)<5 && Math.abs(_y - startY)<5){
+                      // if(Math.abs(_x - startX)<5 && Math.abs(_y - startY)<5){
-                          return;
+                      //     return;
-                      }
+                      // }
                       //为了确保只有一次的渲染每次框选都把默认选中为空
                       if(flag){
                          //重置选中css
@@ -607,7 +606,7 @@ export default {
       this.pageId=this.MD5(this.fullUrl);
       this.saveStorageName=this.pageId;
       // console.log("===> this.fullUrl==>", this.fullUrl,this.saveStorageName)
-      this.isNeedDbSaveTpl=true;
+      this.isNeedDbSaveTpl=false;
     }
     this.getTbShowlList();
     this.initStorage()
@@ -696,7 +695,7 @@ export default {
             if(selTplItem){
               // console.log("selTplItem==>",selTplItem);
               // this.form.tplCode=selTplItem.tplCode;
-              this.changeTbShowTpl(selTplItem.tplCode);
+              // this.changeTbShowTpl(selTplItem.tplCode);
             }
 
           }

src/utils/XDNoticeSdk.js

@@ -6,11 +6,10 @@ class XDNoticeSdk {
 
     VERSION="1.0.0"
     MAX_SENT_RETRY_COUNT = 9;
-    WS_URL = 'ws://'+process.env.VUE_APP_WS_HOST+'/ws/';
+    WS_URL = process.env.VUE_APP_WS_HOST+'/ws/';
 
     userId = null;
 
-
     AUTH_TOKEN=null;
 
     WS_INIT = 0;

src/views/emis/emisCustomerAccount/emisCustomerAccountForm.vue

@@ -94,7 +94,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    
+
   </div>
 </template>
 
@@ -141,7 +141,7 @@ export default {
 
   methods: {
     initData() {
-       
+
         if(this.id !=null) {
           this.loading = true;
           getEmisCustomerAccount(this.id).then(response => {

src/views/emis/emisQuotePrice/emisQuotePriceForm.vue

@@ -89,6 +89,7 @@
                     </el-radio-group>
                   </el-form-item>
                 </el-col>
+
               <el-col :span="24">
                   <el-form-item label="启用状态" prop="status">
                   <el-radio-group v-model="form.status">
@@ -117,6 +118,18 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="24">
+                <el-form-item label="费用币种" prop="currency">
+                  <el-select v-model="form.currency" placeholder="" >
+                    <el-option
+                      v-for="dict in dict.type.sys_currency_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+            </el-col>
 
           </el-col>
           <el-col :span="18" :xs="18">
@@ -261,7 +274,7 @@ export default {
     TransProductPicker,QuoteExpressionPanel,
     QuoteSendAreaPanel,QuoteDispAreaPanel
     },
-  dicts: ['emis_price_type','emis_fee_type'],
+  dicts: ['emis_price_type','emis_fee_type','sys_currency_type'],
   data() {
     return {
 
@@ -327,10 +340,6 @@ export default {
         // startDate: [
         //   { required: true, message: "价格取值不能为空", trigger: "blur" }
         // ],
-
-
-
-
         // useSite: [
         //   { required: true, message: "使用站点名称不能为空", trigger: "blur" }
         // ],
@@ -542,6 +551,7 @@ export default {
         useSiteCode: null,
         transLineCode: null,
         feeType: null,
+        currency: null,
         prodCode: null,
         recPayType: null,
         billType: null,

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -228,7 +228,7 @@
                 <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
               </el-form-item>
 
-              <el-form-item label="收款状态" prop="pickupMethod">
+              <el-form-item label="收款状态" prop="paymentStatus">
                       <el-select v-model="queryParams.paymentStatus" placeholder="请选择">
                         <el-option
                           v-for="dict in dict.type.emis_payment_status"
@@ -243,7 +243,7 @@
         </el-col>
         <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
 
-          <el-form-item label="问题件方式" prop="pickupMethod">
+          <el-form-item label="问题件方式" prop="problemQueryType">
             <el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
               <el-option label="只查问题件类型" :value="1"></el-option>
               <el-option label="剔除问题件类型" :value="2"></el-option>
@@ -290,20 +290,17 @@
 
         </el-col>
       </el-row>
-
     </SearchForm>
-
     <!-- :row-class-name="tableRowClassName" -->
     <!-- @row-dblclick="handleShowTraceInfo" -->
 
-
     <XdTable
           slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
 
           ref="refTable"
-          storageName="sendWaybillList_main"
+          storageName="sendWaybillList_main_240702"
            v-loading="loading"
            border
            size="mini"
@@ -991,7 +988,6 @@ export default {
       const curList =selData
       import('@/vendor/Export2Excel').then(excel => {
         const exportParam=this.$refs.refTable.getExportParam();
-
         const tHeader = exportParam.header;
         const filterVal = exportParam.filter;
         const data = this.formatJson(filterVal, curList, selData)
@@ -1007,15 +1003,15 @@ export default {
     formatJson(filterVal, jsonData, resData) {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
+
         if (j === 'index') {
           return ++index
         }
-
+        if (j === 'kjlx') {
-        if (j === 'fjlx') {
+          return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
-          return "";
         }
         if (j === 'fjr') {
-          return "";
+          return v['sendName']+'--'+v['receiveName'];
         }
         if (j === 'sendMobile') {
           return "";

src/views/emis/emisWaybill/sendWaybillListNew.vue

@@ -228,7 +228,7 @@
                 <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
               </el-form-item>
 
-              <el-form-item label="收款状态" prop="pickupMethod">
+              <el-form-item label="收款状态" prop="paymentStatus">
                       <el-select v-model="queryParams.paymentStatus" placeholder="请选择">
                         <el-option
                           v-for="dict in dict.type.emis_payment_status"
@@ -243,7 +243,7 @@
         </el-col>
         <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
 
-          <el-form-item label="问题件方式" prop="pickupMethod">
+          <el-form-item label="问题件方式" prop="problemQueryType">
             <el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
               <el-option label="只查问题件类型" :value="1"></el-option>
               <el-option label="剔除问题件类型" :value="2"></el-option>
@@ -303,7 +303,7 @@
           :height="(slotProps.contentHeight)+'px'"
 
           ref="refTable"
-          storageName="sendWaybillList_main"
+          storageName="sendWaybillListNew_main_240702"
            v-loading="loading"
            border
            size="mini"
@@ -380,7 +380,7 @@
             <span>{{ scope.row.sendName }}--{{ scope.row.receiveName }}</span>
           </template>
        </el-table-column>
-       <el-table-column :label="$t('快件类型')" align="center" prop="fjlx" width="180" :show-overflow-tooltip="true">
+       <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
             <span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
           </template>
@@ -1054,12 +1054,11 @@ export default {
         if (j === 'index') {
           return ++index
         }
-
+        if (j === 'kjlx') {
-        if (j === 'fjlx') {
+          return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
-          return "";
         }
         if (j === 'fjr') {
-          return "";
+          return v['sendName']+'--'+v['receiveName'];
         }
         if (j === 'sendMobile') {
           return "";