angelo
/
web-base-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(unhandled): 合单表单默认值处理

This commit is contained in:
woody 2025-05-12 16:58:16 +08:00
parent 7a59b10298
commit d485915333
1 changed files with 227 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

430
src/components/Delivery/unhandeled.vue
View File

@ -4,47 +4,42 @@
<div class="maintop"> <div class="maintop">
<div class="mainbtn"> <div class="mainbtn">
<el-button <el-button
v-hasButtons="['DeliveryUnhandledAllMerge']"
size="small" size="small"
class="thebtn2" class="thebtn2"
@click="mergeHd(0)" @click="mergeHd(0)"
v-hasButtons="['DeliveryUnhandledAllMerge']" >全部合单</el-button>
>全部合单</el-button
>
<el-button <el-button
v-hasButtons="['DeliveryUnhandledMerge']"
size="small" size="small"
class="thebtn3" class="thebtn3"
:disabled="multiple" :disabled="multiple"
@click="mergeHd(1)" @click="mergeHd(1)"
v-hasButtons="['DeliveryUnhandledMerge']" >合单</el-button>
>合单</el-button
>
<el-button <el-button
v-hasButtons="['DeliveryUnhandledSelf']"
size="small" size="small"
class="thebtn3" class="thebtn3"
:disabled="multiple" :disabled="multiple"
@click="mergeHd(2)" @click="mergeHd(2)"
v-hasButtons="['DeliveryUnhandledSelf']" >{{ '自提' }}</el-button>
>{{ '自提' }}</el-button
>
<!-- <el-button size="small" class="thebtn2" :disabled="multiple" <!-- <el-button size="small" class="thebtn2" :disabled="multiple"
>二次发货</el-button >二次发货</el-button
> --> > -->
<el-button <el-button
size="small"
v-hasButtons="['DeliveryUnhandledExport']" v-hasButtons="['DeliveryUnhandledExport']"
@click="handleExport" size="small"
class="thebtn1" class="thebtn1"
@click="handleExport"
> >
{{ '导出' }}</el-button {{ '导出' }}</el-button>
>
<el-button <el-button
v-hasButtons="['OrderDeductionBtn']"
size="small" size="small"
:disabled="selRow.length == 0 || selRow.length > 1" :disabled="selRow.length == 0 || selRow.length > 1"
class="thebtn2" class="thebtn2"
@click="orderDk" @click="orderDk"
v-hasButtons="['OrderDeductionBtn']" >订单抵扣</el-button>
>订单抵扣</el-button
>
</div> </div>
</div> </div>
<el-table <el-table
@ -56,75 +51,64 @@
> >
<!-- :row-class-name="tableRowClassName" <!-- :row-class-name="tableRowClassName"
--> -->
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55" />
<el-table-column <el-table-column
align="center" align="center"
min-width="200px" min-width="200px"
prop="orderCode" prop="orderCode"
:label="'订单编号'" :label="'订单编号'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="orderTypeVal" prop="orderTypeVal"
:label="'订单类型'" :label="'订单类型'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="120px" min-width="120px"
prop="memberCode" prop="memberCode"
:label="'会员编号'" :label="'会员编号'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="120px" min-width="120px"
prop="memberName" prop="memberName"
:label="'会员姓名'" :label="'会员姓名'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="120px" min-width="120px"
prop="phone" prop="phone"
:label="'联系方式'" :label="'联系方式'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="120px" min-width="120px"
prop="productCode" prop="productCode"
:label="'产品编号'" :label="'产品编号'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="120px" min-width="120px"
prop="productName" prop="productName"
:label="'产品名称'" :label="'产品名称'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="120px" min-width="120px"
prop="specsName" prop="specsName"
:label="'产品规格'" :label="'产品规格'"
> />
</el-table-column> <el-table-column align="center" prop="unitName" :label="'产品单位'" />
<el-table-column align="center" prop="unitName" :label="'产品单位'"> <el-table-column align="center" prop="quantity" :label="'产品数量'" />
</el-table-column>
<el-table-column align="center" prop="quantity" :label="'产品数量'">
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="isGiftVal" prop="isGiftVal"
:label="'销售类型'" :label="'销售类型'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="orderAmount" prop="orderAmount"
@ -134,15 +118,13 @@
{{ scope.row.orderAmount | numFilter }} {{ scope.row.orderAmount | numFilter }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="recName" :label="'收货人'"> <el-table-column align="center" prop="recName" :label="'收货人'" />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="120px" min-width="120px"
prop="recPhone" prop="recPhone"
:label="'收货电话'" :label="'收货电话'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="180px" min-width="180px"
@ -159,70 +141,60 @@
prop="shippingChannelVal" prop="shippingChannelVal"
:label="'发货类型'" :label="'发货类型'"
min-width="100px" min-width="100px"
> />
</el-table-column>
<el-table-column <el-table-column
min-width="100px" min-width="100px"
align="center" align="center"
prop="storehouseName" prop="storehouseName"
:label="'发货仓库'" :label="'发货仓库'"
> />
</el-table-column>
<el-table-column <el-table-column
min-width="150px" min-width="150px"
align="center" align="center"
prop="payTime" prop="payTime"
:label="'支付日期'" :label="'支付日期'"
> />
</el-table-column>
<el-table-column <el-table-column
min-width="100px" min-width="100px"
align="center" align="center"
prop="orderStatusVal" prop="orderStatusVal"
:label="'订单状态'" :label="'订单状态'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="100px" min-width="100px"
prop="deliveryWayVal" prop="deliveryWayVal"
:label="'发货方式'" :label="'发货方式'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="100px" min-width="100px"
prop="operateScopeVal" prop="operateScopeVal"
:label="'供应方式'" :label="'供应方式'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
min-width="100px" min-width="100px"
prop="tranTypeVal" prop="tranTypeVal"
:label="'运输方式'" :label="'运输方式'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="preSaleStatusVal" prop="preSaleStatusVal"
:label="'预售状态'" :label="'预售状态'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="originalOrderCode" prop="originalOrderCode"
:label="'原单号'" :label="'原单号'"
> />
</el-table-column>
<el-table-column <el-table-column
min-width="100px" min-width="100px"
align="center" align="center"
prop="remark" prop="remark"
:label="'备注'" :label="'备注'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="systemType" prop="systemType"
@ -231,8 +203,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
v-for="item in systemTypes" v-for="item in systemTypes"
:key="item.value"
v-if="scope.row.systemType == item.value" v-if="scope.row.systemType == item.value"
:key="item.value"
> >
{{ item.label }} {{ item.label }}
</div> </div>
@ -243,8 +215,7 @@
align="center" align="center"
prop="creationTime" prop="creationTime"
:label="'创建日期'" :label="'创建日期'"
> />
</el-table-column>
</el-table> </el-table>
</div> </div>
<pagination <pagination
@ -252,8 +223,8 @@
:total="total" :total="total"
:page.sync="params.pageNum" :page.sync="params.pageNum"
:limit.sync="params.pageSize" :limit.sync="params.pageSize"
:page-sizes="pageSizes"
@pagination="getList" @pagination="getList"
:pageSizes="pageSizes"
/> />
<!-- 合单 --> <!-- 合单 -->
<el-dialog <el-dialog
@ -265,7 +236,7 @@
> >
<div> <div>
<div class="main_title"> <div class="main_title">
<div class="bluekuai"></div> <div class="bluekuai" />
<div class="title_word">{{ '选择合并匹配条件' }}</div> <div class="title_word">{{ '选择合并匹配条件' }}</div>
</div> </div>
<div> <div>
@ -280,11 +251,10 @@
<el-form-item :label="'收货人'" prop="recNameBool"> <el-form-item :label="'收货人'" prop="recNameBool">
<el-radio-group v-model="hdform.recNameBool"> <el-radio-group v-model="hdform.recNameBool">
<el-radio <el-radio
:label="item.value"
v-for="(item, index) in yesornoList" v-for="(item, index) in yesornoList"
:key="index" :key="index"
>{{ item.label }}</el-radio :label="item.value"
> >{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -292,11 +262,10 @@
<el-form-item :label="'收货电话'" prop="recPhoneBool"> <el-form-item :label="'收货电话'" prop="recPhoneBool">
<el-radio-group v-model="hdform.recPhoneBool"> <el-radio-group v-model="hdform.recPhoneBool">
<el-radio <el-radio
:label="item.value"
v-for="(item, index) in yesornoList" v-for="(item, index) in yesornoList"
:key="index" :key="index"
>{{ item.label }}</el-radio :label="item.value"
> >{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -315,11 +284,10 @@
> >
<el-radio-group v-model="hdform.recAreaBool"> <el-radio-group v-model="hdform.recAreaBool">
<el-radio <el-radio
:label="item.value"
v-for="(item, index) in yesornoList" v-for="(item, index) in yesornoList"
:key="index" :key="index"
>{{ item.label }}</el-radio :label="item.value"
> >{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -327,11 +295,10 @@
<el-form-item :label="'详细地址'" prop="recAddressBool"> <el-form-item :label="'详细地址'" prop="recAddressBool">
<el-radio-group v-model="hdform.recAddressBool"> <el-radio-group v-model="hdform.recAddressBool">
<el-radio <el-radio
:label="item.value"
v-for="(item, index) in yesornoList" v-for="(item, index) in yesornoList"
:key="index" :key="index"
>{{ item.label }}</el-radio :label="item.value"
> >{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -339,11 +306,10 @@
<el-form-item :label="'产品名称'" prop="productNameBool"> <el-form-item :label="'产品名称'" prop="productNameBool">
<el-radio-group v-model="hdform.productNameBool"> <el-radio-group v-model="hdform.productNameBool">
<el-radio <el-radio
:label="item.value"
v-for="(item, index) in yesornoList" v-for="(item, index) in yesornoList"
:key="index" :key="index"
>{{ item.label }}</el-radio :label="item.value"
> >{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -352,11 +318,10 @@
<el-radio-group v-model="hdform.operateScope"> <el-radio-group v-model="hdform.operateScope">
<el-radio :label="''">{{ '全部' }}</el-radio> <el-radio :label="''">{{ '全部' }}</el-radio>
<el-radio <el-radio
:label="item.value"
v-for="(item, index) in supplyWayList" v-for="(item, index) in supplyWayList"
:key="index" :key="index"
>{{ item.label }}</el-radio :label="item.value"
> >{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -365,11 +330,10 @@
<el-radio-group v-model="hdform.preSaleStatus"> <el-radio-group v-model="hdform.preSaleStatus">
<el-radio :label="''">{{ '全部' }}</el-radio> <el-radio :label="''">{{ '全部' }}</el-radio>
<el-radio <el-radio
:label="item.value"
v-for="(item, index) in presaleStatusList" v-for="(item, index) in presaleStatusList"
:key="index" :key="index"
>{{ item.label }}</el-radio :label="item.value"
> >{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -387,8 +351,7 @@
v-for="item in transportTypeList" v-for="item in transportTypeList"
:key="item.value" :key="item.value"
:label="item.value" :label="item.value"
>{{ item.label }}</el-checkbox >{{ item.label }}</el-checkbox>
>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -405,8 +368,7 @@
v-for="item in deliveryWayList" v-for="item in deliveryWayList"
:key="item.value" :key="item.value"
:label="item.value" :label="item.value"
>{{ item.label }}</el-checkbox >{{ item.label }}</el-checkbox>
>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -414,7 +376,7 @@
</el-form> </el-form>
</div> </div>
<div class="main_title"> <div class="main_title">
<div class="bluekuai"></div> <div class="bluekuai" />
<div class="title_word">{{ '选择不合并产品' }}</div> <div class="title_word">{{ '选择不合并产品' }}</div>
</div> </div>
<div> <div>
@ -427,37 +389,32 @@
> >
<!-- :row-class-name="tableRowClassName" <!-- :row-class-name="tableRowClassName"
--> -->
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55" />
<el-table-column <el-table-column
align="center" align="center"
prop="productName" prop="productName"
:label="'产品名称'" :label="'产品名称'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="specsName" prop="specsName"
:label="'产品规格'" :label="'产品规格'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="quantity" prop="quantity"
:label="'产品订单总量'" :label="'产品订单总量'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="productStock" prop="productStock"
:label="'实际库存数量'" :label="'实际库存数量'"
> />
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="footer" style="text-align: center; margin-top: 20px"> <div class="footer" style="text-align: center; margin-top: 20px">
<el-button @click="hdShow = false"> <el-button @click="hdShow = false">
{{ '取消' }}</el-button {{ '取消' }}</el-button>
>
<el-button type="primary" @click="sureHd('hdform')">{{ <el-button type="primary" @click="sureHd('hdform')">{{
'确定' '确定'
}}</el-button> }}</el-button>
@ -475,21 +432,21 @@
> >
<div> <div>
<el-form <el-form
ref="ztForm"
label-width="80px" label-width="80px"
:model="ztForm" :model="ztForm"
ref="ztForm"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item :label="'邮费返还'" prop="postage"> <el-form-item :label="'邮费返还'" prop="postage">
<el-input style="width: 166px" v-model="ztForm.postage"></el-input> <el-input v-model="ztForm.postage" style="width: 166px" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="menuList"> <div class="menuList">
<div <div
v-for="item in qhList" v-for="item in qhList"
@click="isMenu = item.id"
:class="['menu_i', isMenu == item.id ? 'actMenu' : '']"
:key="item.id" :key="item.id"
:class="['menu_i', isMenu == item.id ? 'actMenu' : '']"
@click="isMenu = item.id"
> >
{{ item.text }} {{ item.text }}
</div> </div>
@ -506,22 +463,22 @@
align="center" align="center"
prop="orderCode" prop="orderCode"
:label="'订单编号'" :label="'订单编号'"
></el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="productName" prop="productName"
:label="'产品名称'" :label="'产品名称'"
></el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="specsName" prop="specsName"
:label="'产品规格'" :label="'产品规格'"
></el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="quantity" prop="quantity"
:label="'产品数量'" :label="'产品数量'"
></el-table-column> />
</el-table> </el-table>
<el-table <el-table
v-if="isMenu == 1" v-if="isMenu == 1"
@ -536,18 +493,21 @@
align="center" align="center"
prop="orderCode" prop="orderCode"
:label="'订单编号'" :label="'订单编号'"
></el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="productName" prop="productName"
:label="'产品名称'" :label="'产品名称'"
></el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="specsName" prop="specsName"
:label="'产品规格'" :label="'产品规格'"
></el-table-column> />
<el-table-column align="center" prop="" :label="'产品数量'" <el-table-column
align="center"
prop=""
:label="'产品数量'"
><template> ><template>
<span>1</span> <span>1</span>
</template> </template>
@ -557,15 +517,14 @@
prop="barCode" prop="barCode"
:label="'追溯码'" :label="'追溯码'"
><template slot-scope="scope"> ><template slot-scope="scope">
<el-input v-model="scope.row.barCode"> </el-input> <el-input v-model="scope.row.barCode" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="footer" style="text-align: center; margin-top: 20px"> <div class="footer" style="text-align: center; margin-top: 20px">
<el-button @click="zitiShow = false"> <el-button @click="zitiShow = false">
{{ '取消' }}</el-button {{ '取消' }}</el-button>
>
<el-button type="primary" @click="sureTh">{{ <el-button type="primary" @click="sureTh">{{
'确定' '确定'
}}</el-button> }}</el-button>
@ -593,37 +552,35 @@
align="center" align="center"
prop="orderCode" prop="orderCode"
:label="'订单编号'" :label="'订单编号'"
></el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="orderAmount" prop="orderAmount"
:label="'金额'" :label="'金额'"
></el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="orderAchieve" prop="orderAchieve"
:label="`${'业绩'}($)`" :label="`${'业绩'}($)`"
></el-table-column> />
<el-table-column align="center" prop="orderAssAchieve" label="BV"> <el-table-column align="center" prop="orderAssAchieve" label="BV" />
</el-table-column>
</el-table> </el-table>
</div> </div>
<el-form <el-form
ref="orderDkForm"
label-width="120px" label-width="120px"
:model="orderDkForm" :model="orderDkForm"
ref="orderDkForm"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="抵扣订单编号" prop="orderCode"> <el-form-item label="抵扣订单编号" prop="orderCode">
<el-input v-model="orderDkForm.orderCode"></el-input> <el-input v-model="orderDkForm.orderCode" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-button type="primary" @click="getOldOrderDk"> <el-button type="primary" @click="getOldOrderDk">
{{ '搜索' }}</el-button {{ '搜索' }}</el-button>
>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -638,25 +595,23 @@
align="center" align="center"
prop="orderCode" prop="orderCode"
label="抵扣订单编号" label="抵扣订单编号"
></el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="orderAmount" prop="orderAmount"
:label="'金额'" :label="'金额'"
></el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="orderAchieve" prop="orderAchieve"
:label="`${'业绩'}($)`" :label="`${'业绩'}($)`"
></el-table-column> />
<el-table-column align="center" prop="orderAssAchieve" label="BV"> <el-table-column align="center" prop="orderAssAchieve" label="BV" />
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="footer" style="text-align: center; margin-top: 20px"> <div class="footer" style="text-align: center; margin-top: 20px">
<el-button @click="orderDkShow = false"> <el-button @click="orderDkShow = false">
{{ '取消' }}</el-button {{ '取消' }}</el-button>
>
<el-button type="primary" @click="sureOrderDk">{{ <el-button type="primary" @click="sureOrderDk">{{
'确定' '确定'
}}</el-button> }}</el-button>
@ -668,33 +623,33 @@
<script> <script>
// import { getDeliveryUnhandledList } from "@/api/delivery"; // import { getDeliveryUnhandledList } from "@/api/delivery";
import * as del from "@/api/delivery"; import * as del from '@/api/delivery'
export default { export default {
name: "Unhandeled", name: 'Unhandeled',
props: {
params: {
type: Object,
default: null,
},
},
filters: { filters: {
numFilter(value) { numFilter(value) {
// 截取当前数据到小数点后两位 // 截取当前数据到小数点后两位
let realVal = parseFloat(value).toFixed(2); const realVal = parseFloat(value).toFixed(2)
return realVal; return realVal
}
}, },
props: {
params: {
type: Object,
default: null
}
}, },
data() { data() {
return { return {
qhList: [ qhList: [
{ {
text: '提货商品', text: '提货商品',
id: 0, id: 0
}, },
{ {
text: '绑定追溯码', text: '绑定追溯码',
id: 1, id: 1
}, }
], ],
tableData: [], tableData: [],
total: 0, total: 0,
@ -702,25 +657,26 @@ export default {
multiple: true, multiple: true,
hdShow: false, // 合单弹框 hdShow: false, // 合单弹框
hdform: { hdform: {
mergeType: "", //合单类型 mergeType: '', // 合单类型
recNameBool: 0, // 收货人 recNameBool: 0, // 收货人
recPhoneBool: 0, // 收货电话 recPhoneBool: 0, // 收货电话
recAreaBool: 0, // 收货省市区 recAreaBool: 0, // 收货省市区
recAddressBool: 0, // 收货详细地址 recAddressBool: 0, // 收货详细地址
operateScope: 0, // 供应方式 operateScope: 0, // 供应方式
preSaleStatus: 0, //预售状态 preSaleStatus: 0, // 预售状态 // 发货方式
transportTypeList: [], //运输方式
deliveryWayList: [], //发货方式
idList: [], // 订单明细ID列表 idList: [], // 订单明细ID列表
excludeIdList: [], // 排序产品ID excludeIdList: [], // 排序产品ID
productNameBool: 0,
deliveryWayList: [],
transportTypeList: []
}, },
hdrules: { hdrules: {
transportTypeList: [ transportTypeList: [
{ required: true, message: '请选择运输方式', trigger: "change" }, { required: true, message: '请选择运输方式', trigger: 'change' }
], ],
deliveryWayList: [ deliveryWayList: [
{ required: true, message: '请选择发货方式', trigger: "change" }, { required: true, message: '请选择发货方式', trigger: 'change' }
], ]
}, },
yesornoList: [], yesornoList: [],
supplyWayList: [], // 供应方式 supplyWayList: [], // 供应方式
@ -730,188 +686,198 @@ export default {
unproductData: [], unproductData: [],
zitiShow: false, zitiShow: false,
ztTitle: '自提', ztTitle: '自提',
isMenu: "0", isMenu: '0',
ztData: {}, ztData: {},
ztForm: { ztForm: {
postage: "", postage: ''
}, },
orderIdList: [], // 自提用到orderIdList orderIdList: [], // 自提用到orderIdList
pageSizes: [100, 200, 500, 1000, 2000], pageSizes: [100, 200, 500, 1000, 2000],
selRow: [], selRow: [],
orderDkShow: false, orderDkShow: false,
orderDkForm: { orderDkForm: {
orderCode: "", orderCode: ''
}, },
pkOrderNewData: [], pkOrderNewData: [],
pkOrderOldData: [], pkOrderOldData: []
}; }
}, },
created() { created() {
this.getList(); this.getList()
this.getOther(); this.getOther()
}, },
methods: { methods: {
sureOrderDk() { sureOrderDk() {
if (this.pkOrderNewData.length > 0 && this.pkOrderOldData.length > 0) { if (this.pkOrderNewData.length > 0 && this.pkOrderOldData.length > 0) {
let theform = { const theform = {
pkOrderNewData: this.pkOrderNewData, pkOrderNewData: this.pkOrderNewData,
pkOrderOldData: this.pkOrderOldData, pkOrderOldData: this.pkOrderOldData
}; }
// 发起签呈 // 发起签呈
this.$router.push({ this.$router.push({
path: "deductionZxqc", path: 'deductionZxqc',
query: { query: {
data: JSON.stringify(theform), data: JSON.stringify(theform),
index: 254, index: 254
}, }
}); })
} }
}, },
// 订单抵扣 // 订单抵扣
orderDk() { orderDk() {
this.orderDkShow = true; this.orderDkShow = true
del del
.getNewDeductionData({ pkOrder: this.selRow[0].pkOrder }) .getNewDeductionData({ pkOrder: this.selRow[0].pkOrder })
.then((res) => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.pkOrderNewData = [res.data]; this.pkOrderNewData = [res.data]
} }
}); })
}, },
getOldOrderDk() { getOldOrderDk() {
del del
.getOldDeductionData({ .getOldDeductionData({
orderCode: this.orderDkForm.orderCode, orderCode: this.orderDkForm.orderCode
}) })
.then((res) => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.pkOrderOldData = [res.data]; this.pkOrderOldData = [res.data]
} }
}); })
}, },
getOther() { getOther() {
del.getDealerYesNo().then((res) => { del.getDealerYesNo().then((res) => {
this.yesornoList = res.data; this.yesornoList = res.data
}); })
del.getSupplyWay().then((res) => { del.getSupplyWay().then((res) => {
this.supplyWayList = res.data; this.supplyWayList = res.data
}); })
del.getPresaleStatus().then((res) => { del.getPresaleStatus().then((res) => {
this.presaleStatusList = res.data; this.presaleStatusList = res.data
}); })
del.getDeliveryWayList().then((res) => { del.getDeliveryWayList().then((res) => {
this.deliveryWayList = res.data; this.deliveryWayList = res.data || []
}); this.hdform.deliveryWayList.push(this.deliveryWayList[0].value)
})
del.getTransportType().then((res) => { del.getTransportType().then((res) => {
this.transportTypeList = res.data; this.transportTypeList = res.data || []
}); this.hdform.transportTypeList.push(this.transportTypeList[0].value)
})
}, },
// 确定提货 // 确定提货
sureTh() { sureTh() {
this.$router.push({ this.$router.push({
path: "ztZxqc", path: 'ztZxqc',
query: { query: {
postage: this.ztForm.postage, postage: this.ztForm.postage,
itemIdList: JSON.stringify(this.hdform.idList), itemIdList: JSON.stringify(this.hdform.idList),
barCodeList: JSON.stringify(this.ztData.barCodeList), barCodeList: JSON.stringify(this.ztData.barCodeList),
productList: JSON.stringify(this.ztData.productList), productList: JSON.stringify(this.ztData.productList),
businessType: 251, businessType: 251
}, }
}); })
}, },
// 合单 // 合单
mergeHd(index) { mergeHd(index) {
this.hdform.mergeType = index; this.hdform.mergeType = index
if (index == 1) { if (index == 1) {
this.hdShow = true; this.hdShow = true
// const theidList = this.hdform.idList.join() // const theidList = this.hdform.idList.join()
del del
.getExcludeProduct({ mergeType: 1, idList: this.hdform.idList }) .getExcludeProduct({ mergeType: 1, idList: this.hdform.idList })
.then((res) => { .then((res) => {
this.unproductData = res.data; this.unproductData = res.data
}); })
} else if (index == 0) { } else if (index == 0) {
this.$confirm('是否确定进行全部合单操作?').then((_) => { this.$confirm('是否确定进行全部合单操作?').then((_) => {
del del
.deliverUnhandeldMerge( .deliverUnhandeldMerge(
Object.assign({}, this.params, { Object.assign({}, this.params, {
mergeType: this.hdform.mergeType, mergeType: this.hdform.mergeType
}) })
) )
.then((res) => { .then((res) => {
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: "success", type: 'success'
}); })
this.getList(); this.getList()
}); })
}); })
} else if (index == 2) { } else if (index == 2) {
this.zitiShow = true; this.zitiShow = true
del del
.getUnhandeldSelfData({ orderIdList: this.orderIdList.join() }) .getUnhandeldSelfData({ orderIdList: this.orderIdList.join() })
.then((res) => { .then((res) => {
this.ztData = res.data; this.ztData = res.data
}); })
} }
}, },
// 确认合单 // 确认合单
sureHd(formName) { sureHd(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
this.hdform.recAddressBool = Boolean(!this.hdform.recAddressBool); // this.hdform.recAddressBool = Boolean(!this.hdform.recAddressBool)
this.hdform.recAreaBool = Boolean(!this.hdform.recAreaBool); // this.hdform.recAreaBool = Boolean(!this.hdform.recAreaBool)
this.hdform.recNameBool = Boolean(!this.hdform.recNameBool); // this.hdform.recNameBool = Boolean(!this.hdform.recNameBool)
this.hdform.recPhoneBool = Boolean(!this.hdform.recPhoneBool); // this.hdform.recPhoneBool = Boolean(!this.hdform.recPhoneBool)
this.hdform.productNameBool = Boolean(!this.hdform.productNameBool); // this.hdform.productNameBool = Boolean(!this.hdform.productNameBool)
const params = {
...this.hdform,
recAddressBool: Boolean(!this.hdform.recAddressBool),
recAreaBool: Boolean(!this.hdform.recAreaBool),
recNameBool: Boolean(!this.hdform.recNameBool),
recPhoneBool: Boolean(!this.hdform.recPhoneBool),
productNameBool: Boolean(!this.hdform.productNameBool)
}
if (valid) { if (valid) {
del.deliverUnhandeldMerge(this.hdform).then((res) => { del.deliverUnhandeldMerge(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: "success", type: 'success'
}); })
this.getList(); this.getList()
this.hdShow = false; this.hdShow = false
} }
}); })
} }
}); })
}, },
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.hdform.idList = selection.map((item) => item.pkId); this.hdform.idList = selection.map((item) => item.pkId)
this.orderIdList = selection.map((item) => item.pkOrder); this.orderIdList = selection.map((item) => item.pkOrder)
this.multiple = !selection.length; this.multiple = !selection.length
this.selRow = selection; this.selRow = selection
}, },
handleSelectionChange2(sele) { handleSelectionChange2(sele) {
this.hdform.excludeIdList = sele.map((item) => item.pkProduct); this.hdform.excludeIdList = sele.map((item) => item.pkProduct)
}, },
// 导出 // 导出
handleExport() { handleExport() {
this.params.pkIdList = this.hdform.idList; this.params.pkIdList = this.hdform.idList
this.$confirm('是否确认导出所有数据项?', '警告', { this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: "warning", type: 'warning'
}).then((_) => { }).then((_) => {
this.download( this.download(
"/sale/manage/deliver-unhandled/export", '/sale/manage/deliver-unhandled/export',
// {pkIdList:this.hdform.idList}, // {pkIdList:this.hdform.idList},
{ ...this.params }, { ...this.params },
`${'未合单'}${new Date().getTime()}.xlsx` `${'未合单'}${new Date().getTime()}.xlsx`
); )
}); })
}, },
getList() { getList() {
this.params.pkIdList = []; this.params.pkIdList = []
del.getDeliveryUnhandledList(this.params).then((res) => { del.getDeliveryUnhandledList(this.params).then((res) => {
this.tableData = res.rows; this.tableData = res.rows
this.total = res.total; this.total = res.total
}); })
}, }
}, }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>