Browse Source

Merge branch 'pre-production'

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
commit
b368a7f458
  1. 5
      src/option/distribution/distributionParcelList.js
  2. 366
      src/option/distribution/distributionStockArticleFrom.js
  3. 19
      src/views/aftersales/aftersalesWorkOrder.vue
  4. 80
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  5. 18
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  6. 46
      src/views/aftersales/aftersalesWorkOrderend.vue
  7. 22
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  8. 26
      src/views/distribution/inventory/distributionStockArticleFrom.vue
  9. 13
      src/views/distribution/signdetail/distributionSigndetaledt.vue
  10. 82
      src/views/distribution/signfor/distributionSignforedt.vue
  11. 61
      src/views/distribution/turndelivery/deliveryDiscuss.vue
  12. 5
      src/views/distribution/turndelivery/deliveryMarket.vue
  13. 53
      src/views/warehouse/parcelList/distributionParcelList.vue

5
src/option/distribution/distributionParcelList.js

@ -58,6 +58,11 @@ export default {
display: false,
hide: true,
},
{
label: "预留1",
prop: "reserve1",

366
src/option/distribution/distributionStockArticleFrom.js

@ -5,143 +5,335 @@ export default {
selection: true,
column: [
{
label: "主键",
prop: "id",
display: false,
hide: true,
label: '复选框',
prop: '',
type: 0,
values: '',
width: '55',
checkarr: [],
fixed: true,
},
{
label: "租户号",
prop: "tenantId",
display: false,
hide: true,
label: '序号',
prop: '',
type: 12,
values: '',
width: '55',
checkarr: [],
fixed: false,
},
{
label: "创建人",
prop: "createUser",
display: false,
hide: true,
label: '主键',
prop: 'id',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "创建时间",
prop: "createTime",
display: false,
hide: true,
label: '租户号',
prop: 'tenantId',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "更新人",
prop: "updateUser",
display: false,
hide: true,
label: '创建人',
prop: 'createUser',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "更新时间",
prop: "updateTime",
display: false,
hide: true,
label: '创建时间',
prop: 'createTime',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "状态",
prop: "status",
display: false,
hide: true,
label: '更新人',
prop: 'updateUser',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "是否已删除",
prop: "isDeleted",
display: false,
hide: true,
label: '更新时间',
prop: 'updateTime',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// label: '状态',
// prop: 'status',
//
// head: true,
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
label: "创建部门",
prop: "createDept",
display: false,
hide: true,
label: '是否已删除',
prop: 'isDeleted',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "预留1",
prop: "reserve1",
display: false,
hide: true,
label: '创建部门',
prop: 'createDept',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "预留2",
prop: "reserve2",
display: false,
hide: true,
label: '预留1',
prop: 'reserve1',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "预留3",
prop: "reserve3",
display: false,
hide: true,
label: '预留2',
prop: 'reserve2',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "预留4",
prop: "reserve4",
display: false,
hide: true,
label: '预留3',
prop: 'reserve3',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "预留5",
prop: "reserve5",
display: false,
hide: true,
label: '预留4',
prop: 'reserve4',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "仓库",
prop: "warehouse",
label: '预留5',
prop: 'reserve5',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "状态",
prop: "conditions",
search: true,
label: '仓库',
prop: 'warehouse',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// label: '状态',
// prop: 'conditions',
// search: true,
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
label: "包条码",
prop: "orderPackageCode",
label: '包条码',
prop: 'orderPackageCode',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "货位信息",
prop: "goodsAllocation",
label: '货位信息',
prop: 'goodsAllocation',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "所在托盘",
prop: "pallet",
label: '所在托盘',
prop: 'pallet',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "一级品",
prop: "firsts",
label: '一级品',
prop: 'firsts',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "二级品",
prop: "second",
label: '二级品',
prop: 'second',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "三级品",
prop: "thirdProduct",
label: '三级品',
prop: 'thirdProduct',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "物料",
prop: "materialName",
label: '物料',
prop: 'materialName',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "数量",
prop: "quantity",
label: '数量',
prop: 'quantity',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "转库存品数量",
prop: "inventoryQuantity",
hide: true,
label: '转库存品数量',
prop: 'inventoryQuantity',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "车次号",
prop: "trainNumber",
label: '车次号',
prop: 'trainNumber',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: "在库订单ID",
prop: "stockArticleId",
hide: true,
label: '在库订单ID',
prop: 'stockArticleId',
head: true,
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
]
}
// {
// label: '操作',
// prop: 'stockArticleId',
// type: 6,
// values: '',
// width: '130',
// checkarr: [],
// fixed: 'right',
// sortable: true,
// },
],
};

