|
|
|
|
<template>
|
|
|
|
|
<basic-container>
|
|
|
|
|
<div class="avue-crud">
|
|
|
|
|
<el-form
|
|
|
|
|
ref="form"
|
|
|
|
|
:model="form"
|
|
|
|
|
prop="consignee"
|
|
|
|
|
label-width="80px"
|
|
|
|
|
:rules="reservationRules"
|
|
|
|
|
>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="收货人:" prop="consignee" label-width="100px">
|
|
|
|
|
<el-input v-model="form.consignee" clearable placeholder="请输入收货人"/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="预约时间:" prop="reservationDate" label-width="100px">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="form.reservationDate"
|
|
|
|
|
type="date"
|
|
|
|
|
clearable
|
|
|
|
|
placeholder="选择日期时间"
|
|
|
|
|
>
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="收货地址:" prop="deliveryAddress" label-width="100px">
|
|
|
|
|
<el-input v-model="form.deliveryAddress" clearable placeholder="请输入收件地址"/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="时  段:" prop="periodOfTime" label-width="100px">
|
|
|
|
|
<el-radio-group v-model="form.periodOfTime" v-for="item in this.periodOfTimeData">
|
|
|
|
|
<el-radio :label="item.dictKey" :value="item.dictKey"
|
|
|
|
|
>{{ item.dictValue }} 
|
|
|
|
|
</el-radio>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
<!-- :label="item.dictValue"-->
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="收件人电话:" prop="deliveryPhone" label-width="100px">
|
|
|
|
|
<el-input v-model="form.deliveryPhone" placeholder="请输入收件人电话"/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="配送类型:" prop="serveType" label-width="100px">
|
|
|
|
|
<!-- v-for="item in this.deliveryTypeData"-->
|
|
|
|
|
<el-radio-group v-model="form.deliveryType">
|
|
|
|
|
<el-radio :label="'2'" :value="'2'">市配 </el-radio>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="代收运费:" prop="replaceFee" label-width="100px">
|
|
|
|
|
<el-input v-model="form.replaceFee" :disabled="true"/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="配送方式:" prop="serveType" label-width="100px">
|
|
|
|
|
<!-- v-for="item in this.deliveryWayData"-->
|
|
|
|
|
<el-radio-group v-model="form.deliveryWay">
|
|
|
|
|
<el-radio :label="'10'" :value="'10'">送货 </el-radio>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
<!-- <el-col :span="10">-->
|
|
|
|
|
<!-- <el-form-item label="到付运费:" prop="collectFee" label-width="100px">-->
|
|
|
|
|
<!-- <el-input type="number" v-model="form.collectFee" :disabled="true"/>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="待收货款:" prop="collectionFee" label-width="100px">
|
|
|
|
|
<el-input type="number" v-model="form.collectionFee"/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="加  急:" prop="serveType" label-width="100px">
|
|
|
|
|
<!-- v-for="item in this.deliveryWayData"-->
|
|
|
|
|
<el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">
|
|
|
|
|
<el-radio :label="item.dictKey" :value="item.dictKey"
|
|
|
|
|
>{{ item.dictValue }} 
|
|
|
|
|
</el-radio>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="其他费用:" prop="collectFee" label-width="100px">
|
|
|
|
|
<el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="服务类型:" prop="serveType" label-width="120px">
|
|
|
|
|
<el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
|
|
|
|
|
<el-checkbox :label="item.dictKey"
|
|
|
|
|
:value="item.dictKey">{{item.dictValue}} 
|
|
|
|
|
</el-checkbox>
|
|
|
|
|
</el-checkbox-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">
|
|
|
|
|
<el-input type="textarea" :rows="1" placeholder="请输入内容" v-model="form.remarks">
|
|
|
|
|
</el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
|
|
<el-tabs type="border-card">
|
|
|
|
|
<el-tab-pane label="订单">
|
|
|
|
|
<el-button type="primary" link @click="handleAddOrder">新 增</el-button>
|
|
|
|
|
<tablecmt
|
|
|
|
|
:columnList="columnList"
|
|
|
|
|
:tableData="orderData"
|
|
|
|
|
:loading="loading"
|
|
|
|
|
@inputTxt="inputsc"
|
|
|
|
|
@timeCheck="timesc"
|
|
|
|
|
@btnCheck="btnsc"
|
|
|
|
|
@selectCheck="selectsc"
|
|
|
|
|
@selection="selectionChange"
|
|
|
|
|
|
|
|
|
|
>
|
|
|
|
|
<template #default="slotProps">
|
|
|
|
|
<el-text v-if="slotProps.scope.row.resource !=='零担'"
|
|
|
|
|
type="primary"
|
|
|
|
|
link
|
|
|
|
|
icon="el-icon-view"
|
|
|
|
|
@click="viewStockArticlePackage(slotProps.scope.row)"
|
|
|
|
|
>查看包件
|
|
|
|
|
</el-text>
|
|
|
|
|
<el-text v-if="slotProps.scope.row.resource ==='零担' ||slotProps.scope.row.isZero ==='1'"
|
|
|
|
|
type="primary"
|
|
|
|
|
link
|
|
|
|
|
icon="el-icon-view"
|
|
|
|
|
@click="entryNum(slotProps.scope.row)"
|
|
|
|
|
>在库录入
|
|
|
|
|
</el-text>
|
|
|
|
|
<el-text v-if="slotProps.scope.row.resource ==='零担' ||slotProps.scope.row.isZero ==='1'"
|
|
|
|
|
type="primary"
|
|
|
|
|
link
|
|
|
|
|
icon="el-icon-view"
|
|
|
|
|
@click="entryReservationNum(slotProps.scope.row)"
|
|
|
|
|
>预约录入
|
|
|
|
|
</el-text>
|
|
|
|
|
<el-text
|
|
|
|
|
type="primary"
|
|
|
|
|
link
|
|
|
|
|
icon="el-icon-edit"
|
|
|
|
|
@click="removeStockArticle(slotProps.scope.row)"
|
|
|
|
|
>移除
|
|
|
|
|
</el-text
|
|
|
|
|
>
|
|
|
|
|
</template>
|
|
|
|
|
</tablecmt>
|
|
|
|
|
<!-- <el-table ref="table"
|
|
|
|
|
v-loading="loading"
|
|
|
|
|
:data="orderData"
|
|
|
|
|
:height="height"
|
|
|
|
|
style="width: 100%"
|
|
|
|
|
:border="option.border">
|
|
|
|
|
<el-table-column v-if="option.index" label="序号" type="index" width="80px"
|
|
|
|
|
align="center"></el-table-column>
|
|
|
|
|
<template v-for="(item,index) in option.columnReservations">
|
|
|
|
|
<el-table-column v-if="item.hide!==true"
|
|
|
|
|
:prop="item.prop"
|
|
|
|
|
:label="item.label"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:key="index">
|
|
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</template>
|
|
|
|
|
<el-table-column prop="menu" label="操作" :width="220" align="center">
|
|
|
|
|
<template #="{row}">
|
|
|
|
|
<el-button type="primary" link icon="el-icon-view"
|
|
|
|
|
@click="viewStockArticlePackage(row)">查看包件
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除
|
|
|
|
|
</el-button>
|
|
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table> -->
|
|
|
|
|
</el-tab-pane>
|
|
|
|
|
|
|
|
|
|
<el-tab-pane label="库存品">
|
|
|
|
|
<el-button link @click="handleAddInventory">新 增</el-button>
|
|
|
|
|
<tablecmt
|
|
|
|
|
:columnList="stockcolumnList"
|
|
|
|
|
:tableData="inventoryData"
|
|
|
|
|
:loading="loading"
|
|
|
|
|
@inputTxt="inputsc"
|
|
|
|
|
@timeCheck="timesc"
|
|
|
|
|
@btnCheck="btnsc"
|
|
|
|
|
@selectCheck="selectsc"
|
|
|
|
|
@selection="selectionChange"
|
|
|
|
|
>
|
|
|
|
|
<template #default="slotProps">
|
|
|
|
|
<!-- <el-text-->
|
|
|
|
|
<!-- v-if="inventoryShow"-->
|
|
|
|
|
<!-- type="primary"-->
|
|
|
|
|
<!-- link-->
|
|
|
|
|
<!-- icon="el-icon-edit"-->
|
|
|
|
|
<!-- @click="showStockListEdit(slotProps.scope.row)"-->
|
|
|
|
|
<!-- >查看详情</el-text>-->
|
|
|
|
|
|
|
|
|
|
<el-text
|
|
|
|
|
type="primary"
|
|
|
|
|
link
|
|
|
|
|
icon="el-icon-edit"
|
|
|
|
|
@click="removeStockList(slotProps.scope.row)"
|
|
|
|
|
>移除
|
|
|
|
|
</el-text
|
|
|
|
|
>
|
|
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
</tablecmt>
|
|
|
|
|
</el-tab-pane>
|
|
|
|
|
</el-tabs>
|
|
|
|
|
<el-form-item style="margin-left: 45%; margin-top: 5px">
|
|
|
|
|
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmit"
|
|
|
|
|
>提交(配送订单预约)
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button icon="el-icon-circle-close" @click="$router.go(-1)">返 回</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
<el-dialog v-model="orderShow" title="在库订单信息" width="100%" :model="addvalue">
|
|
|
|
|
<!-- :before-close="handleClose"-->
|
|
|
|
|
<el-form :inline="true" :model="query">
|
|
|
|
|
<el-form-item label="订单自编号:">
|
|
|
|
|
<el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="商场名称:">
|
|
|
|
|
<el-input v-model="query.mallName" placeholder="请输入商场名称"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="货物名称:">
|
|
|
|
|
<el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="品牌:">
|
|
|
|
|
<el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="顾客姓名:">
|
|
|
|
|
<el-input v-model="query.customerName" placeholder="请输入顾客姓名"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="顾客电话:">
|
|
|
|
|
<el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
<!-- 查询按钮 -->
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="searchStockArticle"
|
|
|
|
|
>搜 索
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button icon="el-icon-delete" @click="stockArticleSearchReset()">清 空</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form>
|
|
|
|
|
<tablecmt
|
|
|
|
|
:columnList="stockArtcolumnList"
|
|
|
|
|
:tableData="stockArticleInfo"
|
|
|
|
|
:loading="loading"
|
|
|
|
|
@inputTxt="inputscStockArtic"
|
|
|
|
|
@timeCheck="timescStockArtic"
|
|
|
|
|
@btnCheck="btnscStockArtic"
|
|
|
|
|
@selectCheck="selectscStockArtic"
|
|
|
|
|
@selection="selectionChange"
|
|
|
|
|
>
|
|
|
|
|
<template #default="slotProps">
|
|
|
|
|
<el-text
|
|
|
|
|
type="primary"
|
|
|
|
|
link
|
|
|
|
|
icon="el-icon-edit"
|
|
|
|
|
@click="removeStockList(slotProps.scope.row)"
|
|
|
|
|
>移除
|
|
|
|
|
</el-text
|
|
|
|
|
>
|
|
|
|
|
</template>
|
|
|
|
|
</tablecmt>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
<div class="avue-crud__pagination" style="width: 100%">
|
|
|
|
|
<!-- 分页模块 -->
|
|
|
|
|
<el-pagination
|
|
|
|
|
align="right"
|
|
|
|
|
background
|
|
|
|
|
@size-change="sizeOrderChange"
|
|
|
|
|
@current-change="currentOrderChange"
|
|
|
|
|
:current-page="page.currentPage"
|
|
|
|
|
:page-sizes="[30, 50, 80, 120]"
|
|
|
|
|
:page-size="page.pageSize"
|
|
|
|
|
layout="total, sizes, prev, pager, next, jumper"
|
|
|
|
|
:total="page.total"
|
|
|
|
|
>
|
|
|
|
|
</el-pagination>
|
|
|
|
|
</div>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-form-item style="margin-left: 45%; margin-top: 5px">
|
|
|
|
|
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
|
|
|
|
|
>提交(订单)
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
v-model="zeroOrderShow"
|
|
|
|
|
title="零担品类信息"
|
|
|
|
|
width="50%"
|
|
|
|
|
:model="zeroOrderData">
|
|
|
|
|
<el-row :gutter="24" class="rows">
|
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24">
|
|
|
|
|
<h3><span>在库总数：{{this.obj.handQuantity}}</span></h3>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<template v-if="zeroOrderData != null">
|
|
|
|
|
<div v-for="(item,index) in zeroOrderData" :key="index">
|
|
|
|
|
<el-row :gutter="24" class="rows">
|
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24">
|
|
|
|
|
<span>名称：{{item.firsts }}</span>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24">
|
|
|
|
|
<span>总数量：{{item.quantity }} </span>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24">
|
|
|
|
|
<span>在库数量：{{item.handQuantity }} </span>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24">
|
|
|
|
|
<span>冻结数量：{{item.deliveryQuantity }} </span>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24">
|
|
|
|
|
<span>出库数量：{{item.outboundQuantity }} </span>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24">
|
|
|
|
|
<span>可用数量：{{(item.handQuantity - item.deliveryQuantity - item.outboundQuantity)}}</span>
|
|
|
|
|
<!-- <span>可用数量：{{(item.quantity)}}</span>-->
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-input-number v-if="this.isrReservationEntry" v-model="item.reservationNum" min="0"
|
|
|
|
|
:max="item.zeroOrderMax"
|
|
|
|
|
placeholder="请输入预约数量"></el-input-number>
|
|
|
|
|
<el-input-number v-else v-model="item.number" min="0"
|
|
|
|
|
:max="item.quantity"
|
|
|
|
|
placeholder="请输入预约数量"></el-input-number>
|
|
|
|
|
<!-- <el-input-number v-model="item.reservationNum" min="0" :max="item.quantity - item.deliveryQuantity -item.outboundQuantity " placeholder="请输入预约数量"></el-input-number>-->
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
<el-form-item style="margin-left: 37%; margin-top: 5px">
|
|
|
|
|
<el-button v-if="!isrReservationEntry" type="primary" icon="el-icon-circle-close" @click="onSubmitUpdateZeroOrder"
|
|
|
|
|
>修改(零担订单)
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitZeroOrder"
|
|
|
|
|
>提交(零担订单)
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button icon="el-icon-circle-close" @click="zeroOrderShow = false">返 回</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<el-dialog v-model="stockListShow" title="库存品信息" width="100%">
|
|
|
|
|
<!-- :before-close="handleClose"-->
|
|
|
|
|
<el-form :inline="true" :model="query">
|
|
|
|
|
<el-form-item label="商场名称:">
|
|
|
|
|
<el-input v-model="query.marketName" placeholder="请输入商场名称"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="物料名称:">
|
|
|
|
|
<el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="商场编码:">
|
|
|
|
|
<el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="订单自编号:">
|
|
|
|
|
<el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="品牌:">
|
|
|
|
|
<el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<!-- 查询按钮 -->
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="searchStockList"
|
|
|
|
|
>搜 索
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form>
|
|
|
|
|
<tablecmt
|
|
|
|
|
:columnList="inventoryInfocolumnList"
|
|
|
|
|
:tableData="inventoryInfo"
|
|
|
|
|
:loading="loading"
|
|
|
|
|
@inputTxt="inputsc"
|
|
|
|
|
@timeCheck="timesc"
|
|
|
|
|
@btnCheck="btnsc"
|
|
|
|
|
@selectCheck="selectsc"
|
|
|
|
|
@selection="selectionInventoryChange"
|
|
|
|
|
ref=multipleTable
|
|
|
|
|
>
|
|
|
|
|
<template #default="slotProps">
|
|
|
|
|
<el-text
|
|
|
|
|
type="primary"
|
|
|
|
|
link
|
|
|
|
|
icon="el-icon-edit"
|
|
|
|
|
@click="removeStockList(slotProps.scope.row)"
|
|
|
|
|
>移除
|
|
|
|
|
</el-text
|
|
|
|
|
>
|
|
|
|
|
</template>
|
|
|
|
|
</tablecmt>
|
|
|
|
|
<el-form-item style="margin-left: 45%; margin-top: 5px">
|
|
|
|
|
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
|
|
|
|
|
>提交(库存品)
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue">
|
|
|
|
|
<!-- 列表模块 -->
|
|
|
|
|
<!-- :isselectfun="checkPackage"-->
|
|
|
|
|
<tablecmt
|
|
|
|
|
:columnList="columnParcels"
|
|
|
|
|
:tableData="packageData"
|
|
|
|
|
:checkselect="packageDataSec"
|
|
|
|
|
:loading="loading"
|
|
|
|
|
@selection="selectionPackageChange"
|
|
|
|
|
@select='tableAllSelection'
|
|
|
|
|
@cell-mouse-enter='hove'
|
|
|
|
|
>
|
|
|
|
|
<template #default="slotProps">
|
|
|
|
|
<!-- <el-text
|
|
|
|
|
type="primary"
|
|
|
|
|
link
|
|
|
|
|
icon="el-icon-edit"
|
|
|
|
|
@click="removeStockList(slotProps.scope.row)"
|
|
|
|
|
>移除</el-text
|
|
|
|
|
> -->
|
|
|
|
|
</template>
|
|
|
|
|
</tablecmt>
|
|
|
|
|
<!-- <el-table
|
|
|
|
|
ref="packageList"
|
|
|
|
|
v-loading="loading"
|
|
|
|
|
@selection-change="selectionPackageChange"
|
|
|
|
|
:data="packageData"
|
|
|
|
|
:height="height"
|
|
|
|
|
style="width: 100%"
|
|
|
|
|
:border="option.border"
|
|
|
|
|
>
|
|
|
|
|
<el-table-column
|
|
|
|
|
type="selection"
|
|
|
|
|
v-if="option.selection"
|
|
|
|
|
:selectable="checkPackage"
|
|
|
|
|
align="center"
|
|
|
|
|
width="55"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
|
|
|
|
|
<el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<template v-for="(item, index) in option.columnParcels">
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.hide !== true"
|
|
|
|
|
:prop="item.prop"
|
|
|
|
|
:label="item.label"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:key="index"
|
|
|
|
|
>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</template>
|
|
|
|
|
<el-table-column prop="menu" label="操作" :width="220" align="center">
|
|
|
|
|
<template #="{ row }">
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table> -->
|
|
|
|
|
<el-form-item style="margin-left: 45%; margin-top: 5px">
|
|
|
|
|
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
|
|
|
|
|
>提交(包件)
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button icon="el-icon-circle-close" @click="isaddvalue = false">返 回</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
v-model="dialogVisible"
|
|
|
|
|
title="增值服务"
|
|
|
|
|
width="30%"
|
|
|
|
|
:model="addvalue"
|
|
|
|
|
:before-close="handleClose"
|
|
|
|
|
>
|
|
|
|
|
<el-form-item label="增值服务" prop="freightMark">
|
|
|
|
|
<el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
|
|
|
|
|
<el-checkbox
|
|
|
|
|
style="width: 100%; margin-bottom: 3%"
|
|
|
|
|
v-for="(item, index) in addvalueServeTypeData"
|
|
|
|
|
:key="item.dictKey"
|
|
|
|
|
:label="item.dictKey"
|
|
|
|
|
>{{ item.dictValue }}
|
|
|
|
|
<span v-if="index === 0 || index === 6 || index === 2 || index === 4"
|
|
|
|
|
> 件数:
|
|
|
|
|
<el-input
|
|
|
|
|
type="number"
|
|
|
|
|
v-model="item.f"
|
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
|
|
|
|
|
@change="textbox($event, index, 1)"
|
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee"
|
|
|
|
|
/>
|
|
|
|
|
</span>
|
|
|
|
|
<span v-if="index === 1"
|
|
|
|
|
>公里:
|
|
|
|
|
<el-input
|
|
|
|
|
type="primary"
|
|
|
|
|
v-model="item.a"
|
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
|
|
|
|
|
@change="textbox($event, index, 2)"
|
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee"
|
|
|
|
|
/>
|
|
|
|
|
</span>
|
|
|
|
|
<span v-if="index === 3"
|
|
|
|
|
>距离:
|
|
|
|
|
<el-input
|
|
|
|
|
type="number"
|
|
|
|
|
v-model="item.b"
|
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
|
|
|
|
|
@change="textbox($event, index, 3)"
|
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee"
|
|
|
|
|
/>
|
|
|
|
|
</span>
|
|
|
|
|
<span v-if="index === 5"
|
|
|
|
|
>人数:
|
|
|
|
|
<el-input
|
|
|
|
|
type="number"
|
|
|
|
|
v-model="item.c"
|
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
|
|
|
|
|
@change="textbox($event, index, 4)"
|
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee"
|
|
|
|
|
/>
|
|
|
|
|
</span>
|
|
|
|
|
<span v-if="index === 0"
|
|
|
|
|
>楼层:
|
|
|
|
|
<el-input
|
|
|
|
|
type="number"
|
|
|
|
|
v-model="item.d"
|
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
|
|
|
|
|
@change="textbox($event, index, 5)"
|
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee"
|
|
|
|
|
/>
|
|
|
|
|
</span>
|
|
|
|
|
<span v-if="item"
|
|
|
|
|
>预计费用:
|
|
|
|
|
<el-input
|
|
|
|
|
type="number"
|
|
|
|
|
v-model="item.e"
|
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
|
|
|
|
|
@change="textbox($event, index, 6)"
|
|
|
|
|
style="width: 20%; border: none; border-bottom: 2px solid #eee"
|
|
|
|
|
/>
|
|
|
|
|
</span>
|
|
|
|
|
</el-checkbox>
|
|
|
|
|
</el-checkbox-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<template #footer>
|
|
|
|
|
<span class="dialog-footer">
|
|
|
|
|
<el-button @click="dialogVisible = false">取消</el-button>
|
|
|
|
|
<el-button type="primary" @click="aaa"> 确定(增值服务) </el-button>
|
|
|
|
|
</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
</div>
|
|
|
|
|
</basic-container>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
|
import {
|
|
|
|
|
autonomouslySave,
|
|
|
|
|
update,
|
|
|
|
|
remove,
|
|
|
|
|
getReservationInfo, getReservationZeroOrderDetail, getReservationPackageListByOrderId
|
|
|
|
|
} from '@/api/distribution/distributionReservation';
|
|
|
|
|
import {
|
|
|
|
|
getStockArticleList,
|
|
|
|
|
getPackageListByStockArticleId,
|
|
|
|
|
selectStockArticleInfoList,
|
|
|
|
|
selectUpdateAvailableStockArticle, getZeroOrderDetail
|
|
|
|
|
} from '@/api/distribution/distributionStockArticle';
|
|
|
|
|
import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
|
|
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle';
|
|
|
|
|
import { getInventoryList, selectInventoryDetail } from '@/api/distribution/distributionStockList';
|
|
|
|
|
|
|
|
|
|
import option from '@/option/distribution/distributionStockArticle';
|
|
|
|
|
import { mapGetters } from 'vuex';
|
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict';
|
|
|
|
|
import dayjs from 'dayjs';
|
|
|
|
|
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
columnList: [
|
|
|
|
|
{
|
|
|
|
|
prop: 'waybillNumber',
|
|
|
|
|
label: '运单号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'serviceNumber',
|
|
|
|
|
label: '服务号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderCode',
|
|
|
|
|
label: '订单自编号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'mallName',
|
|
|
|
|
label: '商场名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'storeName',
|
|
|
|
|
label: '门店名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'resource',
|
|
|
|
|
label: '订单来源',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'descriptionGoods',
|
|
|
|
|
label: '货物名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'warehouse',
|
|
|
|
|
label: '仓库',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderStatusName',
|
|
|
|
|
label: '订单状态',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'storeTime',
|
|
|
|
|
label: '在库时间',
|
|
|
|
|
type: 5,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'totalNumber',
|
|
|
|
|
label: '订单总件数',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'handQuantity',
|
|
|
|
|
label: '在库件数',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'reservationNum',
|
|
|
|
|
label: '预约数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'customerName',
|
|
|
|
|
label: '顾客名字',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'customerTelephone',
|
|
|
|
|
label: '顾客电话',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'customerAddress',
|
|
|
|
|
label: '顾客地址',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: '',
|
|
|
|
|
label: '操作',
|
|
|
|
|
type: 6,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: 'right',
|
|
|
|
|
hide: true
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
stockcolumnList: [
|
|
|
|
|
{
|
|
|
|
|
prop: 'incomingBatch',
|
|
|
|
|
label: '入库批次号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'marketCode',
|
|
|
|
|
label: '商场编码',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'marketName',
|
|
|
|
|
label: '商场名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'storeCode',
|
|
|
|
|
label: '门店编码',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'storeName',
|
|
|
|
|
label: '门店名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'cargoNumber',
|
|
|
|
|
label: '货物编号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'materialId',
|
|
|
|
|
label: '物料ID',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'descriptionGoods',
|
|
|
|
|
label: '物料名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'cargoUnit',
|
|
|
|
|
label: '物料单位',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'category',
|
|
|
|
|
label: '品分类',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'warehouseName',
|
|
|
|
|
label: '仓库名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'quantityStock',
|
|
|
|
|
label: '库存数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'applyNum',
|
|
|
|
|
label: '可用数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'quantityOccupied',
|
|
|
|
|
label: '冻结数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'outboundQuantity',
|
|
|
|
|
label: '出库数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'brand',
|
|
|
|
|
label: '品牌',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'cargoNumber',
|
|
|
|
|
label: '规格',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'cargoUnit',
|
|
|
|
|
label: '单位',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'reservationNum',
|
|
|
|
|
label: '预约数量',
|
|
|
|
|
type: 10,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: '',
|
|
|
|
|
label: '操作',
|
|
|
|
|
type: 6,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: 'right',
|
|
|
|
|
hide: true
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
stockArtcolumnList: [
|
|
|
|
|
{
|
|
|
|
|
prop: '',
|
|
|
|
|
label: '序号',
|
|
|
|
|
type: 0,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '50',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'waybillNumber',
|
|
|
|
|
label: '运单号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderCode',
|
|
|
|
|
label: '订单自编号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'mallName',
|
|
|
|
|
label: '商场名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'storeName',
|
|
|
|
|
label: '门店名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'descriptionGoods',
|
|
|
|
|
label: '货物名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'reservationStatusName',
|
|
|
|
|
label: '预约状态',
|
|
|
|
|
type: 3,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [
|
|
|
|
|
{
|
|
|
|
|
label: '未预约',
|
|
|
|
|
value: '10'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
label: '部分预约',
|
|
|
|
|
value: '20'
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'freezeStatusName',
|
|
|
|
|
label: '冻结状态',
|
|
|
|
|
type: 3,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [
|
|
|
|
|
{
|
|
|
|
|
label: '未冻结',
|
|
|
|
|
value: '10'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
label: '部分冻结',
|
|
|
|
|
value: '20'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
label: '已冻结',
|
|
|
|
|
value: '30'
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'warehouse',
|
|
|
|
|
label: '仓库',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'warehouseEntryTime',
|
|
|
|
|
label: '入库时间',
|
|
|
|
|
type: 4,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'storeTime',
|
|
|
|
|
label: '在库时间',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'totalNumber',
|
|
|
|
|
label: '订单总件数',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'handQuantity',
|
|
|
|
|
label: '在库件数',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'completeSetName',
|
|
|
|
|
label: '是否齐套',
|
|
|
|
|
type: 3,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [
|
|
|
|
|
{
|
|
|
|
|
label: '否',
|
|
|
|
|
value: '1'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
label: '是',
|
|
|
|
|
value: '2'
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'brand',
|
|
|
|
|
label: '品牌',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'customerName',
|
|
|
|
|
label: '顾客名字',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'customerTelephone',
|
|
|
|
|
label: '顾客电话',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'customerAddress',
|
|
|
|
|
label: '顾客地址',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'allocation',
|
|
|
|
|
label: '库位信息',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'trays',
|
|
|
|
|
label: '托盘信息',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
inventoryInfocolumnList: [
|
|
|
|
|
{
|
|
|
|
|
prop: '',
|
|
|
|
|
label: '序号',
|
|
|
|
|
type: 0,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '50',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderCode',
|
|
|
|
|
label: '订单自编号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'marketCode',
|
|
|
|
|
label: '商场编码',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'marketName',
|
|
|
|
|
label: '商场名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'storeCode',
|
|
|
|
|
label: '门店编码',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'storeName',
|
|
|
|
|
label: '门店名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'cargoNumber',
|
|
|
|
|
label: '物料编码',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
// {
|
|
|
|
|
// prop: 'materialId',
|
|
|
|
|
// label: '物料ID',
|
|
|
|
|
// type: 2,
|
|
|
|
|
// values: '',
|
|
|
|
|
// width: '150',
|
|
|
|
|
// checkarr: [],
|
|
|
|
|
// fixed: false,
|
|
|
|
|
// sortable: true,
|
|
|
|
|
// head: false
|
|
|
|
|
// },
|
|
|
|
|
{
|
|
|
|
|
prop: 'descriptionGoods',
|
|
|
|
|
label: '物料名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'cargoUnit',
|
|
|
|
|
label: '物料单位',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'category',
|
|
|
|
|
label: '品分类',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'warehouseName',
|
|
|
|
|
label: '仓库名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'quantityStock',
|
|
|
|
|
label: '库存数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'applyNum',
|
|
|
|
|
label: '可用数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'quantityOccupied',
|
|
|
|
|
label: '冻结数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'outboundQuantity',
|
|
|
|
|
label: '出库数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'brand',
|
|
|
|
|
label: '品牌',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'cargoNumber',
|
|
|
|
|
label: '规格',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'cargoUnit',
|
|
|
|
|
label: '单位',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'reservationNum',
|
|
|
|
|
label: '预约数量',
|
|
|
|
|
type: 10,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
columnParcels: [
|
|
|
|
|
{
|
|
|
|
|
prop: '',
|
|
|
|
|
label: '序号',
|
|
|
|
|
type: 0,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '50',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: true,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'warehouse',
|
|
|
|
|
label: '仓库',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'waybillNumber',
|
|
|
|
|
label: '运单号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderPackageStatusName',
|
|
|
|
|
label: '包件状态',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderPackageFreezeStatusName',
|
|
|
|
|
label: '冻结状态',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderPackageGroundingStatusName',
|
|
|
|
|
label: '上架状态',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderPackageStockupStatusName',
|
|
|
|
|
label: '备货状态',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderPackageReservationStatusName',
|
|
|
|
|
label: '预约状态',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'orderPackageCode',
|
|
|
|
|
label: '包条码',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'goodsAllocation',
|
|
|
|
|
label: '货位信息',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'pallet',
|
|
|
|
|
label: '所在托盘',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'firsts',
|
|
|
|
|
label: '一级品',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'second',
|
|
|
|
|
label: '二级品',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'thirdProduct',
|
|
|
|
|
label: '三级品',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'materialName',
|
|
|
|
|
label: '物料名称',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'quantity',
|
|
|
|
|
label: '数量',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: false,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
prop: 'trainNumber',
|
|
|
|
|
label: '客户车次号',
|
|
|
|
|
type: 2,
|
|
|
|
|
values: '',
|
|
|
|
|
width: '150',
|
|
|
|
|
checkarr: [],
|
|
|
|
|
fixed: true,
|
|
|
|
|
sortable: true,
|
|
|
|
|
head: false
|
|
|
|
|
}
|
|
|
|
|
// {
|
|
|
|
|
// prop: '',
|
|
|
|
|
// label: '操作',
|
|
|
|
|
// type: 6,
|
|
|
|
|
// values: '',
|
|
|
|
|
// width: '150',
|
|
|
|
|
// checkarr: [],
|
|
|
|
|
// fixed: 'right',
|
|
|
|
|
// hide: true,
|
|
|
|
|
// },
|
|
|
|
|
],
|
|
|
|
|
height: 0,
|
|
|
|
|
// 弹框标题
|
|
|
|
|
title: '',
|
|
|
|
|
// 是否展示弹框
|
|
|
|
|
box: false,
|
|
|
|
|
// 是否显示查询
|
|
|
|
|
search: true,
|
|
|
|
|
// 加载中
|
|
|
|
|
loading: true,
|
|
|
|
|
// 是否为查看模式
|
|
|
|
|
view: false,
|
|
|
|
|
// 查询信息
|
|
|
|
|
query: {},
|
|
|
|
|
// 分页信息
|
|
|
|
|
page: {
|
|
|
|
|
currentPage: 1,
|
|
|
|
|
pageSize: 30,
|
|
|
|
|
total: 40
|
|
|
|
|
},
|
|
|
|
|
// 表单数据
|
|
|
|
|
form: {},
|
|
|
|
|
// 选择行
|
|
|
|
|
selectionList: [],
|
|
|
|
|
// 表单配置
|
|
|
|
|
option: option,
|
|
|
|
|
// 表单列表
|
|
|
|
|
data: [],
|
|
|
|
|
//增值服务弹窗
|
|
|
|
|
dialogVisible: false,
|
|
|
|
|
textarea: '',
|
|
|
|
|
//增值服务字典列表
|
|
|
|
|
addvalueServeTypeData: [],
|
|
|
|
|
//配送方式字典列表
|
|
|
|
|
deliveryWayData: [],
|
|
|
|
|
whetherData: [],
|
|
|
|
|
//配送类型字典列表
|
|
|
|
|
deliveryTypeData: [],
|
|
|
|
|
//增值服务列表
|
|
|
|
|
addvalueServeType: [],
|
|
|
|
|
obj: {},
|
|
|
|
|
//增值表单输入框对象
|
|
|
|
|
addvalue: {},
|
|
|
|
|
costList: [], //字典
|
|
|
|
|
//增值服务对象
|
|
|
|
|
addvalueObj: {},
|
|
|
|
|
//费用列表
|
|
|
|
|
feeList: [],
|
|
|
|
|
//楼层
|
|
|
|
|
floorList: [],
|
|
|
|
|
//订单行数据
|
|
|
|
|
orderInfo: {},
|
|
|
|
|
//服务类型
|
|
|
|
|
serveType: [],
|
|
|
|
|
//增加订单弹窗
|
|
|
|
|
orderShow: false,
|
|
|
|
|
zeroOrderData: [],
|
|
|
|
|
zeroOrderShow: false,
|
|
|
|
|
//是否是预约录入
|
|
|
|
|
isrReservationEntry: false,
|
|
|
|
|
// zeroPackageNum:0,
|
|
|
|
|
//在库订单信息
|
|
|
|
|
stockArticleInfo: [],
|
|
|
|
|
//库存品信息
|
|
|
|
|
inventoryInfo: [],
|
|
|
|
|
//时段
|
|
|
|
|
periodOfTimeData: [],
|
|
|
|
|
//路由订单编号
|
|
|
|
|
orderIds: '',
|
|
|
|
|
//预约编号
|
|
|
|
|
reservationId: '',
|
|
|
|
|
zeroOrderMax: 0,
|
|
|
|
|
// 商城名称
|
|
|
|
|
marketName: '',
|
|
|
|
|
// 包件复选框列表
|
|
|
|
|
packageDataSec: [],
|
|
|
|
|
inventoryData: [],
|
|
|
|
|
orderData: [],
|
|
|
|
|
stockListShow: false,
|
|
|
|
|
isaddvalue: false,
|
|
|
|
|
packageData: [],
|
|
|
|
|
packageList: [],
|
|
|
|
|
inventoryList: [],
|
|
|
|
|
orderList: [],
|
|
|
|
|
inventoryTable: [],
|
|
|
|
|
inventoryShow: false,
|
|
|
|
|
reservationRules: {
|
|
|
|
|
consignee: [{ required: true, message: '请填写收货人名称!!!', trigger: 'change' }],
|
|
|
|
|
deliveryAddress: [{ required: true, message: '请填写收货人地址!!!', trigger: 'blur' }],
|
|
|
|
|
deliveryPhone: [{ required: true, message: '请填写收货人电话!!!', trigger: 'change' }]
|
|
|
|
|
// enableStatus: [
|
|
|
|
|
// { required: true, message: '请选择启用状态!', trigger: 'change' }
|
|
|
|
|
// ],
|
|
|
|
|
},
|
|
|
|
|
obj: {}
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
this.$watch(
|
|
|
|
|
() => this.$route.params,
|
|
|
|
|
() => {
|
|
|
|
|
this.fetchData();
|
|
|
|
|
},
|
|
|
|
|
// 组件创建完后获取数据，
|
|
|
|
|
// 此时 data 已经被 observed 了
|
|
|
|
|
{ immediate: true }
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
mounted() {
|
|
|
|
|
this.init();
|
|
|
|
|
|
|
|
|
|
this.onLoad(this.page);
|
|
|
|
|
this.getDictionary();
|
|
|
|
|
},
|
|
|
|
|
watch: {
|
|
|
|
|
'$route.query.reservationId': {
|
|
|
|
|
handler(newVal, oldVal) {
|
|
|
|
|
console.log(newVal, oldVal);
|
|
|
|
|
this.fetchData();
|
|
|
|
|
this.onLoad(this.page);
|
|
|
|
|
},
|
|
|
|
|
deep: true,
|
|
|
|
|
immediate: true
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
computed: {
|
|
|
|
|
...mapGetters(['permission']),
|
|
|
|
|
ids() {
|
|
|
|
|
let ids = [];
|
|
|
|
|
this.selectionList.forEach(ele => {
|
|
|
|
|
ids.push(ele.id);
|
|
|
|
|
});
|
|
|
|
|
return ids.join(',');
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
handleToggleAllSelection() {
|
|
|
|
|
this.$refs.selecttable.toggleAllSelection();
|
|
|
|
|
},
|
|
|
|
|
fetchData() {
|
|
|
|
|
this.error = this.post = null;
|
|
|
|
|
this.loading = true;
|
|
|
|
|
if (this.$route.query.id) {
|
|
|
|
|
this.orderIds = this.$route.query.id;
|
|
|
|
|
}
|
|
|
|
|
if (this.$route.query.reservationId) {
|
|
|
|
|
this.reservationId = this.$route.query.reservationId;
|
|
|
|
|
}
|
|
|
|
|
this.loading = false;
|
|
|
|
|
},
|
|
|
|
|
init() {
|
|
|
|
|
this.height = this.setPx(document.body.clientHeight - 340);
|
|
|
|
|
},
|
|
|
|
|
aaa() {
|
|
|
|
|
let addvalueInfos = [];
|
|
|
|
|
this.form.addvalueType.forEach((item, index) => {
|
|
|
|
|
let addvalueInfo = {};
|
|
|
|
|
addvalueInfo.addvalueId = item;
|
|
|
|
|
if (item == 1 || item == 3 || item == 5 || item == 7) {
|
|
|
|
|
addvalueInfo.number = this.costList[item];
|
|
|
|
|
}
|
|
|
|
|
if (item == 2) {
|
|
|
|
|
addvalueInfo.kilometer = this.costList[item];
|
|
|
|
|
}
|
|
|
|
|
if (item == 4) {
|
|
|
|
|
addvalueInfo.distance = this.costList[item];
|
|
|
|
|
}
|
|
|
|
|
if (item == 6) {
|
|
|
|
|
addvalueInfo.peopleNum = this.costList[item];
|
|
|
|
|
}
|
|
|
|
|
if (this.floorList.length > 1) {
|
|
|
|
|
addvalueInfo.floor = this.floorList[1];
|
|
|
|
|
this.floorList = [];
|
|
|
|
|
}
|
|
|
|
|
addvalueInfo.fee = this.feeList[item];
|
|
|
|
|
addvalueInfos.push(addvalueInfo);
|
|
|
|
|
});
|
|
|
|
|
let params = {};
|
|
|
|
|
params.id = this.orderInfo.id;
|
|
|
|
|
params.addvalue = addvalueInfos;
|
|
|
|
|
params.relatedId = 1;
|
|
|
|
|
console.log('params>>>>>>>>>>>>', params);
|
|
|
|
|
addIncrement(params).then(res => {
|
|
|
|
|
this.dialogVisible = false;
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'success',
|
|
|
|
|
message: '操作成功!'
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
this.onLoad(this.page);
|
|
|
|
|
},
|
|
|
|
|
//查询出所有的市配订单
|
|
|
|
|
handleAddOrder() {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
//这里只需要对订单进行正常的搜索即可
|
|
|
|
|
this.onLoadOrder(this.page);
|
|
|
|
|
this.loading = false;
|
|
|
|
|
this.orderShow = true;
|
|
|
|
|
},
|
|
|
|
|
checkOrder(row, index) {
|
|
|
|
|
if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
|
|
|
|
|
return false;
|
|
|
|
|
} else {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
handleAddInventory() {
|
|
|
|
|
let page = this.page;
|
|
|
|
|
let params = {};
|
|
|
|
|
this.query.serviceType = '2';
|
|
|
|
|
params.marketName = this.marketName
|
|
|
|
|
console.log('params :>> ', params);
|
|
|
|
|
getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
|
|
|
|
|
res => {
|
|
|
|
|
const inventoryList = res.data.data;
|
|
|
|
|
inventoryList.records.forEach(item => {
|
|
|
|
|
item.reservationNum = '0';
|
|
|
|
|
item.applyNum = item.quantityStock - item.quantityOccupied;
|
|
|
|
|
});
|
|
|
|
|
this.page.total = inventoryList.total;
|
|
|
|
|
console.log('res :>> ', res);
|
|
|
|
|
// this.inventoryInfo = inventoryList.records.filter(value=>{
|
|
|
|
|
// if(this.marketName === '')return value
|
|
|
|
|
// return value.marketName === this.marketName
|
|
|
|
|
// });
|
|
|
|
|
this.inventoryInfo = inventoryList.records
|
|
|
|
|
this.inventoryInfo = inventoryList.records.filter(value => {
|
|
|
|
|
if (this.marketName === '') return value;
|
|
|
|
|
return value.marketName === this.marketName;
|
|
|
|
|
});
|
|
|
|
|
//存在库存品，需要将库存品进行回显勾选
|
|
|
|
|
if (this.inventoryData) {
|
|
|
|
|
this.inventoryInfo.forEach((item, index) => {
|
|
|
|
|
this.inventoryData.forEach(inventory => {
|
|
|
|
|
if (item.id === inventory.id) {
|
|
|
|
|
item = inventory;
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
this.$refs.inventoryTable.toggleRowSelection(this.inventoryInfo[index], true);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
console.log('------------->', this.inventoryData);
|
|
|
|
|
this.loading = false;
|
|
|
|
|
this.selectionClear();
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
this.query = {};
|
|
|
|
|
this.inventoryList = [];
|
|
|
|
|
this.stockListShow = true;
|
|
|
|
|
},
|
|
|
|
|
handleCheckedCitiesChange(value) {
|
|
|
|
|
if (value) {
|
|
|
|
|
this.form.addvalueType = value;
|
|
|
|
|
}
|
|
|
|
|
console.log('>>>>>', this.form);
|
|
|
|
|
if (value.length < 1) {
|
|
|
|
|
this.costList = [];
|
|
|
|
|
this.costListName = [];
|
|
|
|
|
}
|
|
|
|
|
this.deliveryWayData.forEach(i => {
|
|
|
|
|
if (value.includes(i.dictKey)) {
|
|
|
|
|
console.log(i);
|
|
|
|
|
i.pitch = true;
|
|
|
|
|
this.costListName = value;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
textbox(e, index, a) {
|
|
|
|
|
console.log('e,index', e, index, a);
|
|
|
|
|
if (a === 6) {
|
|
|
|
|
this.feeList[index + 1] = e;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (a === 5)
|
|
|
|
|
if (index === 0 && a === 5) {
|
|
|
|
|
this.floorList[index + 1] = e;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.costList[index + 1] = e;
|
|
|
|
|
|
|
|
|
|
//费用列表
|
|
|
|
|
},
|
|
|
|
|
//数据字典数据获取
|
|
|
|
|
getDictionary() {
|
|
|
|
|
getDictionaryBiz('addvalue_serve_type').then(res => {
|
|
|
|
|
this.addvalueServeTypeData = res.data.data;
|
|
|
|
|
});
|
|
|
|
|
getDictionaryBiz('delivery_way').then(res => {
|
|
|
|
|
this.deliveryWayData = res.data.data;
|
|
|
|
|
});
|
|
|
|
|
getDictionaryBiz('distribution_type').then(res => {
|
|
|
|
|
this.deliveryTypeData = res.data.data;
|
|
|
|
|
});
|
|
|
|
|
getDictionaryBiz('period_of_time').then(res => {
|
|
|
|
|
this.periodOfTimeData = res.data.data;
|
|
|
|
|
});
|
|
|
|
|
getDictionaryBiz('yes_no').then(res => {
|
|
|
|
|
this.whetherData = res.data.data;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
addvalueServe(row) {
|
|
|
|
|
//查询订单的增值服务，
|
|
|
|
|
this.addvalueServeType = [];
|
|
|
|
|
this.addvalue = {};
|
|
|
|
|
this.dialogVisible = true;
|
|
|
|
|
this.costList = [];
|
|
|
|
|
this.feeList = [];
|
|
|
|
|
this.floorList = [];
|
|
|
|
|
this.orderInfo = row;
|
|
|
|
|
},
|
|
|
|
|
searchHide() {
|
|
|
|
|
this.search = !this.search;
|
|
|
|
|
},
|
|
|
|
|
searchChange() {
|
|
|
|
|
this.onLoad(this.page);
|
|
|
|
|
},
|
|
|
|
|
searchReset() {
|
|
|
|
|
this.query = {};
|
|
|
|
|
this.page.currentPage = 1;
|
|
|
|
|
this.onLoad(this.page);
|
|
|
|
|
},
|
|
|
|
|
entryReservationNum(row) {
|
|
|
|
|
this.obj = row;
|
|
|
|
|
if (this.reservationId) {
|
|
|
|
|
//查询零担计划数量详情
|
|
|
|
|
console.log('order------------>', row.id);
|
|
|
|
|
getReservationZeroOrderDetail(this.reservationId, row.id).then(res => {
|
|
|
|
|
let a = res.data.data;
|
|
|
|
|
a.forEach(item=>{
|
|
|
|
|
item.zeroOrderMax = (item.handQuantity - item.deliveryQuantity - item.outboundQuantity + item.reservationNum)
|
|
|
|
|
})
|
|
|
|
|
this.zeroOrderData = res.data.data;
|
|
|
|
|
// console.log(res.data.data);
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
getZeroOrderDetail(row.id).then(res => {
|
|
|
|
|
if (res.data.data != null) {
|
|
|
|
|
let a = res.data.data;
|
|
|
|
|
a.forEach(item=>{
|
|
|
|
|
item.zeroOrderMax = (item.handQuantity - item.deliveryQuantity - item.outboundQuantity)
|
|
|
|
|
})
|
|
|
|
|
this.zeroOrderData = res.data.data;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
this.zeroOrderShow = true;
|
|
|
|
|
this.isrReservationEntry = true;
|
|
|
|
|
},
|
|
|
|
|
entryNum(row) {
|
|
|
|
|
this.obj = row;
|
|
|
|
|
getZeroOrderDetail(row.id).then(res => {
|
|
|
|
|
if (res.data.data != null) {
|
|
|
|
|
this.zeroOrderData = res.data.data;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.zeroOrderShow = true;
|
|
|
|
|
this.isrReservationEntry = false;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 选择包件信息
|
|
|
|
|
// selectionPackageChange(list) {
|
|
|
|
|
// console.log(list,'list22');
|
|
|
|
|
// console.log('-----------<>', list);
|
|
|
|
|
// this.packageListInfo=list
|
|
|
|
|
// console.log(this.packageListInfo,'packageListInfo');
|
|
|
|
|
// if (this.reservationId) {
|
|
|
|
|
// this.packageDataSec = list;
|
|
|
|
|
// } else {
|
|
|
|
|
// //新增
|
|
|
|
|
// let a = [];
|
|
|
|
|
// list.forEach(item => {
|
|
|
|
|
// if (
|
|
|
|
|
// item.orderPackageReservationStatus === '10' ||
|
|
|
|
|
// item.orderPackageReservationStatusName === '未预约'
|
|
|
|
|
// ) {
|
|
|
|
|
// a.push(item);
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// this.packageDataSec = a;
|
|
|
|
|
// }
|
|
|
|
|
// },
|
|
|
|
|
// 查看包件
|
|
|
|
|
// 自动选中
|
|
|
|
|
selectMatchingRows(val) {
|
|
|
|
|
console.log(val,'数组');
|
|
|
|
|
console.log(this.packageData);
|
|
|
|
|
const selectedIds = val; // 需要匹配选中的ID
|
|
|
|
|
// const matchedArray = this.packageData.filter(item => selectedIds.includes(item.id));
|
|
|
|
|
// console.log(matchedArray,"处理好的数据");
|
|
|
|
|
this.packageData.forEach(item => {
|
|
|
|
|
if (selectedIds.includes(item.id)) {
|
|
|
|
|
console.log(item,'包含================================================================>');
|
|
|
|
|
this.selectionPackageChange(item)
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
// if (row) {
|
|
|
|
|
// this.selectionPackageChange(row)
|
|
|
|
|
// console.log( this.selectionPackageChange(),'12312312312321函数');
|
|
|
|
|
// }
|
|
|
|
|
viewStockArticlePackage(row) {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
this.packageList = row.packageList;
|
|
|
|
|
this.obj = row;
|
|
|
|
|
let page = this.page;
|
|
|
|
|
this. toggleAllSelection
|
|
|
|
|
console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
|
|
|
|
|
if (this.reservationId) {
|
|
|
|
|
getReservationPackageListByOrderId(this.reservationId,row.id,page.currentPage,page.pageSize).then(res=>{
|
|
|
|
|
console.log("->>>>>>>>>>>>>>>>>>查看包件",res);
|
|
|
|
|
this.packageData = res.data.data.data.packageList
|
|
|
|
|
console.log(this.packageData,'需要的信息');
|
|
|
|
|
console.log(res.data.data.data.reservationPackageList);
|
|
|
|
|
let idList=[]
|
|
|
|
|
res.data.data.data.reservationPackageList.forEach(v=>{
|
|
|
|
|
idList.push(v.id)
|
|
|
|
|
})
|
|
|
|
|
console.log(idList);
|
|
|
|
|
})
|
|
|
|
|
// 自动选中
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// //这里就是编辑的数据回显问题
|
|
|
|
|
// let packageInfo = row.parcelListVOS;
|
|
|
|
|
// // this.packageData = row.parcelListVOS;
|
|
|
|
|
// let packageListData = this.packageData;
|
|
|
|
|
// if (row.packageList.length > 0) {
|
|
|
|
|
// let packageListInfo = row.packageList;
|
|
|
|
|
// packageInfo.forEach((item, index) => {
|
|
|
|
|
// packageListInfo.forEach(p => {
|
|
|
|
|
// if (item.id === p.id) {
|
|
|
|
|
// this.$nextTick(() => {
|
|
|
|
|
// this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// });
|
|
|
|
|
// } else {
|
|
|
|
|
// //新增订单，默认全选
|
|
|
|
|
// packageInfo.forEach((item, index) => {
|
|
|
|
|
// this.$nextTick(() => {
|
|
|
|
|
// this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
|
|
|
|
|
// });
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
// this.packageData = row.parcelListVOS;
|
|
|
|
|
//
|
|
|
|
|
// // 当row内packageList为空时, 默认全选
|
|
|
|
|
// if (row.packageList.length === 0) {
|
|
|
|
|
// this.packageDataSec = row.parcelListVOS;
|
|
|
|
|
// } else {
|
|
|
|
|
// this.packageDataSec = row.parcelListVOS.filter(item => {
|
|
|
|
|
// return row.packageList.some(value => value.id === item.id);
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
getPackageListByStockArticleId(page.currentPage,page.pageSize,row.id).then(res=>{
|
|
|
|
|
console.log("res---------------->",res);
|
|
|
|
|
console.log(res.data.data.records);
|
|
|
|
|
this.packageData=res.data.data.records
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
// this.packageData = row.parcelListVOS;
|
|
|
|
|
// this.packageDataSec = row.parcelListVOS;
|
|
|
|
|
// //这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选
|
|
|
|
|
// let data = row.parcelListVOS;
|
|
|
|
|
// data.forEach((item, index) => {
|
|
|
|
|
// if (
|
|
|
|
|
// item.orderPackageReservationStatusName === '已预约' ||
|
|
|
|
|
// item.orderPackageReservationStatus === '20'
|
|
|
|
|
// ) {
|
|
|
|
|
// // //这里就是表示包件此时状态处于已预约，表示该订单下的这个包件信息被其他的预约信息使用，此时应该处于勾选禁用状态
|
|
|
|
|
// this.$nextTick(() => {
|
|
|
|
|
// this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
|
|
|
|
|
// });
|
|
|
|
|
// // console.log('::', item);
|
|
|
|
|
// // this.checkPackage(item, index);
|
|
|
|
|
// }
|
|
|
|
|
// // else if (
|
|
|
|
|
// // item.orderPackageFreezeStatusName !== '已冻结' ||
|
|
|
|
|
// // item.orderPackageFreezeStatus !== '20'
|
|
|
|
|
// // ) {
|
|
|
|
|
// // this.$nextTick(() => {
|
|
|
|
|
// // this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
|
|
|
|
|
// // });
|
|
|
|
|
// // }
|
|
|
|
|
// });
|
|
|
|
|
}
|
|
|
|
|
this.isaddvalue = true;
|
|
|
|
|
this.loading = false;
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
// 选择包件信息
|
|
|
|
|
// selectionPackageChange(list) {
|
|
|
|
|
// console.log(list,'list22');
|
|
|
|
|
// console.log('-----------<>', list);
|
|
|
|
|
// if (this.reservationId) {
|
|
|
|
|
// this.packageDataSec = list;
|
|
|
|
|
// } else {
|
|
|
|
|
// //新增
|
|
|
|
|
// let a = [];
|
|
|
|
|
// list.forEach(item => {
|
|
|
|
|
// if (
|
|
|
|
|
// item.orderPackageReservationStatus === '10' ||
|
|
|
|
|
// item.orderPackageReservationStatusName === '未预约'
|
|
|
|
|
// ) {
|
|
|
|
|
// a.push(item);
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// this.packageDataSec = a;
|
|
|
|
|
// }
|
|
|
|
|
// },
|
|
|
|
|
// 全选表格新增
|
|
|
|
|
|
|
|
|
|
checkPackage(row, index) {
|
|
|
|
|
//区分编辑还是新增
|
|
|
|
|
//编辑需要对这个预约单下的包件信息均可进行调整
|
|
|
|
|
console.log(row, 'rowrowrowrowrowrow');
|
|
|
|
|
// if (!this.reservationId) {
|
|
|
|
|
// if (
|
|
|
|
|
// row.orderPackageReservationStatusName === '已预约' ||
|
|
|
|
|
// row.orderPackageReservationStatusName === '20'
|
|
|
|
|
// ) {
|
|
|
|
|
// return true;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
if (row.orderPackageFreezeStatus === '10' || row.orderPackageFreezeStatusName === '已冻结') {
|
|
|
|
|
return false;
|
|
|
|
|
} else {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
//搜索订单
|
|
|
|
|
searchStockArticle() {
|
|
|
|
|
let params = {};
|
|
|
|
|
let page = this.page;
|
|
|
|
|
this.query.typeService = 2;
|
|
|
|
|
this.query.genre = 1;
|
|
|
|
|
// if (this.reservationId) {
|
|
|
|
|
// this.onLoadEditOrder(this.page);
|
|
|
|
|
// } else {
|
|
|
|
|
this.onLoadOrder(this.page);
|
|
|
|
|
// }
|
|
|
|
|
// selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
|
|
|
|
|
// const data = res.data.data;
|
|
|
|
|
// data.records.forEach(item => {
|
|
|
|
|
// item.reservationNum = item.handQuantity;
|
|
|
|
|
// });
|
|
|
|
|
// this.page.total = data.total;
|
|
|
|
|
// this.stockArticleInfo = data.records;
|
|
|
|
|
// this.loading = false;
|
|
|
|
|
// // this.selectionClear();
|
|
|
|
|
// });
|
|
|
|
|
},
|
|
|
|
|
searchStockList() {
|
|
|
|
|
let params = {};
|
|
|
|
|
let page = this.page;
|
|
|
|
|
this.query.serviceType = 2;
|
|
|
|
|
getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
|
|
|
|
|
res => {
|
|
|
|
|
const inventoryList = res.data.data;
|
|
|
|
|
inventoryList.records.forEach(item => {
|
|
|
|
|
item.reservationNum = '0';
|
|
|
|
|
});
|
|
|
|
|
this.page.total = inventoryList.total;
|
|
|
|
|
this.inventoryInfo = inventoryList.records;
|
|
|
|
|
this.loading = false;
|
|
|
|
|
this.selectionClear();
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
stockArticleSearchReset() {
|
|
|
|
|
this.selectionList = [];
|
|
|
|
|
this.query = {};
|
|
|
|
|
this.handleAddOrder();
|
|
|
|
|
},
|
|
|
|
|
stockListSearchReset() {
|
|
|
|
|
this.selectionList = [];
|
|
|
|
|
this.query = {};
|
|
|
|
|
this.handleAddInventory();
|
|
|
|
|
},
|
|
|
|
|
// 提交包件数
|
|
|
|
|
onSubmitPackage() {
|
|
|
|
|
// this.packageListInfo
|
|
|
|
|
|
|
|
|
|
if (this.packageDataSec.length === 0) {
|
|
|
|
|
this.$message.warning('请选择包件!!!');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.orderData.forEach(item => {
|
|
|
|
|
if (item.id === this.obj.id) {
|
|
|
|
|
item.packageList = this.packageDataSec;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
console.log('this.orderData------------>', this.orderData);
|
|
|
|
|
this.isaddvalue = false;
|
|
|
|
|
},
|
|
|
|
|
onSubmit() {
|
|
|
|
|
//新增预约单
|
|
|
|
|
let orderIds = [];
|
|
|
|
|
let inventoryIds = [];
|
|
|
|
|
let inventoryList = [];
|
|
|
|
|
let stockArticleList = [];
|
|
|
|
|
let operation = true;
|
|
|
|
|
this.inventoryData.forEach(item => {
|
|
|
|
|
if (item.reservationNum === '0' || item.reservationNum > item.quantityStock) {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'warning',
|
|
|
|
|
message: '请输入' + item.orderCode + '正确数量!'
|
|
|
|
|
});
|
|
|
|
|
operation = false;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
item.reservationNum = item.reservationNum;
|
|
|
|
|
inventoryIds.push(item.id);
|
|
|
|
|
inventoryList.push(item);
|
|
|
|
|
});
|
|
|
|
|
orderIds.join(',');
|
|
|
|
|
inventoryIds.join(',');
|
|
|
|
|
this.form.stockArticleIds = orderIds.toString();
|
|
|
|
|
this.form.inventoryIds = inventoryIds.toString();
|
|
|
|
|
this.form.inventoryList = inventoryList;
|
|
|
|
|
console.log('-------------->', this.orderData);
|
|
|
|
|
let order = this.orderData;
|
|
|
|
|
order.forEach(o => {
|
|
|
|
|
if (!o.packageListInfo) {
|
|
|
|
|
o.packageListInfo = o.packageList;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.form.stockArticleList = order;
|
|
|
|
|
this.deliveryWayData.forEach(item => {
|
|
|
|
|
if (this.form.deliveryWay === item.dictValue) {
|
|
|
|
|
this.form.deliveryWay = item.dictKey;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.deliveryTypeData.forEach(item => {
|
|
|
|
|
if (this.form.deliveryType === item.dictValue) {
|
|
|
|
|
this.form.deliveryType = item.dictKey;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.periodOfTimeData.forEach(item => {
|
|
|
|
|
if (this.form.periodOfTime === item.dictValue) {
|
|
|
|
|
this.form.periodOfTime = item.dictKey;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.form.serveType = this.serveType.sort().join(',');
|
|
|
|
|
//服务号
|
|
|
|
|
this.orderData.forEach(item => {
|
|
|
|
|
console.log('-------------->item', item);
|
|
|
|
|
if (!item.packageListInfo) {
|
|
|
|
|
item.packageListInfo = item.parcelListVOS;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
console.log('------------------->this.form.inventoryList', this.form.inventoryList);
|
|
|
|
|
console.log('------------------->this.form.stockArticleList', this.form.stockArticleList);
|
|
|
|
|
|
|
|
|
|
if (JSON.stringify(this.form.inventoryList) === '[]' && JSON.stringify(this.form.stockArticleList) === '[]') {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'warning',
|
|
|
|
|
message: '无效的预约计划!'
|
|
|
|
|
});
|
|
|
|
|
operation = false;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// this.form.stockArticleList = this.packageList;
|
|
|
|
|
console.log('>>>>>>>>', this.form);
|
|
|
|
|
if (this.reservationId) {
|
|
|
|
|
this.form.id = this.reservationId;
|
|
|
|
|
update(this.form).then(() => {
|
|
|
|
|
this.$router.go(-1);
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'success',
|
|
|
|
|
message: '操作成功!'
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
this.form.reservationStatus = '20';
|
|
|
|
|
autonomouslySave(this.form).then(() => {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'success',
|
|
|
|
|
message: '操作成功!'
|
|
|
|
|
});
|
|
|
|
|
this.$router.go(-1);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
handleClose(done) {
|
|
|
|
|
this.$confirm('确认关闭？')
|
|
|
|
|
.then(_ => {
|
|
|
|
|
done();
|
|
|
|
|
})
|
|
|
|
|
.catch(_ => {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
removeStockArticle(row) {
|
|
|
|
|
if (this.inventoryData.length == 0 && this.orderData.length == 1 && this.reservationId) {
|
|
|
|
|
this.$message.warning('如需移除请取消该预约计划!!');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.orderData.forEach((item, index) => {
|
|
|
|
|
if (item.id === row.id) {
|
|
|
|
|
this.orderData.splice(index, 1);
|
|
|
|
|
}
|
|
|
|
|
console.log(item);
|
|
|
|
|
});
|
|
|
|
|
// 当两个列表没有数据时, 清空限制
|
|
|
|
|
if (this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = '';
|
|
|
|
|
// 当列表没有数据时, 表单清空
|
|
|
|
|
if (this.orderData.length === 0) this.form = {};
|
|
|
|
|
console.log('>>>>>>>>>>>>>>>row', row);
|
|
|
|
|
},
|
|
|
|
|
removeStockList(row) {
|
|
|
|
|
if (this.inventoryData.length == 1 && this.orderData.length == 0 && this.reservationId) {
|
|
|
|
|
this.$message.warning('最少剩下一个数据');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.inventoryData.forEach((item, index) => {
|
|
|
|
|
if (item.id === row.id) {
|
|
|
|
|
this.inventoryData.splice(index, 1);
|
|
|
|
|
}
|
|
|
|
|
console.log('item>>>>>>>>>>>', item);
|
|
|
|
|
});
|
|
|
|
|
// 当两个列表没有数据时, 清空限制
|
|
|
|
|
if (this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = '';
|
|
|
|
|
console.log('>>>>>>>>>>>>>>>row', row);
|
|
|
|
|
},
|
|
|
|
|
showStockListEdit(row) {
|
|
|
|
|
console.log('>>>>>>>>>>>>>>>row', row);
|
|
|
|
|
//查看库存品详情
|
|
|
|
|
let a = {};
|
|
|
|
|
a.reservationId = this.reservationId;
|
|
|
|
|
a.inventoryId = row.id;
|
|
|
|
|
selectInventoryDetail(1, 20, a).then(res => {
|
|
|
|
|
console.log('------------>', res);
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
handleView(row) {
|
|
|
|
|
this.title = '查看';
|
|
|
|
|
this.view = true;
|
|
|
|
|
this.box = true;
|
|
|
|
|
getDetailDelivery(row.id).then(res => {
|
|
|
|
|
this.form = res.data.data;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
rowDel(row) {
|
|
|
|
|
this.$confirm('确定将选择数据删除?', {
|
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
|
type: 'warning'
|
|
|
|
|
})
|
|
|
|
|
.then(() => {
|
|
|
|
|
return remove(row.id);
|
|
|
|
|
})
|
|
|
|
|
.then(() => {
|
|
|
|
|
this.onLoad(this.page);
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'success',
|
|
|
|
|
message: '操作成功!'
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
beforeClose(done) {
|
|
|
|
|
done();
|
|
|
|
|
this.form = {};
|
|
|
|
|
this.view = false;
|
|
|
|
|
},
|
|
|
|
|
selectionChange(list) {
|
|
|
|
|
this.orderList = list;
|
|
|
|
|
console.log('list :>> ', list);
|
|
|
|
|
},
|
|
|
|
|
// 选择包件信息
|
|
|
|
|
selectionPackageChange(list) {
|
|
|
|
|
console.log('掉用了此函数',list);
|
|
|
|
|
console.log(list,'list22');
|
|
|
|
|
console.log('-----------<>', list);
|
|
|
|
|
this.packageListInfo=list
|
|
|
|
|
console.log(this.packageListInfo,'packageListInfo');
|
|
|
|
|
if (this.reservationId) {
|
|
|
|
|
this.packageDataSec = list;
|
|
|
|
|
} else {
|
|
|
|
|
//新增
|
|
|
|
|
let a = [];
|
|
|
|
|
list.forEach(item => {
|
|
|
|
|
if (
|
|
|
|
|
item.orderPackageReservationStatus === '10' ||
|
|
|
|
|
item.orderPackageReservationStatusName === '未预约'
|
|
|
|
|
) {
|
|
|
|
|
a.push(item);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.packageDataSec = a;
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
selectionInventoryChange(list) {
|
|
|
|
|
// if (this.reservationId){
|
|
|
|
|
console.log('-----------<>', list);
|
|
|
|
|
this.inventoryList = list;
|
|
|
|
|
// }else {
|
|
|
|
|
// //新增
|
|
|
|
|
// let a = [];
|
|
|
|
|
// list.forEach(item=>{
|
|
|
|
|
// if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约'){
|
|
|
|
|
// a.push(item);
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
// this.inventoryList = a;
|
|
|
|
|
// }
|
|
|
|
|
},
|
|
|
|
|
onSubmitUpdateZeroOrder() {
|
|
|
|
|
console.log('this.obj--------------------->', this.obj);
|
|
|
|
|
console.log('this.zeroOrderData--------------------->', this.zeroOrderData);
|
|
|
|
|
console.log('this.zeroOrderData--------------------->', this.zeroOrderData);
|
|
|
|
|
|
|
|
|
|
this.isrReservationEntry = false;
|
|
|
|
|
let a = this.zeroOrderData;
|
|
|
|
|
if (a.length > 1) {
|
|
|
|
|
let b = 0;
|
|
|
|
|
//计算该品类已使用数量
|
|
|
|
|
|
|
|
|
|
a.forEach(item => {
|
|
|
|
|
b += item.number;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
let f = a.every(item=>{
|
|
|
|
|
console.log('this.number--------------------->', item.number);
|
|
|
|
|
console.log('number--------------------->', (item.deliveryQuantity + item.outboundQuantity));
|
|
|
|
|
if (item.number < (item.deliveryQuantity + item.outboundQuantity) || item.number > item.quantity){
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
if (b > this.obj.handQuantity) {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'error',
|
|
|
|
|
message: '录入数量超过订单在库数量!'
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (!f) {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'error',
|
|
|
|
|
message: '请检查修改数量!'
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
updateEntryNum(this.zeroOrderData).then(res=>{
|
|
|
|
|
if (res) {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'success',
|
|
|
|
|
message: '操作成功'
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
this.zeroOrderShow = false;
|
|
|
|
|
console.log('-------------->', this.zeroOrderData);
|
|
|
|
|
},
|
|
|
|
|
onSubmitZeroOrder() {
|
|
|
|
|
if (this.isrReservationEntry) {
|
|
|
|
|
//零担预约数量录入
|
|
|
|
|
this.orderData.forEach(item => {
|
|
|
|
|
if (this.obj.id === item.id) {
|
|
|
|
|
item.parcelNumberVOS = this.zeroOrderData;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
//在库数量录入
|
|
|
|
|
let a = this.zeroOrderData;
|
|
|
|
|
if (a.length > 0) {
|
|
|
|
|
let n = 0;
|
|
|
|
|
a.forEach(item => {
|
|
|
|
|
n += item.number;
|
|
|
|
|
});
|
|
|
|
|
if (n > this.obj.handQuantity) {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'error',
|
|
|
|
|
message: '录入数量超过订单在库数量!'
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
let b = a.every(item => {
|
|
|
|
|
console.log('最大数量-------------->', (item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number));
|
|
|
|
|
if ((item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number) > item.quantity) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
});
|
|
|
|
|
console.log('----------------->', b);
|
|
|
|
|
if (!b) {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'error',
|
|
|
|
|
message: '请输入正确数量!'
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
entryNum(this.zeroOrderData).then(res => {
|
|
|
|
|
if (res) {
|
|
|
|
|
this.$message({
|
|
|
|
|
type: 'success',
|
|
|
|
|
message: '操作成功'
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
console.log('this.zeroOrderData------------->', this.zeroOrderData);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.zeroOrderShow = false;
|
|
|
|
|
},
|
|
|
|
|
// 增加库存品
|
|
|
|
|
onSubmitInventory() {
|
|
|
|
|
if (this.inventoryList.length === 0) {
|
|
|
|
|
this.$message.warning('请选择至少一条数据');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.inventoryList.forEach(item => {
|
|
|
|
|
if (item.reservationNum > item.applyNum) {
|
|
|
|
|
this.$message.warning('该库存品数量输入有误!!!');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
console.log('this.inventoryList :>> ', this.inventoryList);
|
|
|
|
|
// 检测商场是否选择统一商场
|
|
|
|
|
let _marketName = '';
|
|
|
|
|
const _isUnifyMarketName = this.inventoryList.every(value => {
|
|
|
|
|
if (_marketName === '') _marketName = value.marketName;
|
|
|
|
|
return _marketName === value.marketName;
|
|
|
|
|
});
|
|
|
|
|
if (!_isUnifyMarketName) {
|
|
|
|
|
this.$message.warning('请选择统一商场!!!');
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.marketName = _marketName;
|
|
|
|
|
this.inventoryData = this.inventoryList;
|
|
|
|
|
|
|
|
|
|
// if (this.orderData.length) {
|
|
|
|
|
// this.inventoryList.some(i => {
|
|
|
|
|
// let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1;
|
|
|
|
|
// if (!a) {
|
|
|
|
|
// this.inventoryData.push(i);
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// } else {
|
|
|
|
|
// this.inventoryData = this.selectionList;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
this.stockListShow = false;
|
|
|
|
|
},
|
|
|
|
|
/**
|
|
|
|
|
* 增加订单提交
|
|
|
|
|
*/
|
|
|
|
|
onSubmitOrder() {
|
|
|
|
|
console.log('-------------》', this.orderList);
|
|
|
|
|
if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!')
|
|
|
|
|
const list = this.orderList;
|
|
|
|
|
let _name = list[0].customerName;
|
|
|
|
|
let _address = list[0].customerAddress;
|
|
|
|
|
let _phone = list[0].customerTelephone;
|
|
|
|
|
let _marketName = list[0].mallName
|
|
|
|
|
|
|
|
|
|
// 循环查看数据是否符合要求
|
|
|
|
|
const isRturn = list.every((item)=>{
|
|
|
|
|
if (item.mallName !== _marketName) {
|
|
|
|
|
this.$message.warning('请选择统一商场!!!')
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
if (item.customerName !== _name || item.customerAddress !== _address || item.customerTelephone !== _phone) {
|
|
|
|
|
this.$message.warning('请选择统一顾客订单!!!')
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
return true
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
if (!isRturn) return
|
|
|
|
|
|
|
|
|
|
// 设置商场名称
|
|
|
|
|
if (this.marketName === '') this.marketName = _marketName
|
|
|
|
|
this.marketName = list[0].marketName;
|
|
|
|
|
|
|
|
|
|
this.form.consignee = _name;
|
|
|
|
|
this.form.deliveryAddress = _address;
|
|
|
|
|
this.form.deliveryPhone = _phone;
|
|
|
|
|
//这里需要对选择的订单进行筛选
|
|
|
|
|
const info = [];
|
|
|
|
|
this.stockArticleInfo.forEach((item, index) => {
|
|
|
|
|
this.orderList.forEach(order => {
|
|
|
|
|
// const newDate1 = this.orderData.map(item => { // map遍历本地数据
|
|
|
|
|
// if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
|
|
|
|
|
// return item;
|
|
|
|
|
// });
|
|
|
|
|
// } info.push(order);
|
|
|
|
|
//清理原来订单列表的订单数据
|
|
|
|
|
info.push(order);
|
|
|
|
|
this.stockArticleInfo.splice(index, 1);
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.orderData.length >= 1) {
|
|
|
|
|
let newDate1 = this.orderData.map(item => {
|
|
|
|
|
// map遍历本地数据
|
|
|
|
|
if (this.orderList.find(o => o.id !== item.id)) {
|
|
|
|
|
// 如果在接口数据中包含本地数据，则返回这条本地数据
|
|
|
|
|
return item;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
console.log('newDate1-------------->', newDate1.length);
|
|
|
|
|
if (newDate1.length >= 1) {
|
|
|
|
|
console.log('newDate1-------------->', newDate1);
|
|
|
|
|
newDate1.forEach(a => {
|
|
|
|
|
this.orderData.push(a);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
console.log('this.orderData------------->', this.orderData);
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
|
|
this.orderData = this.orderList;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.orderData.forEach(a => {
|
|
|
|
|
a.reservationNum = a.handQuantity;
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// this.orderData.push(info);
|
|
|
|
|
this.orderShow = false;
|
|
|
|
|
},
|
|
|
|
|
selectionClear() {
|
|
|
|
|
this.selectionList = [];
|
|
|
|
|
this.query = {};
|
|
|
|
|
// this.$refs.table.clearSelection();
|
|
|
|
|
},
|
|
|
|
|
currentOrderChange(currentPage) {
|
|
|
|
|
this.page.currentPage = currentPage;
|
|
|
|
|
// if (this.reservationId) {
|
|
|
|
|
// this.onLoadEditOrder(this.page, this.reservationId);
|
|
|
|
|
// } else {
|
|
|
|
|
// this.onLoadOrder(this.page);
|
|
|
|
|
// }
|
|
|
|
|
this.onLoadOrder(this.page);
|
|
|
|
|
},
|
|
|
|
|
sizeOrderChange(pageSize) {
|
|
|
|
|
this.page.pageSize = pageSize;
|
|
|
|
|
// if (this.reservationId) {
|
|
|
|
|
// this.onLoadEditOrder(this.page, this.reservationId);
|
|
|
|
|
// } else {
|
|
|
|
|
// this.onLoadOrder(this.page);
|
|
|
|
|
// }
|
|
|
|
|
this.onLoadOrder(this.page);
|
|
|
|
|
},
|
|
|
|
|
onLoadEditOrder(params = {}) {
|
|
|
|
|
this.query.typeService = 2;
|
|
|
|
|
this.query.genre = '1';
|
|
|
|
|
const page = this.page;
|
|
|
|
|
let a = [];
|
|
|
|
|
if (this.orderData) {
|
|
|
|
|
this.orderData.forEach(item => {
|
|
|
|
|
a.push(item.id);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
this.query.orderIds = a.join(',');
|
|
|
|
|
this.query.reservationId = this.reservationId;
|
|
|
|
|
selectUpdateAvailableStockArticle(
|
|
|
|
|
page.currentPage,
|
|
|
|
|
page.pageSize,
|
|
|
|
|
this.reservationId,
|
|
|
|
|
Object.assign(params, this.query)
|
|
|
|
|
).then(res => {
|
|
|
|
|
console.log('res123123------------>', res);
|
|
|
|
|
const data = res.data.data;
|
|
|
|
|
console.log('data :>> ', data);
|
|
|
|
|
this.stockArticleInfo = data.records;
|
|
|
|
|
this.stockArticleInfo.forEach((item, index) => {
|
|
|
|
|
//检查订单是否冻结
|
|
|
|
|
this.checkOrder(item, index);
|
|
|
|
|
if (this.orderData) {
|
|
|
|
|
this.orderData.forEach(o => {
|
|
|
|
|
if (o.id === item.id) {
|
|
|
|
|
//回显选择的包件信息
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
this.orderList = [];
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.page.total = data.total;
|
|
|
|
|
});
|
|
|
|
|
// this.query = {};
|
|
|
|
|
},
|
|
|
|
|
inputscStockArtic(index, row) {
|
|
|
|
|
console.log(index, row);
|
|
|
|
|
this.query[row.prop] = index;
|
|
|
|
|
this.onLoadOrder(this.page);
|
|
|
|
|
},
|
|
|
|
|
timescStockArtic(index, row) {
|
|
|
|
|
console.log(index, row);
|
|
|
|
|
if (!!index) {
|
|
|
|
|
index = dayjs(index).format('YYYY-MM-DD');
|
|
|
|
|
}
|
|
|
|
|
this.query[row.prop] = index;
|
|
|
|
|
if (!index) {
|
|
|
|
|
delete this.query[row.prop];
|
|
|
|
|
}
|
|
|
|
|
this.onLoadOrder(this.page);
|
|
|
|
|
},
|
|
|
|
|
btnscStockArtic(index, row) {
|
|
|
|
|
console.log(index, row);
|
|
|
|
|
this.onLoad(this.page);
|
|
|
|
|
},
|
|
|
|
|
selectscStockArtic(index, row) {
|
|
|
|
|
console.log(index, row);
|
|
|
|
|
if (row.prop === 'reservationStatusName') {
|
|
|
|
|
this.query['reservationStatus'] = index;
|
|
|
|
|
} else if (row.prop === 'freezeStatusName') {
|
|
|
|
|
this.query['freezeStatus'] = index;
|
|
|
|
|
} else if (row.prop === 'completeSetName') {
|
|
|
|
|
this.query['completeSet'] = index;
|
|
|
|
|
}
|
|
|
|
|
// else if(row.prop ==='groundingStatusName'){
|
|
|
|
|
// this.query['groundingStatus'] = index;
|
|
|
|
|
// }else if(row.prop ==='stockupStatusName'){
|
|
|
|
|
// this.query['stockupStatus'] = index;
|
|
|
|
|
// }else if(row.prop ==='orderStatusName'){
|
|
|
|
|
// this.query['orderStatus'] = index;
|
|
|
|
|
// }else if(row.prop ==='typeServerName'){
|
|
|
|
|
// this.query['typeService'] = index;
|
|
|
|
|
// }
|
|
|
|
|
// else if(row.prop ==='orderReceiveStatusName'){
|
|
|
|
|
// this.query['orderReceiveStatus'] = index;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
this.query[row.prop] = index;
|
|
|
|
|
}
|
|
|
|
|
this.onLoadOrder(this.page);
|
|
|
|
|
},
|
|
|
|
|
onLoadOrder(page, params = {}) {
|
|
|
|
|
this.query.typeService = 2;
|
|
|
|
|
this.query.genre = '1';
|
|
|
|
|
this.query.marketName = this.marketName
|
|
|
|
|
// const page = this.page;
|
|
|
|
|
let a = [];
|
|
|
|
|
if (this.orderData) {
|
|
|
|
|
this.orderData.forEach(item => {
|
|
|
|
|
a.push(item.id);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
this.query.orderIds = a.join(',');
|
|
|
|
|
console.log('--------------query>', this.query);
|
|
|
|
|
selectStockArticleInfoList(
|
|
|
|
|
page.currentPage,
|
|
|
|
|
page.pageSize,
|
|
|
|
|
Object.assign(params, this.query)
|
|
|
|
|
).then(res => {
|
|
|
|
|
console.log('res123------------>', res);
|
|
|
|
|
const { records, total } = res.data.data;
|
|
|
|
|
this.stockArticleInfo = records.filter(value => {
|
|
|
|
|
if (this.marketName === '') return value;
|
|
|
|
|
if (this.marketName) {
|
|
|
|
|
console.log('value.marketName :>> ', value.marketName);
|
|
|
|
|
return value.mallName === this.marketName;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
// const {records, total} = res.data.data;
|
|
|
|
|
this.stockArticleInfo = records
|
|
|
|
|
console.log('this.stockArticleInfo :>> ', this.stockArticleInfo);
|
|
|
|
|
this.stockArticleInfo.forEach((item, index) => {
|
|
|
|
|
//检查订单是否冻结
|
|
|
|
|
this.checkOrder(item, index);
|
|
|
|
|
// if (this.orderData) {
|
|
|
|
|
// this.orderData.forEach(o => {
|
|
|
|
|
// if (o.id === item.id) {
|
|
|
|
|
// this.$nextTick(() => {
|
|
|
|
|
// this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// }else {
|
|
|
|
|
// this.orderList = [];
|
|
|
|
|
// }
|
|
|
|
|
this.page.total = total;
|
|
|
|
|
});
|
|
|
|
|
this.orderList = [];
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
onLoad() {
|
|
|
|
|
// this.loading = true;
|
|
|
|
|
this.form.deliveryType = '2';
|
|
|
|
|
this.form.deliveryWay = '10';
|
|
|
|
|
this.form.periodOfTime = '3';
|
|
|
|
|
this.form.otherFee = 0;
|
|
|
|
|
this.form.replaceFee = 0;
|
|
|
|
|
this.form.collectionFee = 0;
|
|
|
|
|
this.form.isUrgent = '1';
|
|
|
|
|
this.form.reservationDate = new Date();
|
|
|
|
|
if (this.orderIds) {
|
|
|
|
|
getStockArticleList(this.orderIds).then(res => {
|
|
|
|
|
console.log(res.data.data);
|
|
|
|
|
const data = res.data.data;
|
|
|
|
|
let name = '';
|
|
|
|
|
let phone = '';
|
|
|
|
|
let address = '';
|
|
|
|
|
let typeService = '';
|
|
|
|
|
console.log('>>>>>>>>>>>>>', data);
|
|
|
|
|
for (let i = 0; i < data.length; i++) {
|
|
|
|
|
if (i === 0) {
|
|
|
|
|
name = data[0].customerName;
|
|
|
|
|
phone = data[0].customerTelephone;
|
|
|
|
|
address = data[0].customerAddress;
|
|
|
|
|
typeService = data[0].typeService.toString();
|
|
|
|
|
// typeName = data[0].typeName;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
this.form.consignee = name;
|
|
|
|
|
this.form.deliveryPhone = phone;
|
|
|
|
|
this.form.deliveryType = typeService;
|
|
|
|
|
this.form.deliveryAddress = address;
|
|
|
|
|
this.orderData = data;
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
if (this.reservationId) {
|
|
|
|
|
this.inventoryShow = true;
|
|
|
|
|
getReservationInfo(this.reservationId).then(res => {
|
|
|
|
|
const reservation = res.data.data;
|
|
|
|
|
const stockArticleListInfo = res.data.data.stockArticleList;
|
|
|
|
|
// stockArticleListInfo.forEach(item=>{
|
|
|
|
|
//
|
|
|
|
|
// })
|
|
|
|
|
console.log('reservation>>>>>>>>', reservation);
|
|
|
|
|
// 添加限制的商场名称
|
|
|
|
|
this.marketName = reservation.mallName;
|
|
|
|
|
this.orderData = reservation.stockArticleList;
|
|
|
|
|
this.inventoryData = reservation.inventoryList;
|
|
|
|
|
this.inventoryData.forEach(item => {
|
|
|
|
|
item.applyNum = item.quantityStock - item.quantityOccupied;
|
|
|
|
|
});
|
|
|
|
|
this.form.deliveryType = reservation.deliveryType;
|
|
|
|
|
this.form.periodOfTime = reservation.periodOfTime;
|
|
|
|
|
if (reservation.serveType) {
|
|
|
|
|
//过滤字符串中的','
|
|
|
|
|
this.serveType = Array.from(reservation.serveType).filter(s => {
|
|
|
|
|
return s !== ',';
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
this.form = reservation;
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
this.form.deliveryType = '2';
|
|
|
|
|
}
|
|
|
|
|
this.loading = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
</script>
|
|
|
|
|
<style lang="scss">
|
|
|
|
|
input::-webkit-outer-spin-button,
|
|
|
|
|
input::-webkit-inner-spin-button {
|
|
|
|
|
-webkit-appearance: none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
input[type='number'] {
|
|
|
|
|
-moz-appearance: textfield;
|
|
|
|
|
}
|
|
|
|
|
</style>
|
