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-28 11:20:34 +08:00
commit f0e49d5acf
5 changed files with 50 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/HeaderSearch/index3.vue
View File

@ -13,7 +13,7 @@
>
<el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
</el-select>
<div style="margin-top: 20px;">
<div style="margin-top: 20px;display: flex; flex-wrap: wrap; justify-content: flex-start; align-items: center; padding-top: 5px;">
<el-button size="mini" type="text" plain v-for="(quickItem,index) in quickActionList" :key="index" @click="change(quickItem)"><span>{{ quickItem.title }}</span></el-button>
</div>
</div>
@ -53,7 +53,6 @@ watch: {
},
searchPool(list) {
this.initFuse(list)
this.initQuickActionList();
},
show(value) {
if (value) {
@ -65,6 +64,7 @@ watch: {
},
mounted() {
this.searchPool = this.generateRoutes(this.routes);
this.initQuickActionList();
},
methods: {
initQuickActionList() {
@ -101,6 +101,7 @@ methods: {
this.$nextTick(() => {
this.show = false
})
this.initQuickActionList();
},
initFuse(list) {
this.fuse = new Fuse(list, {

25
src/layout/components/Sidebar/BizNav.vue
View File

@ -28,34 +28,16 @@
</div>
<div class="quick-tool" style="line-height: 34px;">
<el-popover
placement="right"
width="400"
trigger="click"
ref="popoverRef"
effect="light"
:show-arrow="false"
:persistent="false"
@show="refreshId=Math.random().toString(36).substring(3,10)"
>
<!--
ref="popoverRef"
width="400"
placement="right-bottom"
trigger="click"
popper-class="quick-menu-popover"
:offset="{ x: 10, y: 10 }"
:show-arrow="false"
:open-delay="500"
placement="right"
width="200"
trigger="hover"
ref="popoverRef"
effect="light"
:show-arrow="false"
-->
<!-- <div style="text-align: center;">
</div> -->
<search3 id="header-search"/>
<search3 id="header-search" :key="refreshId"/>
<span slot="reference">
<i class="icon iconfont icon-icon_menhukuaijiecaidan" ></i>
</span>
@ -79,6 +61,7 @@ export default {
},
data() {
return {
refreshId:'0',
// 当前激活菜单的 index
currentIndex: undefined,
domainId:undefined,

2
src/store/modules/tagsView.js
View File

@ -21,7 +21,7 @@ const mutations = {
try{
var addActionLogData = {
title: view.meta.title,
path: view.path,
path: view.fullPath,
menuId: view.meta.menuId,
navPath: "",
groupName: "",

38
src/views/emis/emisWaybill/waybillModify.vue
View File

@ -13,13 +13,13 @@
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- 运单录入 -->
<el-col :span="6" v-if="action=='add'">
<el-col :span="6" v-if="action=='add' || action=='preAdd'">
<el-form-item :label="$t('发货时间')" prop="sendDate">
<el-input v-model="sendDate" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="18" v-if="action=='add'">
<el-col :span="18" v-if="action=='add' || action=='preAdd'">
<el-form-item :label="$t('运单号')" prop="billCode" >
<div style="display:inline-flex">
<div>
@ -158,7 +158,7 @@
</el-row>
<div v-if="action=='add'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
<div v-if="action=='add' || action=='preAdd'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
<div v-if="totalAvailablePag.mainHasCnt>0" style="display:inline-flex;font-size: 15px;font-weight: 700;">
<div style="width:230px">
@ -296,8 +296,8 @@
<div style="display:inline-flex">
<country-picker2 v-model="form.reciever.country" ></country-picker2>
<ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country" style="margin-left:5px" @onChange="handleCalcDestSite" ></ProvincePicker2>
<city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
<district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
<city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px" @onChange="handleCalcDestSite" ></city-picker2>
<district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px" @onChange="handleCalcDestSite" ></district-picker2>
</div>
</el-form-item>
</el-col>
@ -313,8 +313,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('目的网点')" prop="dispatchUnderlingSiteCode">
<el-input v-model="form.dispatchUnderlingSiteCode" placeholder="" disabled />
<el-form-item :label="$t('目的网点')" prop="dispatchUnderlingSiteName">
<el-input v-model="form.dispatchUnderlingSiteName" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="24">
@ -674,7 +674,7 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="action=='add'">
<el-col :span="24" v-if="action=='add' || action=='preAdd' ">
<el-form-item :label="$t('打印选项')" prop="printTypeCheckList">
<el-checkbox-group v-model="form.printTypeCheckList">
<el-checkbox :key="0" :label="0" >
@ -689,7 +689,7 @@
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="action=='add'">
<el-col :span="24" v-if="action=='add' || action=='preAdd'">
<el-form-item :label="$t('打印组件')" prop="printTypeCheckList">
<TanexPrinterPanel ref="tanexPrinter" :isShowPinters="true" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false" @onPrintComplete="onComplete"></TanexPrinterPanel>
</el-form-item>
@ -853,7 +853,7 @@ data() {
{ required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] }
],
province: [
{ required: true, message: "省不能为空", trigger: ["blur",'change'] }
{ required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
],
company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
@ -1456,6 +1456,7 @@ methods: {
destinationCountry: null,
destinationCode: null,
dispatchUnderlingSiteCode: null,
dispatchUnderlingSiteName:null,
destinationCenterCode: null,
marketManCode: null,
payee: null,
@ -1523,7 +1524,7 @@ methods: {
});
},
startTimer(){
if(this.action=='add'){
if(this.action=='add' || action=='preAdd'){
this.sendDate=parseTime(new Date());
this.timer = setTimeout(this.startTimer, 1000);
}
@ -1641,7 +1642,11 @@ methods: {
},
calcDestSite(){
let queryParams = {
province:this.form.reciever.province
country:this.form.reciever.country,
province:this.form.reciever.province,
city:this.form.reciever.city,
county:this.form.reciever.city,
address:this.form.reciever.address
};
if(this.form.reciever.province){
@ -1651,7 +1656,7 @@ methods: {
this.form.dispatchSite = response.data.siteName;
this.form.dispatchUnderlingSiteCode= response.data.siteCode;
this.form.dispatchUnderlingSite= response.data.siteName;
this.form.dispatchUnderlingSiteName= response.data.siteName;
});
}
@ -1846,10 +1851,9 @@ methods: {
onDestinationChange(item){
// this.form.destinationCode = item.destCode;
this.form.dispatchUnderlingSiteCode= item.siteCode;
this.form.dispatchSiteCode= item.siteCode;
this.form.dispatchUnderlingSite= item.siteName;
this.form.dispatchSite= item.siteName;
// this.form.dispatchSiteCode= item.siteCode;
this.form.dispatchUnderlingSiteName= item.siteName;
// this.form.dispatchSite= item.siteName;
},
onGoodsChange(goodsList,selNameStr){
this.form.goodsInfo = selNameStr;

38
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -13,13 +13,13 @@
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- 运单录入 -->
<el-col :span="6" v-if="action=='add'">
<el-col :span="6" v-if="action=='add' || action=='preAdd'">
<el-form-item :label="$t('发货时间')" prop="sendDate">
<el-input v-model="sendDate" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="18" v-if="action=='add'">
<el-col :span="18" v-if="action=='add' || action=='preAdd'">
<el-form-item :label="$t('运单号')" prop="billCode" >
<div style="display:inline-flex">
<div>
@ -158,7 +158,7 @@
</el-row>
<div v-if="action=='add'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
<div v-if="action=='add' || action=='preAdd'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
<div v-if="totalAvailablePag.mainHasCnt>0" style="display:inline-flex;font-size: 15px;font-weight: 700;">
<div style="width:230px">
@ -296,8 +296,8 @@
<div style="display:inline-flex">
<country-picker2 v-model="form.reciever.country" ></country-picker2>
<ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country" style="margin-left:5px" @onChange="handleCalcDestSite" ></ProvincePicker2>
<city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
<district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
<city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px" @onChange="handleCalcDestSite" ></city-picker2>
<district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px" @onChange="handleCalcDestSite" ></district-picker2>
</div>
</el-form-item>
</el-col>
@ -313,8 +313,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('目的网点')" prop="dispatchUnderlingSiteCode">
<el-input v-model="form.dispatchUnderlingSiteCode" placeholder="" disabled />
<el-form-item :label="$t('目的网点')" prop="dispatchUnderlingSiteName">
<el-input v-model="form.dispatchUnderlingSiteName" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="24">
@ -674,7 +674,7 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="action=='add'">
<el-col :span="24" v-if="action=='add' || action=='preAdd' ">
<el-form-item :label="$t('打印选项')" prop="printTypeCheckList">
<el-checkbox-group v-model="form.printTypeCheckList">
<el-checkbox :key="0" :label="0" >
@ -689,7 +689,7 @@
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="action=='add'">
<el-col :span="24" v-if="action=='add' || action=='preAdd'">
<el-form-item :label="$t('打印组件')" prop="printTypeCheckList">
<TanexPrinterPanel ref="tanexPrinter" :isShowPinters="true" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false" @onPrintComplete="onComplete"></TanexPrinterPanel>
</el-form-item>
@ -853,7 +853,7 @@ data() {
{ required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] }
],
province: [
{ required: true, message: "省不能为空", trigger: ["blur",'change'] }
{ required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
],
company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
@ -1456,6 +1456,7 @@ methods: {
destinationCountry: null,
destinationCode: null,
dispatchUnderlingSiteCode: null,
dispatchUnderlingSiteName:null,
destinationCenterCode: null,
marketManCode: null,
payee: null,
@ -1523,7 +1524,7 @@ methods: {
});
},
startTimer(){
if(this.action=='add'){
if(this.action=='add' || action=='preAdd'){
this.sendDate=parseTime(new Date());
this.timer = setTimeout(this.startTimer, 1000);
}
@ -1641,7 +1642,11 @@ methods: {
},
calcDestSite(){
let queryParams = {
province:this.form.reciever.province
country:this.form.reciever.country,
province:this.form.reciever.province,
city:this.form.reciever.city,
county:this.form.reciever.city,
address:this.form.reciever.address
};
if(this.form.reciever.province){
@ -1651,7 +1656,7 @@ methods: {
this.form.dispatchSite = response.data.siteName;
this.form.dispatchUnderlingSiteCode= response.data.siteCode;
this.form.dispatchUnderlingSite= response.data.siteName;
this.form.dispatchUnderlingSiteName= response.data.siteName;
});
}
@ -1846,10 +1851,9 @@ methods: {
onDestinationChange(item){
// this.form.destinationCode = item.destCode;
this.form.dispatchUnderlingSiteCode= item.siteCode;
this.form.dispatchSiteCode= item.siteCode;
this.form.dispatchUnderlingSite= item.siteName;
this.form.dispatchSite= item.siteName;
// this.form.dispatchSiteCode= item.siteCode;
this.form.dispatchUnderlingSiteName= item.siteName;
// this.form.dispatchSite= item.siteName;
},
onGoodsChange(goodsList,selNameStr){
this.form.goodsInfo = selNameStr;