|
@@ -2,41 +2,20 @@
|
|
<div>
|
|
<div>
|
|
<div class="bg-in">
|
|
<div class="bg-in">
|
|
<div>
|
|
<div>
|
|
- <el-form
|
|
|
|
- :model="deliveryForms"
|
|
|
|
- :rules="rules"
|
|
|
|
- ref="ruleForm"
|
|
|
|
- label-width="120px"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-form :model="deliveryForms" :rules="rules" ref="ruleForm" label-width="120px">
|
|
<el-row>
|
|
<el-row>
|
|
<el-col>
|
|
<el-col>
|
|
<el-form-item label="预约类型:" prop="appointment_type">
|
|
<el-form-item label="预约类型:" prop="appointment_type">
|
|
- <el-select
|
|
|
|
- v-model="deliveryForms.appointment_type"
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="(item, index) in appointmentList"
|
|
|
|
- :key="index"
|
|
|
|
- :label="item.label"
|
|
|
|
- :value="item.value"
|
|
|
|
- ></el-option>
|
|
|
|
|
|
+ <el-select v-model="deliveryForms.appointment_type" :disabled="disabledType">
|
|
|
|
+ <el-option v-for="(item, index) in appointmentList" :key="index" :label="item.label"
|
|
|
|
+ :value="item.value"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col>
|
|
<el-col>
|
|
- <el-form-item
|
|
|
|
- label="预约时间:"
|
|
|
|
- prop=""
|
|
|
|
- v-if="deliveryForms.appointment_type != 0"
|
|
|
|
- >
|
|
|
|
- <el-date-picker
|
|
|
|
- v-model="deliveryForms.appointment_time"
|
|
|
|
- type="datetime"
|
|
|
|
- placeholder="选择日期时间"
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
- ></el-date-picker>
|
|
|
|
|
|
+ <el-form-item label="预约时间:" prop="" v-if="deliveryForms.appointment_type != 0">
|
|
|
|
+ <el-date-picker v-model="deliveryForms.appointment_time" type="datetime" placeholder="选择日期时间"
|
|
|
|
+ :disabled="disabledType" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -45,43 +24,21 @@
|
|
<el-row>
|
|
<el-row>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="发货人姓名:" prop="sender.name">
|
|
<el-form-item label="发货人姓名:" prop="sender.name">
|
|
- <!-- <el-select v-model="deliveryForms.sender.name"> </el-select> -->
|
|
|
|
- <el-input
|
|
|
|
- v-model="deliveryForms.sender.name"
|
|
|
|
- :minlength="1"
|
|
|
|
- :maxlength="20"
|
|
|
|
- placeholder="请输入发货人姓名"
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="deliveryForms.sender.name" :minlength="1" :maxlength="20" placeholder="请输入发货人姓名"
|
|
|
|
+ :disabled="true"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="手机号:" prop="sender.phone">
|
|
<el-form-item label="手机号:" prop="sender.phone">
|
|
- <el-input
|
|
|
|
- v-model="deliveryForms.sender.phone"
|
|
|
|
- :minlength="1"
|
|
|
|
- :maxlength="20"
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- placeholder="请输入手机号"
|
|
|
|
- ></el-input> </el-form-item
|
|
|
|
- ></el-col>
|
|
|
|
|
|
+ <el-input v-model="deliveryForms.sender.phone" :minlength="1" :maxlength="20" :disabled="true"
|
|
|
|
+ placeholder="请输入手机号"></el-input> </el-form-item></el-col>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="发货地址:" prop="sender.address">
|
|
<el-form-item label="发货地址:" prop="sender.address">
|
|
- <el-cascader
|
|
|
|
- size="large"
|
|
|
|
- :options="options"
|
|
|
|
- clearable
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- v-model="selectedOptions"
|
|
|
|
- @change="sendHandleChange"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-cascader size="large" :options="options" clearable :disabled="true" v-model="selectedOptions"
|
|
|
|
+ @change="sendHandleChange">
|
|
</el-cascader>
|
|
</el-cascader>
|
|
- <el-input
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- v-model="deliveryForms.sender.address"
|
|
|
|
- placeholder="请输入"
|
|
|
|
- ></el-input> </el-form-item
|
|
|
|
- ></el-col>
|
|
|
|
|
|
+ <el-input :disabled="true" v-model="deliveryForms.sender.address" placeholder="请输入"></el-input>
|
|
|
|
+ </el-form-item></el-col>
|
|
<!-- <el-col :span="12">
|
|
<!-- <el-col :span="12">
|
|
<el-form-item label="配送仓库:" prop="freight_price">
|
|
<el-form-item label="配送仓库:" prop="freight_price">
|
|
<el-select>
|
|
<el-select>
|
|
@@ -112,43 +69,21 @@
|
|
<!-- --><el-row>
|
|
<!-- --><el-row>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="收货人姓名:" prop="receiver.name">
|
|
<el-form-item label="收货人姓名:" prop="receiver.name">
|
|
- <el-input
|
|
|
|
- v-model="deliveryForms.receiver.name"
|
|
|
|
- :minlength="1"
|
|
|
|
- :maxlength="20"
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- placeholder="请输入收货人姓名"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="deliveryForms.receiver.name" :minlength="1" :maxlength="20" :disabled="true"
|
|
|
|
+ placeholder="请输入收货人姓名"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="手机号:" prop="receiver.phone">
|
|
<el-form-item label="手机号:" prop="receiver.phone">
|
|
- <el-input
|
|
|
|
- v-model="deliveryForms.receiver.phone"
|
|
|
|
- :minlength="1"
|
|
|
|
- :maxlength="20"
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- placeholder="请输入手机号"
|
|
|
|
- ></el-input> </el-form-item
|
|
|
|
- ></el-col>
|
|
|
|
|
|
+ <el-input v-model="deliveryForms.receiver.phone" :minlength="1" :maxlength="20" :disabled="true"
|
|
|
|
+ placeholder="请输入手机号"></el-input> </el-form-item></el-col>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="配送地址:" prop="receiver.address">
|
|
<el-form-item label="配送地址:" prop="receiver.address">
|
|
- <el-cascader
|
|
|
|
- size="large"
|
|
|
|
- :options="options"
|
|
|
|
- clearable
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- v-model="receiverOptions"
|
|
|
|
- @change="receiverChange"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-cascader size="large" :options="options" clearable :disabled="true" v-model="receiverOptions"
|
|
|
|
+ @change="receiverChange">
|
|
</el-cascader>
|
|
</el-cascader>
|
|
- <el-input
|
|
|
|
- v-model="deliveryForms.receiver.address"
|
|
|
|
- size="medium"
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- placeholder="请输入"
|
|
|
|
- ></el-input> </el-form-item
|
|
|
|
- ></el-col>
|
|
|
|
|
|
+ <el-input v-model="deliveryForms.receiver.address" size="medium" :disabled="true"
|
|
|
|
+ placeholder="请输入"></el-input> </el-form-item></el-col>
|
|
</el-row>
|
|
</el-row>
|
|
<el-divider></el-divider>
|
|
<el-divider></el-divider>
|
|
<!-- <el-row :gutter="20">
|
|
<!-- <el-row :gutter="20">
|
|
@@ -166,13 +101,8 @@
|
|
></el-col>
|
|
></el-col>
|
|
</el-row> -->
|
|
</el-row> -->
|
|
<h3>商品信息:</h3>
|
|
<h3>商品信息:</h3>
|
|
- <el-table
|
|
|
|
- :data="product_list"
|
|
|
|
- border
|
|
|
|
- :cell-style="{ textAlign: 'center' }"
|
|
|
|
- :header-cell-style="{ textAlign: 'center' }"
|
|
|
|
- style="width: 95%"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-table :data="product_list" border :cell-style="{ textAlign: 'center' }"
|
|
|
|
+ :header-cell-style="{ textAlign: 'center' }" style="width: 95%">
|
|
<el-table-column type="selection" width="40" align="center" />
|
|
<el-table-column type="selection" width="40" align="center" />
|
|
<el-table-column label="商品编号">
|
|
<el-table-column label="商品编号">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
@@ -189,14 +119,15 @@
|
|
{{ scope.row.product_vo.bar_code }}
|
|
{{ scope.row.product_vo.bar_code }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="序列号">
|
|
|
|
|
|
+ <el-table-column label="序列号" v-if="sn_code_list">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- {{ scope.row.product_vo.sn_code }}
|
|
|
|
|
|
+ <span v-for="(item, index) in scope.row.sn_code_list" :key="item.id"><span v-if="index !== 0">,</span>{{
|
|
|
|
+ item.sn_code }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="规格型号">
|
|
<el-table-column label="规格型号">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- {{ scope.row.product_vo.spec_name}}
|
|
|
|
|
|
+ {{ scope.row.product_vo.spec_name }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="单位">
|
|
<el-table-column label="单位">
|
|
@@ -216,60 +147,96 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
<el-divider></el-divider>
|
|
<el-divider></el-divider>
|
|
- <h3></h3>
|
|
|
|
|
|
+ <h3>出库明细</h3>
|
|
|
|
+ <el-button class="button" size="mini" type="primary" @click="scanCode"
|
|
|
|
+ :disabled="disabledType">扫码出库</el-button>
|
|
|
|
+ <div style="width: 100%; display: block">
|
|
|
|
+ <!-- // -->
|
|
|
|
+ <el-form-item style="width: 100%">
|
|
|
|
+ <el-table border :data="goodsExchangeAddForm.product_list" :cell-style="{ textAlign: 'center' }"
|
|
|
|
+ :header-cell-style="{ textAlign: 'center' }" style="width: 100%; margin-top: 20px">
|
|
|
|
+ <el-table-column label="商品编号">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <span>{{ scope.row.goods_vo.sn }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column label="商品名称">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <span>{{ scope.row.goods_vo.name }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column label="条码">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <span>{{ scope.row.product_vo.bar_code }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column label="序列号" v-if="sn_code_list">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <span v-for="(item, index) in scope.row.sn_code_list" :key="item.id"><span
|
|
|
|
+ v-if="index !== 0">,</span>{{ item.sn_code }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column prop="product_vo.spec_name" label="规格型号">
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column label="单位">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <span>{{ scope.row.product_vo.unit }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column label="出库数量">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ {{ scope.row.num }}
|
|
|
|
+ <!-- <el-input v-model="scope.row.out_num" type="number" :min="0" :maxlength="20"></el-input> -->
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column label="库存数量">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <span v-if="!disabledType">{{ scope.row.usable_stock }}</span>
|
|
|
|
+ <span v-else>{{ scope.row.use_able_stock }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column width="200" label="操作" v-if="!disabledType">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <!-- <el-button
|
|
|
|
+ size="mini"
|
|
|
|
+ @click="addSnCode(scope.row,scope.$index)"
|
|
|
|
+ >添加序列号</el-button
|
|
|
|
+ > -->
|
|
|
|
+ <el-button size="mini" @click="
|
|
|
|
+ goodsExchangeAddForm.product_list.splice(scope.$index, 1)
|
|
|
|
+ ">删除</el-button>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ </el-table>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </div>
|
|
|
|
|
|
|
|
+ <el-divider></el-divider>
|
|
|
|
+ <h3></h3>
|
|
<el-row>
|
|
<el-row>
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
<el-form-item label="物品总重量:" prop="total_weight">
|
|
<el-form-item label="物品总重量:" prop="total_weight">
|
|
- <el-input
|
|
|
|
- v-model.number="deliveryForms.total_weight"
|
|
|
|
- :minlength="1"
|
|
|
|
- :maxlength="20"
|
|
|
|
- type="number"
|
|
|
|
- max="50"
|
|
|
|
- clearable
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- placeholder="请输入物品总重量"
|
|
|
|
- ><template slot="append">KG</template></el-input
|
|
|
|
- >
|
|
|
|
|
|
+ <el-input v-model.number="deliveryForms.total_weight" :minlength="1" :maxlength="20" type="number"
|
|
|
|
+ max="50" clearable :disabled="disabledType" placeholder="请输入物品总重量"><template
|
|
|
|
+ slot="append">KG</template></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="物品总体积:" prop="total_volume">
|
|
<el-form-item label="物品总体积:" prop="total_volume">
|
|
- <el-input
|
|
|
|
- v-model="deliveryForms.total_volume"
|
|
|
|
- :minlength="1"
|
|
|
|
- :maxlength="20"
|
|
|
|
- clearable
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- placeholder="请输入物品总体积"
|
|
|
|
- ><template slot="append">m³</template></el-input
|
|
|
|
- >
|
|
|
|
|
|
+ <el-input v-model="deliveryForms.total_volume" :minlength="1" :maxlength="20" clearable
|
|
|
|
+ :disabled="disabledType" placeholder="请输入物品总体积"><template slot="append">m³</template></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
<el-form-item label="物品价格:" prop="declared_value">
|
|
<el-form-item label="物品价格:" prop="declared_value">
|
|
- <el-input
|
|
|
|
- v-model="deliveryForms.declared_value"
|
|
|
|
- :minlength="1"
|
|
|
|
- :maxlength="20"
|
|
|
|
- clearable
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- placeholder="请输入物品价格"
|
|
|
|
- ><template slot="append">元</template></el-input
|
|
|
|
- >
|
|
|
|
|
|
+ <el-input v-model="deliveryForms.declared_value" :minlength="1" :maxlength="20" clearable
|
|
|
|
+ :disabled="disabledType" placeholder="请输入物品价格"><template slot="append">元</template></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="16">
|
|
<el-col :span="16">
|
|
<el-form-item label="备注:" prop="remark">
|
|
<el-form-item label="备注:" prop="remark">
|
|
- <el-input
|
|
|
|
- v-model="deliveryForms.remark"
|
|
|
|
- type="textarea"
|
|
|
|
- clearable
|
|
|
|
- :disabled="disabledType"
|
|
|
|
- :autosize="{ minRows: 2, maxRows: 4 }"
|
|
|
|
- placeholder="请输入备注"
|
|
|
|
- ></el-input>
|
|
|
|
|
|
+ <el-input v-model="deliveryForms.remark" type="textarea" clearable :disabled="disabledType"
|
|
|
|
+ :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入备注"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -277,45 +244,26 @@
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
<el-col :span="8" :offset="6">
|
|
<el-col :span="8" :offset="6">
|
|
<el-form-item label="物流单号:" prop="tracking_number">
|
|
<el-form-item label="物流单号:" prop="tracking_number">
|
|
- <el-input
|
|
|
|
- v-model="kdnCode"
|
|
|
|
- :minlength="1"
|
|
|
|
- :maxlength="20"
|
|
|
|
- :disabled="true"
|
|
|
|
- placeholder="请输入物流单号"
|
|
|
|
- ></el-input>
|
|
|
|
- <el-button
|
|
|
|
- @click="obtainOrder"
|
|
|
|
- v-if="kdnCode == '' || kdnCode == undefined"
|
|
|
|
- :disabled="btnType"
|
|
|
|
- >获取单号</el-button
|
|
|
|
- >
|
|
|
|
- </el-form-item></el-col
|
|
|
|
- >
|
|
|
|
|
|
+ <el-input v-model="kdnCode" :minlength="1" :maxlength="20" :disabled="true"
|
|
|
|
+ placeholder="请输入物流单号"></el-input>
|
|
|
|
+ <el-button @click="obtainOrder" v-if="kdnCode == '' || kdnCode == undefined"
|
|
|
|
+ :disabled="btnType">获取单号</el-button>
|
|
|
|
+ </el-form-item></el-col>
|
|
</el-row>
|
|
</el-row>
|
|
</el-form>
|
|
</el-form>
|
|
</div>
|
|
</div>
|
|
- <div
|
|
|
|
- v-if="
|
|
|
|
- outType !== undefined &&
|
|
|
|
- (JSON.stringify(deliveryForms.create_order_fail) !== '{}' ||
|
|
|
|
- JSON.stringify(deliveryForms.create_order_success) !== '{}')
|
|
|
|
- "
|
|
|
|
- >
|
|
|
|
|
|
+ <div v-if="
|
|
|
|
+ outType !== undefined &&
|
|
|
|
+ (JSON.stringify(deliveryForms.create_order_fail) !== '{}' ||
|
|
|
|
+ JSON.stringify(deliveryForms.create_order_success) !== '{}')
|
|
|
|
+ ">
|
|
<h3>物流状态:</h3>
|
|
<h3>物流状态:</h3>
|
|
- <div
|
|
|
|
- class="steps-wrap"
|
|
|
|
- v-if="JSON.stringify(deliveryForms.create_order_fail) !== '{}'"
|
|
|
|
- >
|
|
|
|
|
|
+ <div class="steps-wrap" v-if="JSON.stringify(deliveryForms.create_order_fail) !== '{}'">
|
|
<el-steps class="steps" direction="vertical" process-status="finish">
|
|
<el-steps class="steps" direction="vertical" process-status="finish">
|
|
- <el-step
|
|
|
|
- icon="el-icon-error"
|
|
|
|
- :title="
|
|
|
|
- deliveryForms.create_order_fail && deliveryForms.create_order_fail.orderStatus == 600
|
|
|
|
- ? '下单失败'
|
|
|
|
- : ''
|
|
|
|
- "
|
|
|
|
- >
|
|
|
|
|
|
+ <el-step icon="el-icon-error" :title="deliveryForms.create_order_fail && deliveryForms.create_order_fail.orderStatus == 600
|
|
|
|
+ ? '下单失败'
|
|
|
|
+ : ''
|
|
|
|
+ ">
|
|
<div slot="description">
|
|
<div slot="description">
|
|
<p class="row-remark">
|
|
<p class="row-remark">
|
|
{{ safeAccess(deliveryForms.create_order_fail, 'remark') }}
|
|
{{ safeAccess(deliveryForms.create_order_fail, 'remark') }}
|
|
@@ -333,17 +281,10 @@
|
|
</el-steps>
|
|
</el-steps>
|
|
</div>
|
|
</div>
|
|
<div class="steps-wrap" v-else>
|
|
<div class="steps-wrap" v-else>
|
|
- <el-steps
|
|
|
|
- class="steps"
|
|
|
|
- direction="vertical"
|
|
|
|
- process-status="finish"
|
|
|
|
- :active="activeStep"
|
|
|
|
- >
|
|
|
|
- <el-step
|
|
|
|
- icon="el-icon-success"
|
|
|
|
- v-if="JSON.stringify(deliveryForms.sign_in) !== '{}'&&deliveryForms.sign_in.orderStatus == 402"
|
|
|
|
- :title="deliveryForms.sign_in.orderStatus == 402 ? '退回' : ''"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-steps class="steps" direction="vertical" process-status="finish" :active="activeStep">
|
|
|
|
+ <el-step icon="el-icon-success"
|
|
|
|
+ v-if="JSON.stringify(deliveryForms.sign_in) !== '{}' && deliveryForms.sign_in.orderStatus == 402"
|
|
|
|
+ :title="deliveryForms.sign_in.orderStatus == 402 ? '退回' : ''">
|
|
<div slot="description">
|
|
<div slot="description">
|
|
<p class="row-remark">
|
|
<p class="row-remark">
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
@@ -357,11 +298,8 @@
|
|
</p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</el-step>
|
|
</el-step>
|
|
- <el-step
|
|
|
|
- icon="el-icon-success"
|
|
|
|
- v-if="JSON.stringify(deliveryForms.sign_in) !== '{}'"
|
|
|
|
- :title="deliveryForms.sign_in.orderStatus == 401 ? '签收' : ''"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.sign_in) !== '{}'"
|
|
|
|
+ :title="deliveryForms.sign_in.orderStatus == 401 ? '签收' : ''">
|
|
<div slot="description">
|
|
<div slot="description">
|
|
<p class="row-remark">
|
|
<p class="row-remark">
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
@@ -375,13 +313,8 @@
|
|
</p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</el-step>
|
|
</el-step>
|
|
- <el-step
|
|
|
|
- icon="el-icon-success"
|
|
|
|
- v-if="JSON.stringify(deliveryForms.user_sending) !== '{}'"
|
|
|
|
- :title="
|
|
|
|
- deliveryForms.user_sending.orderStatus == 300 ? '配送中' : ''
|
|
|
|
- "
|
|
|
|
- >
|
|
|
|
|
|
+ <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.user_sending) !== '{}'" :title="deliveryForms.user_sending.orderStatus == 300 ? '配送中' : ''
|
|
|
|
+ ">
|
|
<div slot="description">
|
|
<div slot="description">
|
|
<p class="row-remark">
|
|
<p class="row-remark">
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
@@ -399,13 +332,8 @@
|
|
</p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</el-step>
|
|
</el-step>
|
|
- <el-step
|
|
|
|
- icon="el-icon-success"
|
|
|
|
- v-if="JSON.stringify(deliveryForms.user_arrives) !== '{}'"
|
|
|
|
- :title="
|
|
|
|
- deliveryForms.user_arrives.orderStatus == 202 ? '已取件' : ''
|
|
|
|
- "
|
|
|
|
- >
|
|
|
|
|
|
+ <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.user_arrives) !== '{}'" :title="deliveryForms.user_arrives.orderStatus == 202 ? '已取件' : ''
|
|
|
|
+ ">
|
|
<div slot="description">
|
|
<div slot="description">
|
|
<p class="row-remark">
|
|
<p class="row-remark">
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
@@ -423,13 +351,8 @@
|
|
</p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</el-step>
|
|
</el-step>
|
|
- <el-step
|
|
|
|
- icon="el-icon-success"
|
|
|
|
- v-if="JSON.stringify(deliveryForms.user_take_order) !== '{}'"
|
|
|
|
- :title="
|
|
|
|
- deliveryForms.user_take_order.orderStatus == 201 ? '已接单' : ''
|
|
|
|
- "
|
|
|
|
- >
|
|
|
|
|
|
+ <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.user_take_order) !== '{}'" :title="deliveryForms.user_take_order.orderStatus == 201 ? '已接单' : ''
|
|
|
|
+ ">
|
|
<div slot="description">
|
|
<div slot="description">
|
|
<p class="row-remark">
|
|
<p class="row-remark">
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
@@ -443,20 +366,15 @@
|
|
<p class="row-time">
|
|
<p class="row-time">
|
|
{{
|
|
{{
|
|
(deliveryForms.user_take_order.requestTime / 1000)
|
|
(deliveryForms.user_take_order.requestTime / 1000)
|
|
- | unixToDate
|
|
|
|
|
|
+ | unixToDate
|
|
}}
|
|
}}
|
|
</p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</el-step>
|
|
</el-step>
|
|
- <el-step
|
|
|
|
- icon="el-icon-success"
|
|
|
|
- v-if="JSON.stringify(deliveryForms.create_order_success) !== '{}'"
|
|
|
|
- :title="
|
|
|
|
- deliveryForms.create_order_success.orderStatus == 100
|
|
|
|
- ? '待接单'
|
|
|
|
- : ''
|
|
|
|
- "
|
|
|
|
- >
|
|
|
|
|
|
+ <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.create_order_success) !== '{}'" :title="deliveryForms.create_order_success.orderStatus == 100
|
|
|
|
+ ? '待接单'
|
|
|
|
+ : ''
|
|
|
|
+ ">
|
|
<div slot="description">
|
|
<div slot="description">
|
|
<p class="row-remark">
|
|
<p class="row-remark">
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
订单号:{{ deliveryForms.create_order_success.orderCode }}
|
|
@@ -470,7 +388,7 @@
|
|
<p class="row-time">
|
|
<p class="row-time">
|
|
{{
|
|
{{
|
|
(deliveryForms.create_order_success.requestTime / 1000)
|
|
(deliveryForms.create_order_success.requestTime / 1000)
|
|
- | unixToDate
|
|
|
|
|
|
+ | unixToDate
|
|
}}
|
|
}}
|
|
</p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
@@ -478,6 +396,22 @@
|
|
</el-steps>
|
|
</el-steps>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
+ <el-dialog title="扫码出库" :visible.sync="scanDialogVisible" width="30%" :close-on-click-modal="false">
|
|
|
|
+ <el-form ref="scanGoodsForm" :model="scanGoodsForm" inline>
|
|
|
|
+ <el-form-item label="条码" prop="bar_code">
|
|
|
|
+ <el-input v-model="scanGoodsForm.bar_code" ref="input" @keyup.enter.native="toSearch()" :minlength="0"
|
|
|
|
+ :maxlength="100"></el-input>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ <el-form-item label="序列号" prop="sn_code">
|
|
|
|
+ <el-input v-model="sn_code" ref="sn_input" @keyup.enter.native="toSnCode()" :minlength="0"
|
|
|
|
+ :maxlength="100"></el-input>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-form>
|
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
|
+ <!-- <el-button @click="dialogVisible = false">取 消</el-button>
|
|
|
|
+ <el-button type="primary" @click="handleRejectGoodsExchange()">确 定</el-button> -->
|
|
|
|
+ </span>
|
|
|
|
+ </el-dialog>
|
|
<!-- <el-divider></el-divider>
|
|
<!-- <el-divider></el-divider>
|
|
<el-form
|
|
<el-form
|
|
:model="deliveryForms"
|
|
:model="deliveryForms"
|
|
@@ -550,12 +484,7 @@
|
|
</el-form> -->
|
|
</el-form> -->
|
|
<div class="footer">
|
|
<div class="footer">
|
|
<!-- <el-button type="primary"> 获取全部单号 </el-button> -->
|
|
<!-- <el-button type="primary"> 获取全部单号 </el-button> -->
|
|
- <el-button
|
|
|
|
- type="primary"
|
|
|
|
- @click="saveErpWarehouseOut"
|
|
|
|
- :disabled="outType == 'check'"
|
|
|
|
- v-if="kdnCode !== ''"
|
|
|
|
- >发货
|
|
|
|
|
|
+ <el-button type="primary" @click="saveErpWarehouseOut" :disabled="outType == 'check'" v-if="kdnCode !== ''">发货
|
|
</el-button>
|
|
</el-button>
|
|
<el-button @click="roBack2()">返回</el-button>
|
|
<el-button @click="roBack2()">返回</el-button>
|
|
</div>
|
|
</div>
|
|
@@ -568,6 +497,7 @@ import * as API_order from "@/api/order";
|
|
import * as API_Setting from "@/api/setting";
|
|
import * as API_Setting from "@/api/setting";
|
|
import * as API_Auth from "@/api/auth";
|
|
import * as API_Auth from "@/api/auth";
|
|
import { RegExp } from "~/ui-utils";
|
|
import { RegExp } from "~/ui-utils";
|
|
|
|
+import * as API_GoodsExchange from "@/api/goodsExchange";
|
|
import { Foundation } from "~/ui-utils";
|
|
import { Foundation } from "~/ui-utils";
|
|
import {
|
|
import {
|
|
provinceAndCityData,
|
|
provinceAndCityData,
|
|
@@ -694,6 +624,16 @@ export default {
|
|
receive_address: "",
|
|
receive_address: "",
|
|
detailData: [], // 物流详情
|
|
detailData: [], // 物流详情
|
|
/* nameToCodeMap:{} */
|
|
/* nameToCodeMap:{} */
|
|
|
|
+ sn_code: "",
|
|
|
|
+ sku: "",
|
|
|
|
+ sn_code_list: [],
|
|
|
|
+ index: "",
|
|
|
|
+ scanDialogVisible: false,
|
|
|
|
+ goodsExchangeAddForm: {
|
|
|
|
+ product_list: [],
|
|
|
|
+ type: "",
|
|
|
|
+ },
|
|
|
|
+ scanGoodsForm: {},
|
|
};
|
|
};
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
@@ -713,24 +653,24 @@ export default {
|
|
computed: {
|
|
computed: {
|
|
...mapGetters(["user"]),
|
|
...mapGetters(["user"]),
|
|
activeStep() {
|
|
activeStep() {
|
|
- // 定义步骤数组,每个元素对应一个步骤的条件
|
|
|
|
- const steps = [
|
|
|
|
- this.deliveryForms.sign_in && this.deliveryForms.sign_in.orderStatus === 402,
|
|
|
|
- this.deliveryForms.sign_in && this.deliveryForms.sign_in.orderStatus === 401,
|
|
|
|
- this.deliveryForms.user_sending && this.deliveryForms.user_sending.orderStatus === 300,
|
|
|
|
- this.deliveryForms.user_arrives && this.deliveryForms.user_arrives.orderStatus === 202,
|
|
|
|
- this.deliveryForms.user_take_order && this.deliveryForms.user_take_order.orderStatus === 201,
|
|
|
|
- this.deliveryForms.create_order_success && this.deliveryForms.create_order_success.orderStatus === 100
|
|
|
|
- ];
|
|
|
|
|
|
+ // 定义步骤数组,每个元素对应一个步骤的条件
|
|
|
|
+ const steps = [
|
|
|
|
+ this.deliveryForms.sign_in && this.deliveryForms.sign_in.orderStatus === 402,
|
|
|
|
+ this.deliveryForms.sign_in && this.deliveryForms.sign_in.orderStatus === 401,
|
|
|
|
+ this.deliveryForms.user_sending && this.deliveryForms.user_sending.orderStatus === 300,
|
|
|
|
+ this.deliveryForms.user_arrives && this.deliveryForms.user_arrives.orderStatus === 202,
|
|
|
|
+ this.deliveryForms.user_take_order && this.deliveryForms.user_take_order.orderStatus === 201,
|
|
|
|
+ this.deliveryForms.create_order_success && this.deliveryForms.create_order_success.orderStatus === 100
|
|
|
|
+ ];
|
|
|
|
|
|
- // 找出最后一个为真的步骤的索引
|
|
|
|
- for (let i = steps.length - 1; i >= 0; i--) {
|
|
|
|
- if (steps[i]) return i;
|
|
|
|
- }
|
|
|
|
|
|
+ // 找出最后一个为真的步骤的索引
|
|
|
|
+ for (let i = steps.length - 1; i >= 0; i--) {
|
|
|
|
+ if (steps[i]) return i;
|
|
|
|
+ }
|
|
|
|
|
|
- // 如果没有任何步骤是激活的,返回-1或者你可以选择返回0显示第一步
|
|
|
|
- return -1;
|
|
|
|
- }
|
|
|
|
|
|
+ // 如果没有任何步骤是激活的,返回-1或者你可以选择返回0显示第一步
|
|
|
|
+ return -1;
|
|
|
|
+ }
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
/**/ this.id = this.$route.params.id;
|
|
/**/ this.id = this.$route.params.id;
|
|
@@ -740,6 +680,103 @@ export default {
|
|
/* this.generateMap(regionData); */
|
|
/* this.generateMap(regionData); */
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ /* 出库扫码 */
|
|
|
|
+ toSearch() {
|
|
|
|
+ API_GoodsExchange.getProduct(
|
|
|
|
+ this.deliveryForms.warehouse_id,
|
|
|
|
+ this.scanGoodsForm.bar_code.replace(/\s+/g, '')
|
|
|
|
+ ).then((res) => {
|
|
|
|
+ res.sn_code_list = []
|
|
|
|
+ this.sku = res.product_vo.sku;
|
|
|
|
+ // 查找当前商品是否已存在于列表中
|
|
|
|
+ const indexs = this.goodsExchangeAddForm.product_list.findIndex((el) => {
|
|
|
|
+ return (
|
|
|
|
+ el.goods_id === res.goods_id &&
|
|
|
|
+ el.product_id === res.product_id &&
|
|
|
|
+ el.warehouse_id === res.warehouse_id &&
|
|
|
|
+ el.product_vo.sku === res.product_vo.sku
|
|
|
|
+ );
|
|
|
|
+ });
|
|
|
|
+ // 如果商品不存在,则添加到列表
|
|
|
|
+ if (indexs === -1) {
|
|
|
|
+ // 检查是否有相同商品在product_list中
|
|
|
|
+ const existingProduct = this.product_list.find(el => (
|
|
|
|
+ el.goods_id === res.goods_id &&
|
|
|
|
+ el.product_id === res.product_id &&
|
|
|
|
+ el.product_vo.sku === res.product_vo.sku
|
|
|
|
+ ));
|
|
|
|
+
|
|
|
|
+ if (!existingProduct) {
|
|
|
|
+ this.$message.error('订单内没有该商品,请重新录入');
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
+ this.$refs.input.focus();
|
|
|
|
+ });
|
|
|
|
+ return; // 退出函数,不继续执行
|
|
|
|
+ }
|
|
|
|
+ this.index = this.goodsExchangeAddForm.product_list.length
|
|
|
|
+ this.goodsExchangeAddForm.product_list.push(res);
|
|
|
|
+ } else {
|
|
|
|
+ this.index = indexs
|
|
|
|
+ }
|
|
|
|
+ if (res.product_vo.have_sn) {
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
+ this.$refs.sn_input.focus();
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ this.scanDialogVisible = false;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ },
|
|
|
|
+ // 扫码出库
|
|
|
|
+ scanCode() {
|
|
|
|
+ this.scanDialogVisible = true;
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
+ this.$refs.input.focus();
|
|
|
|
+ });
|
|
|
|
+ },
|
|
|
|
+ //扫序列号goodsExchangeAddForm.product_list[this.index].sn_code_list
|
|
|
|
+ toSnCode() {
|
|
|
|
+ API_GoodsExchange.getSnCode("out", this.sku, this.sn_code.replace(/\s+/g, '')).then((res) => {
|
|
|
|
+ this.sn_code = "";
|
|
|
|
+ // 假设res是一个对象,我们根据res的某个属性(如sn)来检查重复
|
|
|
|
+ let exists = this.goodsExchangeAddForm.product_list[
|
|
|
|
+ this.index
|
|
|
|
+ ].sn_code_list.find(
|
|
|
|
+ (item) => item.sn_code === res.sn_code && item.sku === res.sku
|
|
|
|
+ );
|
|
|
|
+ if (!exists) {
|
|
|
|
+ this.goodsExchangeAddForm.product_list[this.index].sn_code_list.push(
|
|
|
|
+ res
|
|
|
|
+ );
|
|
|
|
+ }
|
|
|
|
+ this.goodsExchangeAddForm.product_list[this.index].num = this.goodsExchangeAddForm.product_list[this.index].sn_code_list.length
|
|
|
|
+ const indexs = this.product_list.findIndex((el) => {
|
|
|
|
+ return (
|
|
|
|
+ el.goods_id === res.goods_id &&
|
|
|
|
+ el.product_id === res.product_id &&
|
|
|
|
+ el.product_vo.sku === res.sku
|
|
|
|
+ );
|
|
|
|
+ });
|
|
|
|
+ this.goodsExchangeAddForm.product_list[this.index].id = this.product_list[indexs].id
|
|
|
|
+ if (this.goodsExchangeAddForm.product_list[this.index].num == this.product_list[indexs].num) {
|
|
|
|
+ this.scanGoodsForm.bar_code = "";
|
|
|
|
+ this.scanDialogVisible = false;
|
|
|
|
+ } else {
|
|
|
|
+ this.scanGoodsForm.bar_code = "";
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
+ this.$refs.input.focus();
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ });
|
|
|
|
+ },
|
|
|
|
+ addSnCode(row, index) {
|
|
|
|
+ this.sku = row.product_vo.sku;
|
|
|
|
+ this.index = index;
|
|
|
|
+ this.snCodeVisible = true;
|
|
|
|
+ },
|
|
|
|
+
|
|
|
|
+
|
|
safeAccess(obj, key) {
|
|
safeAccess(obj, key) {
|
|
return obj ? obj[key] : '';
|
|
return obj ? obj[key] : '';
|
|
},
|
|
},
|
|
@@ -811,7 +848,7 @@ export default {
|
|
},
|
|
},
|
|
|
|
|
|
//获取地址
|
|
//获取地址
|
|
- handleChange(value) {},
|
|
|
|
|
|
+ handleChange(value) { },
|
|
/** 获取人员列表 */
|
|
/** 获取人员列表 */
|
|
GET_AdministratorList() {
|
|
GET_AdministratorList() {
|
|
API_Auth.getAdministratorList({
|
|
API_Auth.getAdministratorList({
|
|
@@ -823,7 +860,9 @@ export default {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
saveErpWarehouseOut() {
|
|
saveErpWarehouseOut() {
|
|
- API_order.outOrderSend(this.id).then((res) => {
|
|
|
|
|
|
+ const params = this.goodsExchangeAddForm
|
|
|
|
+ params.order_item_vos = params.product_list
|
|
|
|
+ API_order.outOrderSend(this.id, params).then((res) => {
|
|
this.$router.push({ name: "warehouseOut" });
|
|
this.$router.push({ name: "warehouseOut" });
|
|
});
|
|
});
|
|
return;
|
|
return;
|
|
@@ -888,9 +927,10 @@ export default {
|
|
API_order.getSendOrderDetail(this.id).then((res) => {
|
|
API_order.getSendOrderDetail(this.id).then((res) => {
|
|
res.product_list = res.order_item_vos;
|
|
res.product_list = res.order_item_vos;
|
|
this.product_list = res.order_item_vos;
|
|
this.product_list = res.order_item_vos;
|
|
- console.log(JSON.stringify(res.create_order_fail)=='{}');
|
|
|
|
-
|
|
|
|
|
|
+ this.selectedOptions =res.warehouse_vo.ware_pro_city_area.split(",")
|
|
|
|
+ this.receiverOptions = res.order_vo.province_city_area.split(",");
|
|
if (this.outType !== undefined || res.kdn_order_code !== undefined) {
|
|
if (this.outType !== undefined || res.kdn_order_code !== undefined) {
|
|
|
|
+ this.goodsExchangeAddForm.product_list = res.order_item_vos
|
|
this.disabledType = true;
|
|
this.disabledType = true;
|
|
this.deliveryForms.appointment_type = res.appointment_type;
|
|
this.deliveryForms.appointment_type = res.appointment_type;
|
|
this.deliveryForms.appointment_time = res.appointment_time;
|
|
this.deliveryForms.appointment_time = res.appointment_time;
|
|
@@ -913,15 +953,6 @@ export default {
|
|
JSON.stringify(res.order_fee) == "{}" ||
|
|
JSON.stringify(res.order_fee) == "{}" ||
|
|
JSON.stringify(res.sign_in) == "{}"
|
|
JSON.stringify(res.sign_in) == "{}"
|
|
) {
|
|
) {
|
|
- /* let arr =[]
|
|
|
|
- arr.push(res.create_order_fail)
|
|
|
|
- arr.push(res.create_order_success)
|
|
|
|
- arr.push(res.user_take_order)
|
|
|
|
- arr.push(res.user_arrives)
|
|
|
|
- arr.push(res.user_sending)
|
|
|
|
- arr.push(res.order_fee)
|
|
|
|
- arr.push(res.sign_in)
|
|
|
|
- console.log(arr);*/
|
|
|
|
this.deliveryForms.sign_in = res.sign_in;
|
|
this.deliveryForms.sign_in = res.sign_in;
|
|
this.deliveryForms.create_order_fail = res.create_order_fail;
|
|
this.deliveryForms.create_order_fail = res.create_order_fail;
|
|
this.deliveryForms.create_order_success = res.create_order_success;
|
|
this.deliveryForms.create_order_success = res.create_order_success;
|
|
@@ -930,20 +961,41 @@ export default {
|
|
this.deliveryForms.user_sending = res.user_sending;
|
|
this.deliveryForms.user_sending = res.user_sending;
|
|
this.deliveryForms.order_fee = res.order_fee;
|
|
this.deliveryForms.order_fee = res.order_fee;
|
|
}
|
|
}
|
|
|
|
+ } else {
|
|
|
|
+ const params = this.deliveryForms
|
|
|
|
+ params.sender.name = res.warehouse_vo.user_name;
|
|
|
|
+ params.sender.phone = res.warehouse_vo.phone;
|
|
|
|
+ //this.selectedOptions = res.warehouse_vo.ware_pro_city_area.split(",")
|
|
|
|
+ params.sender.province_name =
|
|
|
|
+ codeToText[this.selectedOptions[0]];
|
|
|
|
+ params.sender.city_name = codeToText[this.selectedOptions[1]];
|
|
|
|
+ params.sender.area_name = codeToText[this.selectedOptions[2]];
|
|
|
|
+ params.sender.address = res.warehouse_vo.warehouse_address;
|
|
|
|
+ params.receiver.name = res.order_vo.customer_name;
|
|
|
|
+ params.receiver.phone = res.order_vo.customer_phone;
|
|
|
|
+ //this.receiverOptions = res.order_vo.province_city_area.split(",");
|
|
|
|
+ params.receiver.province_name =
|
|
|
|
+ codeToText[this.receiverOptions[0]];
|
|
|
|
+ params.receiver.city_name =
|
|
|
|
+ codeToText[this.receiverOptions[1]];
|
|
|
|
+ params.receiver.area_name =
|
|
|
|
+ codeToText[this.receiverOptions[2]];
|
|
|
|
+ params.receiver.address = res.order_vo.address;
|
|
|
|
+
|
|
}
|
|
}
|
|
res.order_item_vos.map((el) => {
|
|
res.order_item_vos.map((el) => {
|
|
this.deliveryForms.total_weight = Number(
|
|
this.deliveryForms.total_weight = Number(
|
|
el.product_vo.weight * el.num
|
|
el.product_vo.weight * el.num
|
|
);
|
|
);
|
|
});
|
|
});
|
|
|
|
+ this.deliveryForms.warehouse_id = res.warehouse_id
|
|
this.deliveryForms.declared_value = Number(res.order_vo.real_price);
|
|
this.deliveryForms.declared_value = Number(res.order_vo.real_price);
|
|
- if (res.send_address && res.receiver_address) {
|
|
|
|
|
|
+ /* if (res.send_address && res.receiver_address) {
|
|
this.selectedOptions = res.send_address.split(",");
|
|
this.selectedOptions = res.send_address.split(",");
|
|
this.receiverOptions = res.receive_address.split(",");
|
|
this.receiverOptions = res.receive_address.split(",");
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ }
|
|
console.log(this.deliveryForms);
|
|
console.log(this.deliveryForms);
|
|
- /* this.deliveryForms.sender=res.sender_province_name */
|
|
|
|
|
|
+ this.deliveryForms.sender=res.sender_province_name */
|
|
});
|
|
});
|
|
},
|
|
},
|
|
/** 出库前预览 */
|
|
/** 出库前预览 */
|
|
@@ -1033,17 +1085,22 @@ export default {
|
|
z-index: 999;
|
|
z-index: 999;
|
|
margin-top: 30px;
|
|
margin-top: 30px;
|
|
}
|
|
}
|
|
|
|
+
|
|
/deep/ .el-form-item__content {
|
|
/deep/ .el-form-item__content {
|
|
display: flex;
|
|
display: flex;
|
|
align-items: center;
|
|
align-items: center;
|
|
|
|
+
|
|
.el-input {
|
|
.el-input {
|
|
width: 300px;
|
|
width: 300px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
/* 覆盖步骤条的数字为圆点 */
|
|
/* 覆盖步骤条的数字为圆点 */
|
|
/deep/.el-steps__icon {
|
|
/deep/.el-steps__icon {
|
|
- background-color: #409eff; /* 蓝色背景 */
|
|
|
|
- color: #409eff; /* 蓝色文字,与背景同色,使数字不可见 */
|
|
|
|
|
|
+ background-color: #409eff;
|
|
|
|
+ /* 蓝色背景 */
|
|
|
|
+ color: #409eff;
|
|
|
|
+ /* 蓝色文字,与背景同色,使数字不可见 */
|
|
}
|
|
}
|
|
|
|
|
|
/* 调整圆点的大小 */
|
|
/* 调整圆点的大小 */
|
|
@@ -1051,11 +1108,11 @@ export default {
|
|
width: 10px;
|
|
width: 10px;
|
|
height: 10px;
|
|
height: 10px;
|
|
border-radius: 50%;
|
|
border-radius: 50%;
|
|
- background-color: white; /* 白色圆点 */
|
|
|
|
|
|
+ background-color: white;
|
|
|
|
+ /* 白色圆点 */
|
|
transform: translate(-50%, -50%);
|
|
transform: translate(-50%, -50%);
|
|
position: absolute;
|
|
position: absolute;
|
|
top: 50%;
|
|
top: 50%;
|
|
left: 50%;
|
|
left: 50%;
|
|
}
|
|
}
|
|
</style>
|
|
</style>
|
|
-
|
|
|