19
src/views/aftersales/aftersalesWorkOrder.vue

@ -89,35 +89,40 @@
> -->
<!-- v-if="ButtonPermissions.batchReject" -->
<!-- v-if="PermissionButton.batch_return" -->
<el-button
v-if="PermissionButton.batch_return"
type="primary"
@click="BatchReturn"
>批量打回</el-button
>
<!-- v-if="ButtonPermissions.assignment" -->
<el-button v-if="PermissionButton.assign" type="primary" @click="assign"
<!-- v-if="PermissionButton.assign" -->
<el-button type="primary" @click="assign"
>工单指派</el-button
>
<!-- v-if="ButtonPermissions.applyArbitration" -->
<!-- v-if="PermissionButton.apply_arbitration" -->
<el-button
v-if="PermissionButton.apply_arbitration"
type="primary"
@click="arbitrate"
>申请仲裁</el-button
>
<!-- v-if="ButtonPermissions.batchFinish" -->
<!-- v-if="PermissionButton.batch_completion" -->
<el-button
v-if="PermissionButton.batch_completion"
type="primary"
@click="Batchcompletion"
>批量完结</el-button
>
<!-- v-if="ButtonPermissions.appeal" -->
<el-button v-if="PermissionButton.representations" type="primary" @click="appeal"
<!-- v-if="PermissionButton.representations" -->
<el-button type="primary" @click="appeal"
>申诉</el-button
>
<!-- v-if="details.query.workOrderStatus == 30" -->
@ -513,10 +518,10 @@ console.log(accessControl, '权限按钮');
// repulse;//
// arbitration_completed;//
// information_editing;//
console.log(accessControl.add, '新增按钮权限');
console.log(accessControl.workAdd, '新增按钮权限');
const PermissionButton = computed(() => {
return {
workAdd: accessControl.add, //
workAdd: accessControl.workAdd, //
batch_return: accessControl.batch_return, //
assign: accessControl.assign, //
apply_arbitration: accessControl.apply_arbitration, //

80
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -7,7 +7,45 @@
<!-- <el-divider content-position="left">
<span> {{ routerState ? '信息查看' : '工单新增' }}</span>
</el-divider> -->
<el-tabs type="border-card" class="PackageInformation" v-show="identifying != '2'">
<el-form :model="Indexform" label-width="100px" class="IndexFrom" ref="IndexForm">
<el-form-item label="异常类型">
<el-select
v-model="Indexform.workOrderType"
clearable
placeholder="选择工单异常类型"
@change="abnormalChange"
>
<el-option
v-for="item in IndexException"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="发现节点">
<el-select
v-model="Indexform.discoveryNode"
clearable
placeholder="选择发现节点"
@change="DiscoveringNodesChange"
>
<el-option
v-for="item in DiscoveringNodes"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="异常工单号">
<el-input v-model="Indexform.workOrderNumber" disabled placeholder="异常工单号(自动生成)" clearable />
</el-form-item>
<el-tabs type="border-card" class="PackageInformation" v-show="identifying != '2'">
<el-tab-pane label="包件信息">
<div class="ResponsibilityBoxS">
<div><el-button type="primary" @click="AddPackage"> 添加信息 </el-button></div>
@ -53,42 +91,7 @@
</div>
</el-tab-pane>
</el-tabs>
<el-form :model="Indexform" label-width="100px" class="IndexFrom" ref="IndexForm">
<el-form-item label="异常类型">
<el-select
v-model="Indexform.workOrderType"
clearable
placeholder="选择工单异常类型"
@change="abnormalChange"
>
<el-option
v-for="item in IndexException"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="发现节点">
<el-select
v-model="Indexform.discoveryNode"
clearable
placeholder="选择发现节点"
@change="DiscoveringNodesChange"
>
<el-option
v-for="item in DiscoveringNodes"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="异常工单号">
<el-input v-model="Indexform.workOrderNumber" disabled placeholder="异常工单号" clearable />
</el-form-item>
<!-- 必填(提货环节可以不填写运单号) -->
<!-- <el-form-item label="运单号" v-if="groundlineType != 1">
<el-input v-model="Indexform.waybillNumber" placeholder="请输入运单号" clearable />
@ -1428,7 +1431,10 @@ const ViewPackageDetails = val => {
}
:deep(.PackageInformation) {
margin-bottom: 10px;
border-top: none;
width: 97%;
border-left: none;
.el-tabs__header{
}
}
.NumTotal {
width: 30%;

18
src/views/aftersales/aftersalesWorkOrderInfo.vue

@ -445,12 +445,18 @@
</el-dialog>
</div>
<div class="foot_btn">
<el-button type="primary" v-if="PermissionButton.reply" @click="addireply">回复</el-button>
<el-button type="primary" v-if="PermissionButton.processing_completed" @click="addingRecord">处理结果</el-button>
<el-button type="primary" v-if="PermissionButton.work_order_completion" @click="EndJump">完结 </el-button>
<el-button type="primary" v-if="PermissionButton.repulse" @click="BatchReturn">打回 </el-button>
<el-button type="primary" v-if="PermissionButton.arbitration_completed" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
<el-button type="primary" v-if="PermissionButton.information_editing" @click="EditInformation">信息编辑</el-button>
<!-- v-if="PermissionButton.reply"
v-if="PermissionButton.processing_completed"
v-if="PermissionButton.work_order_completion"
v-if="PermissionButton.repulse"
v-if="PermissionButton.arbitration_completed"
v-if="PermissionButton.information_editing" -->
<el-button type="primary" @click="addireply">回复</el-button>
<el-button type="primary" @click="addingRecord">处理结果</el-button>
<el-button type="primary" @click="EndJump">完结 </el-button>
<el-button type="primary" @click="BatchReturn">打回 </el-button>
<el-button type="primary" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
<el-button type="primary" @click="EditInformation">信息编辑</el-button>
</div>
</el-card>
<!-- 批量打回弹窗 -->

46
src/views/aftersales/aftersalesWorkOrderend.vue

@ -74,7 +74,7 @@
/>
</el-form-item>
<el-form-item label="发货时间" class="el_lab" >
<el-form-item label="发货时间" class="el_lab">
<el-date-picker
v-model="endFrom.warehousingTime"
type="datetime"
@ -559,6 +559,27 @@
<el-tab-pane label="处理记录">
<div class="ovhe" :style="{ height: msgHight + 'px' }" ref="scrollContainer">
<el-timeline>
<div class="el_Processingparty">
<span>回复</span>
<el-select
v-model="MessageResponsibility"
multiple
filterable
default-first-option
:reserve-keyword="false"
placeholder="请选择处理方"
@change="Msgresponsibility"
>
<el-option
v-for="item in warehouseData"
:key="item.value"
:label="item.label"
:value="item.value"
:disabled="item.disabled"
/>
</el-select>
</div>
<el-timeline-item
placement="top"
v-for="(item, index) in MessageContent"
@ -662,6 +683,7 @@
:rows="4"
type="textarea"
placeholder="回复内容"
@input="appoint(Msgtextarea)"
/>
</div>
<div class="msgHf">
@ -1005,6 +1027,7 @@ const onLoad = () => {
if (item.typesOf == 2) {
//
endFrom.value.processor.push(item.businessId);
// MessageResponsibility.value.push(item.businessId)
}
});
console.log(endFrom.value.processor, ' endFrom.value.processor');
@ -1485,6 +1508,12 @@ const ChangePackageInfo = (val, index) => {
console.log(PackageInfo.value, '处理好的参数');
});
};
// @
const appoint = val => {
if (val == '@') {
console.log('触发了指定选择');
}
};
//
const AddVideoPreview = val => {
VideoPreviewStatus.value = true; //
@ -1980,7 +2009,7 @@ const ViewPackageDetails = val => {
}
.el_pkLi {
width: 100%;
width: 90%;
display: flex;
justify-content: space-between;
}
@ -1989,6 +2018,7 @@ const ViewPackageDetails = val => {
display: flex;
align-items: center;
margin-top: 20px;
justify-content: space-between;
.title {
width: 126px;
height: 100%;
@ -2302,4 +2332,16 @@ const ViewPackageDetails = val => {
align-items: center;
justify-content: center;
}
.el_Processingparty {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
span {
width: 40px;
}
:deep(.el-select) {
width: 100%;
}
}
</style>

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

@ -1583,17 +1583,6 @@ export default {
sortable: true,
head: false,
},
{
prop: 'loadingTime',
label: '装车时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'quantity',
label: '包件数量',
@ -1668,6 +1657,17 @@ export default {
sortable: true,
head: false,
},
{
prop: 'loadingTime',
label: '装车时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingTime',
label: '签收扫描时间',

26
src/views/distribution/inventory/distributionStockArticleFrom.vue

@ -9,7 +9,7 @@
</div>
<el-row>
<!-- 列表模块 -->
<el-table
<!-- <el-table
ref="table"
v-loading="loading"
@selection-change="selectionChange"
@ -28,7 +28,6 @@
<el-table-column v-if="option.index" label="序号" type="index" width="70" align="center">
</el-table-column>
<template v-for="(item, index) in option.column">
<!-- table字段 -->
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
@ -38,17 +37,12 @@
>
</el-table-column>
</template>
<!-- <el-table-column prop="menu" label="转库存品数量" :width="220" align="center">
<template #="{ row }">
<el-input v-model="row.quantity" disabled></el-input>
</template>
</el-table-column> -->
<!-- 操作栏模块 -->
</el-table>
</el-table> -->
<!-- <tablecmt
:columnList="columnList"
<tablecmt
:columnList="option.column"
:tableData="data"
ref="table"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@ -68,7 +62,7 @@
>修改客户信息</el-text
>
</template>
</tablecmt> -->
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
@ -314,9 +308,15 @@ export default {
return true;
});
},
inputsc(index, row) {
this.query[row.prop] = index;
this.page.currentPage = 1;
this.onLoad(this.page);
},
selectionClear() {
this.selectionList = [];
this.$refs.table.clearSelection();
// this.$refs.table.clearSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;

13
src/views/distribution/signdetail/distributionSigndetaledt.vue

@ -498,6 +498,19 @@ export default {
search: true,
width: '100px',
},
{
label: '签收人员',
prop: 'signingUser',
search: true,
width: '100px',
},
{
label: '签收时间',
prop: 'signingTime',
search: true,
width: '100px',
},
{
label: '物料编号',
prop: 'materialCode',

82
src/views/distribution/signfor/distributionSignforedt.vue

@ -380,8 +380,9 @@
<tablecmt
class="goodsTable"
:columnList="item.columnList"
:tableData="data"
:tableData="item.data"
:loading="false"
@inputTxt="(value, row) => inputsc(value, row, item.type)"
>
</tablecmt>
@ -1081,7 +1082,7 @@ const menuData2 = ref([
{
prop: 'waybillNumber',
label: '运单号',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -1092,7 +1093,7 @@ const menuData2 = ref([
{
prop: 'serviceNumber',
label: '服务号',
type: 1,
type: 2,
values: '',
width: '250',
checkarr: [],
@ -1103,7 +1104,7 @@ const menuData2 = ref([
{
prop: 'orderCode',
label: '订单自编号',
type: 1,
type: 2,
values: '',
width: '280',
checkarr: [],
@ -1114,7 +1115,7 @@ const menuData2 = ref([
{
prop: 'orderPackageCode',
label: '包条码',
type: 1,
type: 2,
values: '',
width: '200',
checkarr: [],
@ -1125,7 +1126,7 @@ const menuData2 = ref([
{
prop: 'warehouse',
label: '仓库',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -1136,7 +1137,7 @@ const menuData2 = ref([
{
prop: 'sendWarehouseName',
label: '发站仓',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -1147,7 +1148,7 @@ const menuData2 = ref([
{
prop: 'acceptWarehouseName',
label: '目的地',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -1156,17 +1157,17 @@ const menuData2 = ref([
head: false,
},
{
prop: 'waybillNumber',
label: '发货时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'waybillNumber',
// label: '',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'warehouseEntryTimeEnd',
label: '入库时间',
@ -1666,16 +1667,25 @@ const Tabs = ref([
label: '订单列表',
name: '0',
columnList: menuData1.value,
type: 'order',
query: {},
data: [],
},
{
label: '包件列表',
name: '1',
columnList: menuData2.value,
type: 'package',
query: {},
data: [],
},
{
label: '库存品列表',
name: '2',
columnList: menuData3.value,
type: 'inventory',
query: {},
data: [],
},
]);
//
@ -2081,8 +2091,11 @@ function PackageList() {
editLoading.value = true; //
data.value = [];
signforPackageList(RouterId.value).then(res => {
const { code } = res.data;
if (code !== 200) return;
console.log(res.data.data, '包件列表');
data.value = res.data.data || [];
Tabs.value[1].data = res.data.data;
editLoading.value = false; //
});
}
@ -2093,6 +2106,7 @@ function InventoryList() {
signforInventoryList(RouterId.value).then(res => {
console.log(res, '库存品列表');
data.value = res.data.data || [];
Tabs.value[2].data = data;
editLoading.value = false; //
});
}
@ -2271,6 +2285,36 @@ const ImgSuccessE = (response, uploadFile) => {
SignForPhotos.value[SignForPhotos.value.length - 1].url = response.data.link;
}
};
/** 输入框筛选 */
const inputsc = (value, row, type) => {
console.log('value :>> ', value);
console.log('row :>> ', row);
console.log('type :>> ', type);
const _item = Tabs.value.find(val => val.type === type);
const reg = new RegExp(value, 'i');
_item.query[row.prop] = reg;
if (value === '') delete _item.query[row.prop];
console.log('reg :>> ', reg);
if (Object.keys(_item.query).length === 0) return (_item.data = data.value);
const _data = data.value.filter(value => {
let _flag = true;
for (let key in _item.query) {
console.log('_item.query[key].test(value[key]) :>> ', _item.query[key].test(value[key]));
if (!_item.query[key].test(value[key])) _flag = false;
if (!_flag) break;
}
return _flag;
});
console.log('_data :>> ', _data);
_item.data = _data;
};
</script>
<style lang="scss" scoped>

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

@ -267,6 +267,16 @@
<el-button type="primary" @click="AddInfo"
><el-icon><Plus /></el-icon> </el-button
>
<div class="el_multifunctional">
<el-input
v-model="multifunctional"
placeholder="请输入要搜索的值"
clearable
/>
<el-button type="primary" @click="SearchFu"
><el-icon><Plus /></el-icon></el-button
>
</div>
</div>
</div>
<!-- 顶部结束 -->
@ -309,11 +319,14 @@
align="center"
>
<template #default="props">
<span>{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
<span :class="props.row[item.prop]=='state'?'.static-class':''">{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
</template>
</el-table-column>
</template>
<template v-if="item.type === 2">
<el-table-column
v-if="item.head"
@ -814,6 +827,7 @@ const data = ref([]); // 表格数据
const wrapData = ref([]); //
const wrapLoading = ref(false); //
const dataInfo = ref([]); //
const dataInfoTemp=ref([]);//
const dataTmp = ref([]); //
const TabHeight = ref(230); //
const TCTabHeight = ref(600); //
@ -843,6 +857,7 @@ const SjTc = ref(false); //司机信息弹窗
const editLoading = ref(false); //
const state = ref(false); //
const tableRefs = ref(null); //
const multifunctional = ref(''); //
const dataId = ref(null); //ID,ID
const wrapDataInfo = ref([]); //
const RouteId = ref(null); //ID
@ -1667,6 +1682,7 @@ onMounted(() => {
}
wrapDataInfo.value = res.data.data.stockArticleList; //
dataInfo.value = res.data.data.stockArticleList; //
// dataInfoTemp.value=dataInfo.value;//
DataSubmit.value.stockup.loaderId = res.data.data.loadingTeamId; //ID
DataSubmit.value.stockup.loaderName = res.data.data.loadingTeamName; //
DataSubmit.value.stockup.unloaderId = res.data.data.unloadingTeamId; //ID
@ -1913,7 +1929,7 @@ const ViewEvent = val => {
current: 1,
size: 100,
deliveryId: RouteId.value,
orderId: val.id,
id: val.id,
}).then(res => {
console.log(res, '订单包件信息');
if (res.data.code == 200) {
@ -1938,7 +1954,7 @@ const ViewEvent = val => {
});
} else {
$_getPackageListByStockArticleId({
orderId: val.id,
id: val.id,
current: 1,
size: 100,
}).then(res => {
@ -1978,6 +1994,29 @@ const Entering = val => {
isZeroTable.value = res.data.data;
});
};
//
const SearchFu = () => {
console.log('多功能搜索功能');
console.log(dataInfo.value, '当前订单');
let st= dataInfo.value.filter(item => {
return Object.values(item).some(val => {
if (typeof val === 'string') {
return val.includes(multifunctional.value);
}
return false;
});
});
st.forEach(item=>{
item.state=true;
})
console.log(st, '搜索结果');
};
//
const QuantityEntry = val => {
dataId.value = findIndexById(val.id); //
@ -2536,6 +2575,7 @@ const SubmitCommercial = () => {
justify-content: space-between;
}
.el-Cart-button-left {
width: 100%;
:deep(button) {
padding: 0 14px;
min-width: 70px;
@ -2943,4 +2983,19 @@ const SubmitCommercial = () => {
margin-top: 26px;
}
}
.el_multifunctional {
display: flex;
align-items: center;
justify-content: space-between;
width: 24%;
.el-input {
margin-right: 4px;
}
button {
width: 100px;
}
}
.static-class {
background-color: seagreen;
}
</style>

5
src/views/distribution/turndelivery/deliveryMarket.vue

@ -1362,6 +1362,8 @@ export default {
},
// ()
async onSubmitOrder() {
// console.log(this.reservationData,'');
// return
try {
this.loadingObj.submitBtnLoading = true;
@ -1481,6 +1483,7 @@ export default {
}
console.log('this.data------------>', this.data);
if (!this.deliveryListId) {
// this.reservationData.map(item=>item.id).join(',')
data.reservationIds = this.reservationIds;
data.reservationIds = this.reservationData.map(val => val.id).join(',');
if (this.reservationData.length < 1) {
@ -1490,7 +1493,7 @@ export default {
});
return;
}
console.log('>>>>>>>>>>>>', data);
const res = await deliveryTask(data);

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

@ -299,15 +299,42 @@ export default {
sortable: false,
head: false,
},
{
prop: 'materialCode',
label: '物料编码',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
label: '预约单号',
prop: 'reservationCode',
display: false,
hide: true,
},
{
label: '配送单号',
prop: 'noteNumber',
display: false,
hide: true,
},
{
label: '签收司机',
prop: 'driverName',
display: false,
hide: true,
},
{
label: '装车时间',
prop: 'scanTime',
display: false,
hide: true,
},
{
label: '配送车次',
prop: 'dvehicleName',
display: false,
hide: true,
},
{
label: '签收车次',
prop: 'zvehicleName',
display: false,
hide: true,
},
{
prop: 'firsts',
@ -339,6 +366,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'materialCode',
label: '物料编码',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderPackageStockupStatusName',
label: '备货状态',

Loading…
Cancel
Save