qb 1 year ago
parent
commit
84f730e821
  1. 20
      src/page/index/index.vue
  2. 48
      src/page/index/top/index.vue
  3. 3
      src/store/modules/tags.js
  4. 4
      src/views/aftersales/aftersalesWorkOrder.vue
  5. 63
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  6. 4
      src/views/aftersales/aftersalesWorkOrderend.vue
  7. 1
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  8. 374
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  9. 6
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  10. 7
      src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
  11. 6
      src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
  12. 7
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  13. 12
      src/views/distribution/reservation/reservationAddFrom.vue
  14. 33
      src/views/distribution/signfor/distributionSignfortreat.vue
  15. 121
      src/views/distribution/turndelivery/deliveryDiscuss.vue
  16. 16
      src/views/mail/order/add.vue
  17. 26
      src/views/mail/order/list.vue
  18. 40
      src/views/warehouse/parcelList/distributionParcelList.vue
  19. 6
      src/views/wel/index.vue
  20. 9
      vite.config.js

20
src/page/index/index.vue

@ -36,7 +36,7 @@ import search from './search.vue';
import logo from './logo.vue';
import top from './top/index.vue';
import sidebar from './sidebar/index.vue';
import { getMyCurrentWarehouse } from '@/api/work/work';
// import { getMyCurrentWarehouse } from '@/api/work/work';
export default {
mixins: [index],
components: {
@ -76,15 +76,15 @@ export default {
};
},
created() {
getMyCurrentWarehouse().then(res => {
if (res.data.data == null) {
console.log('当前没有数据');
localStorage.setItem('WarehouseName', void 0);
return;
}
localStorage.setItem('WarehouseName', res.data.data.name);
localStorage.setItem('my_data', JSON.stringify(res.data.data))
});
// getMyCurrentWarehouse().then(res => {
// if (res.data.data == null) {
// console.log('');
// localStorage.setItem('WarehouseName', void 0);
// return;
// }
// localStorage.setItem('WarehouseName', res.data.data.name);
// localStorage.setItem('my_data', JSON.stringify(res.data.data))
// });
},
mounted() {
if (this.userInfo.tenant_id == '000000') {

48
src/page/index/top/index.vue

@ -32,7 +32,7 @@
<!-- 仓库名称 -->
<div class="top-bar__item">
<view>{{ datalist[checkwarehousevalue]?.name || '' }}</view>
<view>{{ dataName || '' }}</view>
</div>
<div class="top-user">
@ -67,7 +67,13 @@
</div>
<el-dialog v-model="isshow" title="切换仓库" width="30%">
<div style="display: flex; flex-direction: column; align-items: center">
<el-select class="selecin" v-model="warehousevalue" filterable placeholder="请选择切换的仓库">
<el-select
@change="warehouseChange"
class="selecin"
v-model="warehousevalue"
filterable
placeholder="请选择切换的仓库"
>
<el-option
v-for="(item, index) in datalist"
:key="item.id"
@ -96,8 +102,9 @@ import {
getMyWarehouseList,
preserveCurrentWarehouse,
getclearWarehouseCache,
getMyCurrentWarehouse,
} from '@/api/work/work';
import { AddressClosed } from '@/utils/util';
export default {
components: {
topLock,
@ -117,6 +124,7 @@ export default {
warehousevalue: '',
checkwarehousevalue: 0,
dataName: null,
warehouseList: [], //
};
},
mounted() {
@ -129,16 +137,21 @@ export default {
filters: {},
created() {
this.dataName = null;
let warehouseName = localStorage.getItem('WarehouseName');
let modifiedName = warehouseName.replace(/"/g, '');
if (modifiedName == 'undefined') {
getMyCurrentWarehouse().then(res => {
if (res.data.data == null) {
console.log('当前没有数据');
localStorage.setItem('WarehouseName', void 0);
return;
}
localStorage.setItem('WarehouseName', res.data.data.name);
if(!res.data.data.name){
this.dataName = '';
console.log('当前暂时没有参数', this.dataName);
} else {
this.dataName = modifiedName;
console.log(this.dataName, '当前参数存在值');
}else{
this.dataName = res.data.data.name;//
}
});
},
computed: {
...mapGetters([
@ -154,6 +167,7 @@ export default {
]),
},
methods: {
//
async confirmcks() {
if (typeof this.warehousevalue != 'number') {
return;
@ -173,6 +187,8 @@ export default {
setTimeout(() => {
window.location.reload();
}, 1000);
this.dataName = '全部';
localStorage.setItem('WarehouseName', this.dataName);
} else {
this.$message({ message: res.data.msg, type: 'error' });
}
@ -187,10 +203,17 @@ export default {
setTimeout(() => {
window.location.reload();
}, 1000);
this.dataName = this.warehouseList[this.warehousevalue - 1].name;
localStorage.setItem('WarehouseName', this.dataName);
} else {
this.$message({ message: res.data.msg, type: 'error' });
}
}
this.$store.commit('DEL_TAG_CURRENT');
this.$store.commit('DEL_TAG_OTHER');
},
warehouseChange(val) {
console.log(val);
},
setCollapse() {
this.$store.commit('SET_COLLAPSE');
@ -207,12 +230,15 @@ export default {
});
},
showcl(flg) {
console.log(this.datalist[this.warehousevalue], '当前选择的仓库');
this.isshow = flg;
if (this.isshow) {
getMyWarehouseList().then(res => {
console.log(res.data.data, 'getMyWarehouseList');
let arr = [{ name: '全部', id: '0' }];
this.datalist = arr.concat(res.data.data);
this.warehouseList = res.data.data;
console.log(this.warehouseList, '存储的仓库');
});
}
},

3
src/store/modules/tags.js

@ -17,6 +17,7 @@ const navs = {
state.tagList.push(action);
setStore({ name: 'tagList', content: state.tagList });
},
// 关闭指定标签
DEL_TAG: (state, action) => {
state.tagList = state.tagList.filter(item => {
return item.fullPath !== action.fullPath;
@ -27,6 +28,7 @@ const navs = {
state.tagList = tagList;
setStore({ name: 'tagList', content: state.tagList });
},
// 关闭除了当前页面的所有页面
DEL_TAG_OTHER: state => {
state.tagList = state.tagList.filter(item => {
console.log("关闭其他111state.tag.fullPath, website.fistPage.path",state.tag.fullPath, website.fistPage.path,item);
@ -35,6 +37,7 @@ const navs = {
console.log("2222state.tagList",state.tagList);
setStore({ name: 'tagList', content: state.tagList });
},
// 关闭当前页面
DEL_TAG_CURRENT: state => {
state.tagList = state.tagList.filter(item => {
console.log("state.tag.fullPath, website.fistPage.path",state.tag.fullPath, website.fistPage.path,item);

4
src/views/aftersales/aftersalesWorkOrder.vue

@ -1927,8 +1927,8 @@ const tabChenge = val => {
} else if (val == 3) {
console.log(UserPermissions.value, '当前身份');
if (UserPermissions.value == '仓库客服') {
data.workOrderStatus = 10;
details.query.workOrderStatus = 10;
data.workOrderStatus = '';
details.query.workOrderStatus = '';
ArbitrationStatus.value = true; //
Tableheaderswitching(columnList);
empty();

63
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -42,7 +42,12 @@
</el-form-item>
<el-form-item label="异常工单号">
<el-input v-model="Indexform.workOrderNumber" disabled placeholder="异常工单号(自动生成)" clearable />
<el-input
v-model="Indexform.workOrderNumber"
disabled
placeholder="异常工单号(自动生成)"
clearable
/>
</el-form-item>
<el-tabs type="border-card" class="PackageInformation" v-show="identifying != '2'">
@ -137,7 +142,6 @@
<el-input v-model="Indexform.orderCode" placeholder="请输入订单自编号" clearable />
</el-form-item> -->
<!-- 必填 -->
<el-form-item
@ -176,8 +180,8 @@
<el-date-picker
v-model="Indexform.deliveryTime"
type="datetime"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择配送时间"
/>
</el-form-item>
@ -213,7 +217,6 @@
</el-select>
</el-form-item>
<el-form-item label="车辆路线" v-if="groundlineSet || groundlineType == 3">
<el-input v-model="Indexform.vehicleRoute" placeholder="请输入车辆路线车次号" clearable />
</el-form-item>
@ -223,7 +226,7 @@
v-model="Indexform.deliverGoodsTime"
type="datetime"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择发货时间"
/>
</el-form-item>
@ -404,7 +407,6 @@
</el-select>
<el-input v-else v-model="item.personResponsibleName" placeholder="请输入责任人" />
</div>
<div class="maxBox el_zb">
<span class="title">占比:</span>
@ -417,7 +419,7 @@
/>
<span>%</span>
</div>
<div class="maxBox ">
<div class="maxBox">
<span class="title">三方责任人:</span>
<el-input v-model="item.tripartite" placeholder="请输入三方责任人" />
</div>
@ -612,7 +614,13 @@ const PackageInfo = ref([
]);
//
const FangAddList = ref([
{ businessName: '', personResponsibleName: '', responsibilityRatio: '', description: '',tripartite:'' },
{
businessName: '',
personResponsibleName: '',
responsibilityRatio: '',
description: '',
tripartite: '',
},
]);
//
const responsible = ref([
@ -750,20 +758,20 @@ const DiscoveringNodesChange = val => {
//
function DeliveryTrainnumber() {
if(!Indexform.value.trainNumber){
Indexform.value.deliveryTime=''
Indexform.value.deliveryDriver=''
DeliveryDriver.value =[]
if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) {
Indexform.value.deliveryTime = null;
Indexform.value.deliveryDriver = '';
DeliveryDriver.value = [];
}
if(!Indexform.value.trainNumber){
return
if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) {
return;
}
let data = {
trainNumber: Indexform.value.trainNumber,
taskTime: Indexform.value.deliveryTime,
};
data.current = 1; //
data.size = 999; //
data.size = 200; //
$_shippingInformation(data).then(res => {
console.log(res, '查询返回值');
DeliveryDriver.value = res.data.data.records; //
@ -799,7 +807,7 @@ const responsibleParty = () => {
FangAddList.value.push({
businessName: '',
personResponsibleName: '',
tripartite:'',
tripartite: '',
responsibilityRatio: '',
description: '',
});
@ -975,7 +983,7 @@ const ConfirmForm = () => {
personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name ||
null, //
responsibilityRatio: item.responsibilityRatio, //
tripartite:item.tripartite,//
tripartite: item.tripartite, //
});
});
}
@ -991,7 +999,7 @@ const ConfirmForm = () => {
personResponsibleId: '',
personResponsibleName: item.personResponsibleName, //
responsibilityRatio: item.responsibilityRatio, //
tripartite:item.tripartite,//
tripartite: item.tripartite, //
});
});
}
@ -1179,28 +1187,33 @@ const ChangePackageInfo = (val, index) => {
console.log(res.data.data, '包件信息');
if (res.data.data.length) {
const packageData = res.data.data[0];
console.log(packageData,'获取的第一个参数');
PackageInfo.value[index].orderCode = packageData.orderCode; //
PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //
PackageInfo.value[index].orderId = packageData.orderId; //
PackageInfo.value[index].brandName = packageData.brandName; //
PackageInfo.value[index].state = false; //
Indexform.value.first=packageData.first;//
Indexform.value.secondary=packageData.secondary;//
console.log(packageData,'处理的包件参数');
console.log(Indexform.value.firsts,'一级品');
console.log(Indexform.value.second,'二 级品');
console.log(packageData, '处理的包件参数');
console.log(Indexform.value.firsts, '一级品');
console.log(Indexform.value.second, '二 级品');
res.data.data.find(item => {
if (item.workOrderId && item.workOrderNumber) {
HistoricalPackageList.value = res.data.data;
PackageInfo.value[index].state = true; //
}
});
Indexform.value.first = packageData.firsts; //
Indexform.value.secondary = packageData.second; //
Indexform.value.waybillMall = packageData.mallName;//
}
// packageCode; //
// //
// orderCode: orderId; //
// workOrderId; //id
// workOrderNumber; //
console.log(PackageInfo.value, '处理好的参数');
});
};
@ -1458,7 +1471,7 @@ const ViewPackageDetails = val => {
margin-bottom: 10px;
width: 97%;
border-left: none;
.el-tabs__header{
.el-tabs__header {
}
}
.NumTotal {

4
src/views/aftersales/aftersalesWorkOrderend.vue

@ -1033,7 +1033,7 @@ const onLoad = () => {
if (item.typesOf == 2) {
//
endFrom.value.processor.push(item.businessId);
//MessageResponsibility.value.push(item.businessId)
MessageResponsibility.value.push(item.businessId)
}
});
console.log(endFrom.value.processor, ' endFrom.value.processor');
@ -1068,7 +1068,7 @@ const onLoad = () => {
item.responsibilityRatio = item.responsibilityRatio + '%';
});
companyProportion.value = 100 - sum;
if (res.data.data.processingResultsVO.processingMoneyEntityList.length) {
if (res.data.data.processingResultsVO.processingMoneyEntityList) {
ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(
item => {
endFrom.value.result.push(item.resultType);

1
src/views/distribution/deliverylist/distributionDeliveryList.vue

@ -1158,7 +1158,6 @@ export default {
display: flex;
}
.order-info {
margin-right: 3%;
ul {
list-style: none;
display: flex;

374
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -128,7 +128,8 @@
<!-- </div>-->
<!-- </div>-->
<!-- </el-row>-->
<el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick">
<el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick" v-loading="checkloading"
element-loading-text="正在复核签收处理中...">
<el-tab-pane label="客 户 列 表" name="tab1">
<tablecmt
class="tableNode"
@ -187,6 +188,7 @@
slotProps.scope.row.driverSigning == '未签收'
"
>一键签收
</el-text>
</template>
</tablecmt>
@ -394,7 +396,7 @@
</template>
</el-dialog>
<!-- 表单模块 -->
<el-dialog
:title="title"
v-model="box"
@ -456,20 +458,32 @@
</template>
</el-table-column>
</el-table> -->
<!-- 客户包件 -->
<tablecmt
:columnList="wrapoption.column"
:tableData="wrapdata"
:loading="loading"
@inputTxt="winputsc"
@timeCheck="timesc"
@selectCheck="selectsc"
@inputTxt="inputscReservationPackage"
@timeCheck="timescReservationPackage"
@selectCheck="selectscReservationPackage"
ref="wtableBox"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<el-button text size="small" @click="handleQRCode(scope.row)">查看二维码</el-button>
<el-text size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-text>
<el-text v-if="slotProps.scope.row.orderPackageLoadingStatus === '10'
|| slotProps.scope.row.orderPackageLoadingStatusName === '待装车'
|| slotProps.scope.row.orderPackageStatus !== '70'
|| slotProps.scope.row.orderPackageStatusName !== '已签收'"
size="small"
@click="cancelReservationPackage(slotProps.scope.row)">计划取消</el-text>
<el-text v-if="slotProps.scope.row.orderPackageLoadingStatus === '10'
|| slotProps.scope.row.orderPackageLoadingStatusName === '待装车'
"
size="small"
@click="signingReservationPackage(slotProps.scope.row)">签收</el-text>
</template>
</template>
</tablecmt>
@ -515,7 +529,8 @@
</div>
</div>
<div>------------------------------</div> -->
<div class="TcFrom">
<div class="TcFrom"
>
<el-form :model="TcForm" label-width="120px">
<el-form-item label="收货人姓名">
<el-input disabled v-model="TcForm.consignee" placeholder="暂无收货人姓名" />
@ -550,7 +565,13 @@
:on-remove="handleRemove"
:on-success="ImgSuccessA"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>
<el-dialog v-model="dialogVisibleA">
@ -568,6 +589,7 @@
:on-remove="handleRemove"
:on-success="ImgSuccessB"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -576,6 +598,9 @@
</el-dialog>
</div>
<div class="imgName">
<span>易碎照</span>
<el-upload
@ -586,6 +611,7 @@
:on-remove="handleRemove"
:on-success="ImgSuccessC"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -594,6 +620,8 @@
</el-dialog>
</div>
<div class="imgName">
<span>家配照</span>
<el-upload
@ -604,6 +632,7 @@
:on-remove="handleRemove"
:on-success="ImgSuccessD"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -612,6 +641,7 @@
</el-dialog>
</div>
<div class="imgName">
<span>签收照</span>
<el-upload
@ -622,6 +652,7 @@
:on-remove="handleRemove"
:on-success="ImgSuccessE"
:headers="headers"
multiple
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -685,6 +716,7 @@ export default {
data() {
return {
html: '',
checkloading:false,//
dialogImageUrl: '', //
dialogVisible: false, //
dialogImageUrlA: '',
@ -714,6 +746,7 @@ export default {
SignForPhotos: [],
reservationId: null, //ID
windowHeight: null,
CheckStore:null,
columnList: [
{
prop: 'trainNumber',
@ -1254,6 +1287,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'signingNumber',
label: '签收数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderStatusName',
label: '订单状态',
@ -1668,6 +1711,17 @@ export default {
sortable: true,
head: false,
},
{
prop: 'signingUser',
label: '签收人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingTime',
label: '签收扫描时间',
@ -2428,46 +2482,46 @@ export default {
fixed: false,
sortable: true,
},
{
label: '发站仓',
prop: 'sendWarehouseName',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: '目的仓',
prop: 'acceptWarehouseName',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: '发货时间',
prop: 'waybillNumber',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: '入库时间',
prop: 'warehouseEntryTimeEnd',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// label: '',
// prop: 'sendWarehouseName',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// label: '',
// prop: 'acceptWarehouseName',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// label: '',
// prop: 'waybillNumber',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// label: '',
// prop: 'warehouseEntryTimeEnd',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// label: '',
// prop: 'trainNumber',
@ -2536,67 +2590,103 @@ export default {
{
label: '包件状态',
prop: 'orderPackageStatusName',
type: 2,
type: 3,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
checkarr: [
{
label: '冻结状态',
prop: 'orderPackageFreezeStatusName',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
label: '未签收',
value: '10'
},
{
label: '上架状态',
prop: 'orderPackageGroundingStatusName',
type: 2,
values: '',
width: '130',
checkarr: [],
label: '已签收',
value: '70'
},
],
fixed: false,
sortable: true,
},
// {
// label: '',
// prop: 'orderPackageFreezeStatusName',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// label: '',
// prop: 'orderPackageGroundingStatusName',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
label: '备货状态',
prop: 'orderPackageStockupStatusName',
type: 2,
type: 3,
values: '',
width: '130',
checkarr: [],
checkarr: [
{
label: '待备货',
value: '10'
},
{
label: '已备货',
value: '20'
},
],
fixed: false,
sortable: true,
},
{
label: '预约状态',
prop: 'orderPackageReservationStatusName',
type: 2,
type: 3,
values: '',
width: '130',
checkarr: [],
checkarr: [
{
label: '待预约',
value: '10'
},
{
label: '已预约',
value: '20'
},
],
fixed: false,
sortable: true,
},
{
label: '装车状态',
prop: 'orderPackageLoadingStatusName',
type: 2,
type: 3,
values: '',
width: '130',
checkarr: [],
checkarr: [
{
label: '待装车',
value: '10'
},
{
label: '已装车',
value: '20'
},
],
fixed: false,
sortable: true,
},
{
label: '装车时间',
prop: 'loadingTime',
type: 2,
type: 4,
values: '',
width: '130',
checkarr: [],
@ -2618,10 +2708,27 @@ export default {
{
label: '装车方式',
prop: 'scanStatus',
type: 2,
type: 3,
values: '',
width: '130',
checkarr: [],
checkarr: [
{
label: '扫描',
value: '2'
},
{
label: '订单',
value: '3'
},
{
label: '一键装车',
value: '4'
},
{
label: '补录',
value: '5'
},
],
fixed: false,
sortable: true,
},
@ -2634,7 +2741,7 @@ export default {
{
label: '计划装车人',
prop: 'driverName',
type: 2,
type: 1,
values: '',
width: '130',
checkarr: [],
@ -2654,7 +2761,7 @@ export default {
{
label: '签收扫描时间',
prop: 'signingTime',
type: 2,
type: 4,
values: '',
width: '130',
checkarr: [],
@ -3138,6 +3245,39 @@ export default {
if (!index) delete this.inventoryQuery[row.prop];
this.handleInventory(this.page);
},
inputscReservationPackage(index, row) {
console.log('index', index);
console.log('row', row);
this.wrapoption.query[row.prop] = index;
if (!index) delete this.inventoryQuery[row.prop];
this.getWrapdetails(this.page);
},
timescReservationPackage(index, row) {
if (!!index) {
index = dayjs(index).format('YYYY-MM-DD');
}
this.wrapoption.query[row.prop] = index;
if (!index) {
delete this.wrapoption.query[row.prop];
}
this.getWrapdetails(this.page);
},
selectscReservationPackage(index, row) {
console.log(index, row);
if (row.prop === 'orderPackageStatusName') {
this.wrapoption.query['orderPackageStatus'] = index;
} else if (row.prop === 'orderPackageStockupStatusName') {
this.wrapoption.query['orderPackageStockupStatus'] = index;
} else if (row.prop === 'orderPackageReservationStatusName') {
this.wrapoption.query['orderPackageReservationStatus'] = index;
} else if (row.prop === 'orderPackageLoadingStatusName') {
this.wrapoption.query['orderPackageLoadingStatus'] = index;
} else {
this.wrapoption.query[row.prop] = index;
}
this.getWrapdetails(this.page);
},
timesc() {},
btnsc() {},
selectsc() {},
@ -3178,6 +3318,17 @@ export default {
this.dialogVisibleF = true;
},
cancelReservationPackage(row){
console.log("row",row);
this.$message.warning("功能维护中...");
return;
},
signingReservationPackage(row){
console.log("row",row);
this.$message.warning("功能维护中...");
return;
},
/**
* 打印
*/
@ -3284,8 +3435,12 @@ export default {
this.dialogImageUrlE = uploadFile.url;
this.dialogVisibleE = true;
},
//
submitForm() {
console.log(this.reservationId);
console.log(this.CheckStore,'要处理的值');
this.checkloading=true;//
// this.signBox = false;
// console.log('--------------->this.signtitle', this.signtitle);
// console.log('--------------->this.signtitle', this.submitForm);
let row = {};
@ -3298,6 +3453,7 @@ export default {
};
//
//
row.reservationId = this.reservationId;
// row.clerkSignPictures = this.signform.clerkSignPictures;
row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //
@ -3316,26 +3472,26 @@ export default {
// }
const pushPhotoToRow = (photoArray, photoType) => {
photoArray.forEach(item => {
row.map[photoType].push({
name: item.response.data.originalName,
name: item.response && item.response.data ? item.response.data.originalName : '',
reservationId: this.reservationId,
type: photoType,
urlRoute: item.response.data.link,
urlRoute: item.response && item.response.data ? item.response.data.link : item.url,
});
});
};
pushPhotoToRow(this.DoorstepPhoto, 'photo_1');
pushPhotoToRow(this.StackingPhoto, 'photo_2');
pushPhotoToRow(this.FragilePhotos, 'photo_3');
pushPhotoToRow(this.HomePhotos, 'photo_4');
pushPhotoToRow(this.SignForPhotos, 'photo_5');
console.log(row, '准备提交的参数');
this.TCloading = true; //
this.signBox = false;
getOneclickq(row)
.then(res => {
this.checkloading=false;//
if (res.data.code == 200) {
this.TCloading = false; //
ElMessage({
@ -3522,14 +3678,52 @@ export default {
},
handleSign(row) {
console.log('签收>>>>>>>>>>', row);
console.log(row.id, '复合签收');
$_getDetail({ id: row.id }).then(res => {
console.log(row.signId, '复合签收');
this.reservationId =row.id
$_getDetail({ id: row.signId }).then(res => {
console.log(res, '复合返回值');
if(res.data.data){
this.CheckStore=res.data.data
if(res.data.data.printVOList){
// DoorstepPhoto
// StackingPhoto
// FragilePhotos
// HomePhotos
// SignForPhotos
this.DoorstepPhoto=[]
this.StackingPhoto=[]
this.FragilePhotos=[]
this.HomePhotos=[]
this.SignForPhotos=[]
res.data.data.printVOList.forEach(item=>{
if(item.type =='photo_1'){
this.DoorstepPhoto.push({name:'',url:item.urlRoute})
}
if(item.type =='photo_2'){
this.StackingPhoto.push({name:'',url:item.urlRoute})
}
if(item.type =='photo_3'){
this.FragilePhotos.push({name:'',url:item.urlRoute})
}
if(item.type =='photo_4'){
this.HomePhotos.push({name:'',url:item.urlRoute})
}
if(item.type =='photo_5'){
this.SignForPhotos.push({name:'',url:item.urlRoute})
}
})
}
console.log(this.CheckStore,'data');
console.log(res.data.data,'res');
}
});
this.signtitle = '复核签收';
// this.view = true;
this.signform = row;
this.signBox = true;
this.signBox = true;//
// this.wid= row.id
// this.getWrapdetails(this.wpage)
},
@ -3554,6 +3748,12 @@ export default {
},
//
handleSignone(row) {
//
this.DoorstepPhoto=[]
this.StackingPhoto=[]
this.FragilePhotos=[]
this.HomePhotos=[]
this.SignForPhotos=[]
console.log('一键签收222>>>>>>>>>>', row);
if (row.loadingStatus != '已装车') {
ElMessage({
@ -3563,10 +3763,10 @@ export default {
return;
}
this.reservationId = row.reservationId; //ID
console.log(row,'当前行数据');
this.signtitle = '一键签收';
this.signform = row;
this.TcForm = row;
this.signBox = true;
},
inventoryDetail(row) {

6
src/views/distribution/inventory/delivery/distributionStockArticle.vue

@ -1787,14 +1787,16 @@ export default {
// };
// i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
// i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
// i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
// console.log("i.totalNumber",i.totalNumber,"i.handQuantitys",i.handQuantity);
i.notReceived = parseInt(i.totalNumber) - parseInt(i.handQuantity);
i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum);
i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity)
return i;
});
this.loading = false;

7
src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@ -1570,13 +1570,16 @@ export default {
// };
// i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
// i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
// i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
i.notReceived = parseInt(i.totalNumber) - parseInt(i.handQuantity);
// i.notReceived = parseInt(i.totalNumber) -parseInt(i.signinQuantity)- parseInt(i.handQuantity);
i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum);
i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity)
return i;
});
this.loading = false;

6
src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue

@ -1642,13 +1642,15 @@ export default {
// };
// i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
// i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
// i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
i.notReceived = parseInt(i.totalNumber) -parseInt(i.signinQuantity)- parseInt(i.handQuantity);
i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum);
i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity)
return i;
});
this.loading = false;

7
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@ -1934,13 +1934,16 @@ export default {
'-1': '0',
};
i.notification = notificationMap[i.notification] || notificationMap.default;
i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
// i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
i.notReceived = parseInt(i.totalNumber) - parseInt(i.handQuantity);
// i.notReceived = parseInt(i.totalNumber) -parseInt(i.signinQuantity)- parseInt(i.handQuantity);
i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum);
i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity)
return i;
});
this.loading = false;

12
src/views/distribution/reservation/reservationAddFrom.vue

@ -381,7 +381,9 @@
<!-- 库存品信息 -->
<template v-if="stockListShow">
<el-dialog v-model="stockListShow" class="stockListShow" title="库存品信息" width="100%">
<el-dialog v-model="stockListShow" class="stockListShow" title="库存品信息" width="90%">
<div v-loading="Inventoryloading"
element-loading-text="正在拼命加载中...">
<!-- :before-close="handleClose"-->
<!-- <el-form :inline="true" :model="query">-->
<!-- <el-form-item label="商场名称:">-->
@ -439,6 +441,7 @@
</el-button>
<el-button icon="el-icon-circle-close" @click="stockListShow = false"> </el-button>
</el-form-item>
</div>
</el-dialog>
</template>
@ -570,6 +573,7 @@ import { setNodeHeight, removeZeroWidth } from '@/utils/util.js';
export default {
data() {
return {
Inventoryloading:true,//
packageQuery: {},
orderRow: {},
columnList: [
@ -2100,6 +2104,8 @@ export default {
}
},
handleAddInventory() {
this.loading = true;
this.Inventoryloading=true;//
let page = this.page;
let params = {};
this.query.serviceType = '2';
@ -2135,14 +2141,15 @@ export default {
}
this.loading = false;
this.selectionClear();
this.stockListShow = true;
this.stockListShow = true;
this.$nextTick(() => {
const _node = document.querySelector('.stockListShow .maboxhi');
_node.style.transition = 'all 0.3s';
setNodeHeight(_node, '500px');
this.setTableHeight();
this.Inventoryloading=false;//
});
}
);
@ -3275,4 +3282,5 @@ input[type='number'] {
.footer-container {
height: 60px;
}
</style>

33
src/views/distribution/signfor/distributionSignfortreat.vue

@ -191,6 +191,7 @@
<template v-if="slotProps.scope.column.label === '操作'">
<el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>
<el-text
size="small"
v-if="slotProps.scope.row.isHaveAbnormalPackage === 2"
@ -201,7 +202,6 @@
slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
" -->
<el-text
v-if="
slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
@ -460,9 +460,11 @@
:before-close="beforeClose"
append-to-body
>
<el-table
ref="table"
v-loading="loading"
v-loading="Abnormalloading"
@selection-change="selectionChange"
:data="wrapdata"
:height="height"
@ -568,6 +570,8 @@ import { ElMessage } from 'element-plus';
export default {
data() {
return {
abnormalReview:'',//
Abnormalloading:false,//
dialogImageUrl: '', //
dialogVisible: false, //
dialogImageUrlA: '',
@ -2067,6 +2071,7 @@ export default {
},
//
auditing(row) {
this.Abnormalloading=true;
// const { row } = scope;
console.log('----------->row', row);
loadingAbnormalPackageListAuditing(row.id).then(res => {
@ -2076,6 +2081,8 @@ export default {
type: 'success',
message: '操作成功!',
});
this.Abnormalloading=false;
this.AbnormalreviewFn(this.abnormalReview);//
}
});
},
@ -2083,6 +2090,7 @@ export default {
* 一键审批
*/
fastAuditing() {
this.Abnormalloading=true;//
console.log('this.wrapdata---------->', this.wrapdata);
let ids = [];
this.wrapdata.forEach(item => {
@ -2095,7 +2103,9 @@ export default {
type: 'success',
message: '操作成功!',
});
this.abnormalBox = false;
this.abnormalBox = false;//
this.Abnormalloading=false;//
}
});
console.log('ids---------->', ids);
@ -2138,16 +2148,25 @@ export default {
// this.wid= row.id
// this.getWrapdetails(this.wpage)
},
//
//
AbnormalreviewFn(row){
loadingAbnormalPackageListDetail(row.id).then(res => {
this.wrapdata = res.data.data;
console.log('res------------->', res.data.data);
});
},
viewAbnormalLoading(scope) {
const { row } = scope;
console.log(scope,'异常审核');
this.abnormalReview=row
// this.title = '';
// this.view = true;
this.abnormalBox = true;
console.log('异常装车审核------------->', row);
loadingAbnormalPackageListDetail(row.id).then(res => {
this.wrapdata = res.data.data;
console.log('res------------->', res.data.data);
});
this.AbnormalreviewFn(this.abnormalReview)
},
editsolt(scope) {
const { row } = scope;

121
src/views/distribution/turndelivery/deliveryDiscuss.vue

@ -421,6 +421,9 @@
<el-dialog v-model="AddLalog" :title="wrapLoading ? '包件信息' : '在库订单信息'">
<!-- 表格列开始 -->
<!-- data 订单信息 wrapData包件信息 -->
<div v-if="!wrapLoading">
<div class="SoInput" v-if="searchSo" ref="SoHeight">
<el-form label-width="100px" :model="parameter">
<el-form-item label="商场名称:">
@ -484,6 +487,27 @@
搜索菜单预留按钮
</div> -->
</div>
</div>
<!-- 包件搜索 -->
<div v-else class="el_package">
<el-form :model="PackageFrom">
<el-form-item label="运单号:">
<el-input
v-model="PackageFrom.inputwaybillNumber"
clearable
placeholder="请输入运单号"
/>
</el-form-item>
<el-form-item label="包条码:">
<el-input
v-model="PackageFrom.orderPackageCode"
placeholder="请输入包条码"
/>
</el-form-item>
</el-form>
</div>
<!-- 顶部开始 -->
<div class="el-Cart-button">
<!-- 表格顶部左侧按钮 -->
@ -831,6 +855,7 @@ const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
const background = ref(true); //
const disabled = ref(false); // 使
const data = ref([]); //
const PackageFrom=ref({});//
const wrapData = ref([]); //
const wrapLoading = ref(false); //
const dataInfo = ref([]); //
@ -849,6 +874,7 @@ const flexList = ref<(string | number)[]>([]); //冻结
const loading = ref(false); //
const BG = ref(false); //
const BtnRadio = ref('1'); //
const Packageow = ref(); //
const ElBtnClass = ref('el-Btn-link'); //
const searchSo = ref(false); //
const SoHeight = ref(); //
@ -1614,8 +1640,6 @@ const wrap = ref([
head: true,
},
{
prop: 'quantity',
label: '数量',
@ -2107,17 +2131,89 @@ const findIndexById = id => {
return -1; //-1
};
//
const PackageFn=()=>{
//;
//
if (RouteId.value) {
console.log(wrapLoading.value, '当前为编辑状态');
$_getPackageListByDeliveryIdAndOrderId({
...PackageFrom.value,//
current: 1,
size: 100,
deliveryId: RouteId.value,
id: Packageow.value.id,
}).then(res => {
console.log(res, '订单包件信息');
if (res.data.code == 200) {
wrapData.value = res.data.data.data.packageList;
let IdTmp = []; //ID
dataInfo.value[dataId.value].packageListInfo = wrapTemp.value[dataId.value];
//,,,使API
if (dataInfo.value[dataId.value].packageListInfo) {
dataInfo.value[dataId.value].packageListInfo.forEach(item => {
IdTmp.push(item.id);
});
}
toggleSelection({
val: false,
data: IdTmp.length ? IdTmp : res.data.data.data.packageListIds.split(','),
index: kind.value ? 0 : 1,
}); //
}
// AddLalog.value = false; //
console.log(wrapData.value, '包件表格信息');
console.log(res);
});
} else {
//
//
$_getPackageListByStockArticleId({
...PackageFrom.value,//
id: Packageow.value.id,
current: 1,
size: 100,
}).then(res => {
wrapData.value = res.data.data.records;
console.log(res, '订单包件');
if (kind.value) {
toggleSelection({ index: 0 }); //
} else {
toggleSelection({ index: 1 }); //
}
console.log(tableRefs, 'tableRefs');
console.log(res.data.data.records, '查看下面的包件');
});
//
console.log('当前为新增状态');
console.log(Packageow.value, Packageow.value.id, '查看包件事件');
//
console.log(dataId.value, 'dataId.value下标');
console.log(wrapDataInfo.value[dataId.value], '当前订单下面的包件信息');
console.log(wrapDataInfo, '订单');
}
editLoading.value = false; //
}
//
const ViewEvent = val => {
Packageow.value = val;
wrapLoading.value = true; //
AddLalog.value = true; //
editLoading.value = true; //
dataId.value = findIndexById(val.id);
//;
//
PackageFn()
return
if (RouteId.value) {
console.log(wrapLoading.value, '当前为编辑状态');
$_getPackageListByDeliveryIdAndOrderId({
waybillNumber: '', //
orderPackageCode: '', //
current: 1,
size: 100,
deliveryId: RouteId.value,
@ -2145,7 +2241,11 @@ const ViewEvent = val => {
console.log(res);
});
} else {
//
//
$_getPackageListByStockArticleId({
waybillNumber: '', //
orderPackageCode: '', //
id: val.id,
current: 1,
size: 100,
@ -2317,20 +2417,32 @@ const search = () => {
};
//
const SoInput = () => {
console.log('点击了搜索功能');
if(!wrapLoading.value){
if (kind.value) {
OrderSelection(0, parameter.value);
} else {
OrderSelection(1, parameter.value);
}
}else{
PackageFn()
}
};
//
const SoEmpty = () => {
if(!wrapLoading.value){
parameter.value = {};
if (kind.value) {
OrderSelection(0);
} else {
OrderSelection(1);
}
}else{
PackageFrom.value={}
PackageFn()
}
};
// ID
@ -3172,4 +3284,9 @@ const SubmitCommercial = () => {
background-color: #ff0000;
color: #fff;
}
.el_package{
:deep(.el-form){
justify-content: flex-start !important;
}
}
</style>

16
src/views/mail/order/add.vue

@ -1,6 +1,6 @@
<template>
<basic-container>
<div class="avue-crud">
<div class="avue-crud" v-loading="subloading" element-loading-text="正在拼命加载中">
<el-form
ref="form"
:model="form"
@ -124,7 +124,7 @@
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="handleClick">
<el-tabs type="border-card" @tab-click="handleClick" >
<el-tab-pane label="订单">
<el-button class="el-btn-xz" type="primary" link @click="handleAddOrder"> </el-button>
<tablecmt
@ -235,6 +235,7 @@
</el-tabs>
<el-form-item style="margin-left: 45%; margin-top: 5px">
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmit"
:disabled="subloading"
>提交(配送订单预约)
</el-button>
<el-button icon="el-icon-circle-close" @click="$router.go(-1)"> </el-button>
@ -635,6 +636,7 @@
export default {
data() {
return {
subloading:false,//
columnList: [
{
prop: 'waybillNumber',
@ -2268,7 +2270,6 @@
this.obj = row;
let page = this.page;
this.toggleAllSelection;
console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
if (this.reservationId) {
const res = await getReservationPackageListByOrderId(
this.reservationId,
@ -2276,7 +2277,6 @@
page.currentPage,
page.pageSize
);
console.log('->>>>>>>>>>>>>>>>>>查看包件', res);
if (res.data.data) {
this.packageData = res.data.data.data.packageList;
let idList = res.data.data.data.reservationPackageList.map(v => {
@ -2287,7 +2287,8 @@
this.isaddvalue = true;
this.loading = false;
} else {
getPackageListByStockArticleId(page.currentPage, page.pageSize, row.id).then(res => {
console.log(">>>>> id ,",row.id);
getPackageListByStockArticleId(page.currentPage, page.pageSize, {id:row.id}).then(res => {
console.log('res---------------->', res);
// console.log(res.data.data.records);
if (res.data.data) {
@ -2412,6 +2413,7 @@
this.isaddvalue = false;
},
onSubmit() {
//
if (!this.form.reservationDate) {
this.$message({
@ -2440,6 +2442,7 @@
inventoryIds.push(item.id);
inventoryList.push(item);
});
orderIds.join(',');
inventoryIds.join(',');
this.form.stockArticleIds = orderIds.toString();
@ -2490,6 +2493,7 @@
operation = false;
return;
}
this.subloading=true;//
// this.form.stockArticleList = this.packageList;
console.log('>>>>>>>>', this.form);
console.log("this.reservationId >>>>>",this.reservationId)
@ -2511,6 +2515,8 @@
this.form.warehouseId = this.warehouseId;
add(this.form).then((res) => {
if(res.data.code !== 200) return
this.subloading=false;//
this.$message({
type: 'success',
message: '操作成功!',

26
src/views/mail/order/list.vue

@ -434,16 +434,7 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'totalNumber',
label: '订单总件数',
type: 1,
values: '',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'consigneeUnit',
label: '收货单位',
@ -462,6 +453,16 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'totalNumber',
label: '订单总件数',
type: 1,
values: '',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'handQuantity',
label: '在库件数',
@ -1377,13 +1378,14 @@ export default {
// };
// i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
// i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
// i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
i.notReceived = parseInt( i.totalNumber) - parseInt( i.handQuantity);
i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum);
i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity)
return i;
});
this.loading = false;

40
src/views/warehouse/parcelList/distributionParcelList.vue

@ -380,16 +380,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'noteNumber',
label: '配送单号',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'noteNumber',
// label: '',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'driverName',
label: '配送司机',
@ -440,16 +440,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'noteNumber',
label: '配送单号',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'noteNumber',
// label: '',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'dvehicleName',
label: '配送车次号',

6
src/views/wel/index.vue

@ -134,7 +134,7 @@
<div class="info">
<div class="name">{{ name }}</div>
<div class="slogan">您好欢迎使用货无忧</div>
<div class="title"> 广州市汇通运输有限公司 </div>
<div class="title"> 成都数联物科有限公司 </div>
<div class="time">{{currentTime}}</div>
@ -145,10 +145,9 @@
<script setup>
import { ref ,onMounted } from 'vue';
const indexState = ref(false);
const currentTime = ref(new Date());
const currentTime = ref('0000年00月00日00时00分00秒');
const name = ref('');
name.value = JSON.parse(localStorage.getItem('TWMS-userInfo')).content.real_name;
setInterval(() => {
const now = new Date();
const year = now.getFullYear();
@ -157,7 +156,6 @@ name.value = JSON.parse(localStorage.getItem('TWMS-userInfo')).content.real_name
const hours = String(now.getHours()).padStart(2, '0');
const minutes = String(now.getMinutes()).padStart(2, '0');
const seconds = String(now.getSeconds()).padStart(2, '0');
currentTime.value = `${year}${month}${day}${hours}${minutes}${seconds}`;
}, 1000);

9
vite.config.js

@ -23,13 +23,10 @@ export default ({ mode, command }) => {
// 新zyc
// target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.122:8777',
// target: 'http://192.168.10.25:13000',
// target: 'http://192.168.10.25:13000',
target: 'http://192.168.10.25:13000',
// target: 'http://192.168.10.25:2888',
// target: 'http://192.168.6.148:9777',
target: 'http://192.168.10.57:13000',
// tjj
// sst
// target: 'http://192.168.6.148:9777',//CYZ
// target: 'http://192.168.10.57:13000',
// target: 'http://192.168.10.200:13000',
// target: 'http://192.168.10.29:13000',
// target: 'http://h5uapi.huitongys.com',

Loading…
Cancel
Save