aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-12 23:21:00 +08:00
parent fb6dc34ad6
commit 3171bac1fe
11 changed files with 61 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/socket_test.html
View File

@ -15,7 +15,10 @@
//实现化WebSocket对象，指定要连接的服务器地址与端口 建立连接
//等同于socket = new WebSocket("ws://localhost:8888/xxxx/im/25");
//var socketUrl="${request.contextPath}/im/"+$("#userId").val();
var socketUrl="http://192.168.88.57:11089/api/bizsvr/ws/1";
// var socketUrl="http://192.168.88.57:11089/api/bizsvr/ws/1";
var socketUrl="http://47.102.220.189:58089/api/bizsvr/ws/1";
socketUrl=socketUrl.replace("https","ws").replace("http","ws");
console.log(socketUrl);
if(socket!=null){

8
src/assets/styles/sidebar.scss
View File

@ -202,8 +202,8 @@
.el-submenu__title{
.paas-menu-item{
background: #e8f4ff;
border: 1px solid #a3d3ff1c;
// background: #e8f4ff;
// border: 1px solid #a3d3ff1c;
.svg-icon {
color:#B12D29!important;
}
@ -275,8 +275,8 @@
.router-link-active {
.paas-menu-item{
background: #e8f4ff;
border: 1px solid #a3d3ff1c;
// background: #e8f4ff;
// border: 1px solid #a3d3ff1c;
.svg-icon {
color:#B12D29!important;
}

11
src/utils/TnPrinterSdk.js
View File

@ -1,10 +1,19 @@
import { Message } from 'element-ui'
import { getToken } from '@/utils/auth' // 与后端的协商，websocket请求需要带上token参数
import { getToken } from '@/utils/auth'
let websock = null
let messageCallback = null
let errorCallback = null
let wsUrl = ''
let tryTime = 0
// 与后端的协商，websocket请求需要带上token参数
/*
命令名称：
command
getPrinterList: 获取打印机列表
getPrinterTplList: 获取打印模版列表
sendToPrint：发送打印
getPrinterVer：获取打印组件版本信息
*/
// 接收ws后端返回的数据
function websocketonmessage (e) {

20
src/views/emis/EmisBaseTools/EmisBrandPicker.vue
View File

@ -4,9 +4,9 @@
clearable
v-model="svalue"
:placeholder="placeholder"
:filter-method="dataFilter"
style="width: 100%;"
@change="onChange">
<el-option key="all" label="全部" value="all" ></el-option>
<el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.nameEn+')'" :value="item.code" ></el-option>
</el-select>
<!-- <div >{{ item.name }}({{ item.nameEn }})</div> -->
@ -28,7 +28,6 @@
},
data() {
return {
bakOptionItems:[],
optionItems: [],
svalue: this.value,
optionDefault:null,
@ -58,30 +57,15 @@
}
});
this.$emit("onChange",itemData);
this.optionItems = this.bakOptionItems;
},
initData() {
let queryParams = {};
listSimpleEmisBrand(queryParams).then(response => {
this.bakOptionItems = response.rows;
this.optionItems =this.bakOptionItems;
this.optionItems =response.rows;
});
},
dataFilter(val) {
this.optionDefault = val
if (val) {
let searchVal = val.toLowerCase();
this.optionItems = this.bakOptionItems.filter(item => {
if ( item.name.toLowerCase().indexOf(searchVal) != -1 || item.nameEn.toLowerCase().indexOf(searchVal) != -1) {
return true
}
})
} else {
this.optionItems = this.bakOptionItems;
}
},
}
};
</script>

13
src/views/emis/EmisBaseTools/TransLinePicker.vue
View File

@ -32,6 +32,10 @@
type: String,
required: false
},
fromCountry: {
type: String,
required: false
},
isInitiated:{
type: [Boolean,String],
required: false,
@ -51,7 +55,11 @@
},
countryCode(newVal) {
this.queryData();
}
},
fromCountry(newVal) {
this.queryData();
},
},
created() {
if(this.isInitiated || this.svalue!=null){
@ -72,7 +80,8 @@
let queryParams = {
pageNum: 1,
pageSize: 3000,
country:this.countryCode
country:this.countryCode,
fromCountry:this.fromCountry
};
listSimpleEmisTransLine(queryParams).then(response => {
this.optionItems = response.rows;

12
src/views/emis/emisDestination/index.vue
View File

@ -11,9 +11,9 @@
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
</el-form-item>
<el-form-item :label="$t('所属线路')" prop="lineCode">
<!-- <el-form-item :label="$t('所属线路')" prop="lineCode">
<TransLinePicker :placeholder="$t('所属线路')" v-model="queryParams.lineCode" :countryCode="queryParams.country" @onChange="handleQuery"></TransLinePicker>
</el-form-item>
</el-form-item> -->
<el-form-item :label="$t('目的地名称')" prop="destName" label-width="90px">
<el-input
@ -130,7 +130,7 @@
</el-table-column>
<!-- <el-table-column label="英文名称" align="center" prop="destNameEn" min-width="100" /> -->
<el-table-column label="所属国家" align="center" prop="countryName" width="100" />
<el-table-column label="所属线路" align="center" prop="lineName" width="100" />
<!-- <el-table-column label="所属线路" align="center" prop="lineName" width="100" /> -->
<!-- <el-table-column label="服务网点" align="center" prop="siteCode" min-width="100" /> -->
<el-table-column label="服务网点" align="center" prop="siteName" width="120">
@ -183,10 +183,12 @@
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" :destroy-on-close="true" width="50%" append-to-body>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" v-dialogDrag >
<emisDestinationForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisDestinationForm>
</el-dialog>
<!-- append-to-body
:destroy-on-close="true"
-->
</el-col>
</el-row>

22
src/views/emis/emisNotCalcAging/index.vue
View File

@ -91,7 +91,7 @@
<span v-else>{{scope.row.countryName}}</span>
</template>
</el-table-column>
<el-table-column label="启用状态" align="center" prop="status" min-width="100" >
<!-- <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
@ -100,7 +100,14 @@
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="启用状态" align="center" prop="status" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
<el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
<!-- <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/> -->
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -245,15 +252,8 @@ export default {
this.queryParams.params["beginNoCalcDay"] = this.daterangeNoCalcDay[0];
this.queryParams.params["endNoCalcDay"] = this.daterangeNoCalcDay[1];
}
// if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
// this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
// this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
// }
// if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
// this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
// this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
// }
listEmisNotCalcAging(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
listEmisNotCalcAging(this.queryParams).then(response => {
this.emisNotCalcAgingList = response.rows;
this.total = response.total;
this.loading = false;

4
src/views/emis/emisSite/index.vue
View File

@ -237,10 +237,12 @@
</template>
</el-table-column>
</xd-table>
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" append-to-body :close-on-click-modal="false">
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" v-dialogDrag append-to-body :close-on-click-modal="false">
<emisSiteForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSiteForm>
</el-dialog>
<!-- :destroy-on-close="true" -->
</div>
</template>

7
src/views/emis/emisTransLine/index.vue
View File

@ -123,7 +123,12 @@
<dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
</template>
</el-table-column>
<el-table-column label="品牌" align="center" prop="logoTypeName" width="150" />
<el-table-column label="品牌" align="center" prop="logoTypeName" width="150" >
<template slot-scope="scope">
<span v-if="scope.row.logoType=='all'">全部</span>
<span v-else>{{ scope.row.logoTypeName }}</span>
</template>
</el-table-column>
<el-table-column label="泡重比" align="center" prop="meterRate" width="80" />
<!-- <el-table-column label="启用状态" align="center" prop="status" width="80" >
<template slot-scope="scope">

2
src/views/emis/emisTransProduct/index.vue
View File

@ -38,7 +38,7 @@
/>
</el-form-item>
<el-form-item label="取重方式" prop="carryType">
<el-select v-model="queryParams.carrType" placeholder="取重方式" clearable @change="handleQuery">
<el-select v-model="queryParams.carryType" placeholder="取重方式" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.emis_take_weight_method"
:key="dict.value"

5
src/views/system/role/index.vue
View File

@ -203,7 +203,6 @@
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
<el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
<el-tree
class="tree-border"
:data="menuOptions"
@ -211,7 +210,7 @@
ref="menu"
node-key="id"
:check-strictly="!form.menuCheckStrictly"
empty-text="加载中，请稍候"
empty-text="无数据"
:props="defaultProps"
></el-tree>
</el-form-item>
@ -256,7 +255,7 @@
ref="dept"
node-key="id"
:check-strictly="!form.deptCheckStrictly"
empty-text="加载中，请稍候"
empty-text="无记录"
:props="defaultProps"
></el-tree>
</el-form-item>