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

Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

Browse Source
This commit is contained in:
liuyp 2024-06-14 10:19:00 +08:00
commit 7c6991435d
4 changed files with 23 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue
View File

@ -1,7 +1,4 @@
<template>
<!-- :loading="loading" -->
<!-- v-el-select-loadmore="loadmore" -->
<!-- <i class="el-icon-arrow-down select-down" :class="visible&&'rotate180'"></i> -->
<el-select
filterable
@ -47,10 +44,10 @@
type: String,
required: false
},
// siteType:{
// type: [String,Number],
// required: false
// },
transType: {
type: [String,Number],
required: false
},
isInitiated:{
type: [Boolean,String],
required: false,
@ -73,8 +70,8 @@
pageNum:1,
pageSize:20,
searchValue:null,
// siteType:this.siteType,
countryCode:this.countryCode,
transType:this.transType,
destSite:null
}
};
@ -108,10 +105,8 @@
},
initData(){
if(this.svalue && this.firstFlag ){
let queryParams = {
destSite:this.svalue
}
getNextStationList(queryParams).then(response => {
this.queryParams.searchValue=this.svalue;
getNextStationList(this.queryParams).then(response => {
this.dataList=response.rows;
const curItem = response.rows[0];
let curOption = {
@ -134,7 +129,7 @@
if(val && this.queryParams.pageNum == 1){
this.dataList=[];
}
this.queryParams.searchValue=val;
this.queryParams.queryData=val;
getNextStationList(this.queryParams).then(response => {
this.dataList=response.rows;
response.rows.forEach(item => {
@ -144,11 +139,6 @@
});
});
},
// loadmore() {
// this.visible = true
// this.queryParams.pageNum++;
// this.queryData();
// },
reverseArrow(flag) {
let rulesDom = this.$refs["selectDom"].$el.querySelector(
".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"

19
src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
View File

@ -20,25 +20,6 @@
<el-option v-for="item in optionItems" :key="item.siteCode" :label="item.siteName" :value="item.siteCode" ></el-option>
</el-select>
<!-- filterable
clearable
autocomplete="false"
ref="selectRef"
v-model="svalue"
remote
:remote-method="queryData"
:placeholder="placeholder"
style="width: 100%;"
@focus="onFocus"
class="remote-select"
@change="onChange"
@clear="onClear"
no-data-text=""
@visible-change="reverseArrow"
@mouseleave.native="onMouseleave" -->
</template>
<script>

17
src/views/emis/emisTmsScanRecord/loadingScan.vue
View File

@ -7,8 +7,10 @@
<span slot="label">
<span style="color: red">{{$t('车牌号')}}</span>
</span>
<el-input v-model="form.carNo" placeholder="请输入" >
</el-input>
<!-- <el-input v-model="form.carNo" placeholder="请输入" >
</el-input> -->
<CarSimplePicker v-model="form.carNo" ></CarSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
@ -16,7 +18,7 @@
<span slot="label">
<span style="color: red">{{$t('下一站')}}</span>
</span>
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
<EmisGetNextSitePicker v-model="form.preOrNextStation" :transType="3" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
</el-row>
@ -32,6 +34,7 @@
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -120,13 +123,13 @@
<script>
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import CarSimplePicker from '@/views/emis/EmisBaseTools/CarSimplePicker.vue';
export default {
name: "LoadingScan",
props:{
id:undefined
},
components: { EmisGetNextSitePicker },
components: { EmisGetNextSitePicker,CarSimplePicker },
dicts: ['emis_scan_type'],
data() {
return {
@ -242,7 +245,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
// let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
let carNo = this.form.carNo;
@ -295,7 +298,7 @@ export default {
this.$modal.msgError(scanRstItem.message);
return;
}
this.form.scanType = '301';
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)

8
src/views/emis/emisTmsScanRecord/unloadingScan.vue
View File

@ -7,7 +7,8 @@
<span slot="label">
<span style="color: red">{{$t('车牌号')}}</span>
</span>
<el-input v-model="form.carNo" placeholder="请输入" />
<!-- <el-input v-model="form.carNo" placeholder="请输入" /> -->
<CarSimplePicker v-model="form.carNo" ></CarSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
@ -116,13 +117,14 @@
<script>
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import CarSimplePicker from '@/views/emis/EmisBaseTools/CarSimplePicker.vue';
export default {
name: "UnLoadingScan",
props:{
id:undefined
},
components: { EmisGetNextSitePicker },
components: { EmisGetNextSitePicker,CarSimplePicker },
dicts: ['emis_scan_type'],
data() {
return {
@ -227,7 +229,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
// let scanWeight = this.form.scanWeight
// let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
let carNo = this.form.carNo;