diff --git a/.env.development b/.env.development index 88c49ae0..025680c1 100644 --- a/.env.development +++ b/.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' diff --git a/.env.production b/.env.production index 142acea7..54b3ce71 100644 --- a/.env.production +++ b/.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' diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue index d2c34bb9..ea7fe9ef 100644 --- a/src/components/XdTable/index.vue +++ b/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){ - return; - } + // if(Math.abs(_x - startX)<5 && Math.abs(_y - startY)<5){ + // 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); } } diff --git a/src/utils/XDNoticeSdk.js b/src/utils/XDNoticeSdk.js index 3742e5b6..f66c6e7d 100644 --- a/src/utils/XDNoticeSdk.js +++ b/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; diff --git a/src/views/emis/emisCustomerAccount/emisCustomerAccountForm.vue b/src/views/emis/emisCustomerAccount/emisCustomerAccountForm.vue index 7e440774..945330b7 100644 --- a/src/views/emis/emisCustomerAccount/emisCustomerAccountForm.vue +++ b/src/views/emis/emisCustomerAccount/emisCustomerAccountForm.vue @@ -94,7 +94,7 @@ 确 定 取 消 - + @@ -141,7 +141,7 @@ export default { methods: { initData() { - + if(this.id !=null) { this.loading = true; getEmisCustomerAccount(this.id).then(response => { diff --git a/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue b/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue index fee43fa7..1d4e9b5c 100644 --- a/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue +++ b/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue @@ -89,6 +89,7 @@ + @@ -117,6 +118,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, diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index dfa42a11..c071029e 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -228,7 +228,7 @@ - + - + @@ -290,20 +290,17 @@ - - - { 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 === 'fjlx') { - return ""; + if (j === 'kjlx') { + return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName']; } if (j === 'fjr') { - return ""; + return v['sendName']+'--'+v['receiveName']; } if (j === 'sendMobile') { return ""; diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index 77272323..193fbe19 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -228,7 +228,7 @@ - + - + @@ -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 @@ {{ scope.row.sendName }}--{{ scope.row.receiveName }} - + @@ -1054,12 +1054,11 @@ export default { if (j === 'index') { return ++index } - - if (j === 'fjlx') { - return ""; + if (j === 'kjlx') { + return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName']; } if (j === 'fjr') { - return ""; + return v['sendName']+'--'+v['receiveName']; } if (j === 'sendMobile') { return "";