|
|
@@ -76,7 +76,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="退货仓库" prop="storageStockId">
|
|
|
+ <el-form-item label="退货仓库" prop="storageStockId" :rules="joinCode == 'NO' ? [] : [{ required: true, message: '请选择退货仓库', trigger: 'change' }]">
|
|
|
<el-select v-model="formData.storageStockId" placeholder="请选择退货仓库" style="width: 100%;">
|
|
|
<el-option :label="item.storageName" :value="item.storageId" v-for="(item, index) in storageList"
|
|
|
:key="index"></el-option>
|
|
|
@@ -119,7 +119,7 @@
|
|
|
|
|
|
<el-tabs v-model="formTabs">
|
|
|
<el-tab-pane label="商品信息" name="a"></el-tab-pane>
|
|
|
- <el-tab-pane label="条码信息" name="b" v-if="joinCode"></el-tab-pane>
|
|
|
+ <el-tab-pane label="条码信息" name="b" v-if="joinCode == 'CODE'"></el-tab-pane>
|
|
|
<el-tab-pane label="旧机信息" name="c" v-if="formData.isReturnOld === 'YES'"></el-tab-pane>
|
|
|
</el-tabs>
|
|
|
|
|
|
@@ -197,7 +197,6 @@
|
|
|
</div>
|
|
|
<div v-show="formTabs == 'b'">
|
|
|
<el-table
|
|
|
- class="specTable"
|
|
|
:data="codeList"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
@@ -229,7 +228,6 @@
|
|
|
</div>
|
|
|
<div v-show="formTabs == 'c'">
|
|
|
<el-table
|
|
|
- class="specTable"
|
|
|
:data="oldList"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
@@ -313,13 +311,12 @@
|
|
|
|
|
|
<el-tabs v-model="detailTabs">
|
|
|
<el-tab-pane label="商品信息" name="a"></el-tab-pane>
|
|
|
- <el-tab-pane label="条码信息" name="b" v-if="joinCode"></el-tab-pane>
|
|
|
+ <el-tab-pane label="条码信息" name="b" v-if="joinCode == 'CODE'"></el-tab-pane>
|
|
|
<el-tab-pane label="旧机信息" name="c" v-if="detailData.isOld == 'YES'"></el-tab-pane>
|
|
|
</el-tabs>
|
|
|
|
|
|
<div v-show="detailTabs == 'a'">
|
|
|
<el-table
|
|
|
- class="specTable"
|
|
|
:data="detailData.orderOfflineRefundItems"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
@@ -366,7 +363,6 @@
|
|
|
</div>
|
|
|
<div v-show="detailTabs == 'b'">
|
|
|
<el-table
|
|
|
- class="specTable"
|
|
|
:data="detailData.orderOfflineItemCodes"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
@@ -392,7 +388,6 @@
|
|
|
</div>
|
|
|
<div v-show="detailTabs == 'c'">
|
|
|
<el-table
|
|
|
- class="specTable"
|
|
|
:data="detailData.orderOldProductDTOList"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
@@ -472,24 +467,28 @@
|
|
|
<el-table-column align="center" prop="orderId" label="销售订单号" min-width="180"></el-table-column>
|
|
|
<el-table-column align="center" prop="status" label="状态" min-width="80">
|
|
|
<template slot-scope="scope">
|
|
|
- {{{SEND: '已发货', REFUND: '已退货'}[scope.row.status]}}
|
|
|
+ {{ {SEND: '已发货', REFUND: '已退货', PART_REFUND: '部分退货', REFUND_PRICE: '仅退款'}[scope.row.status] }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="brandName" label="品牌" min-width="80"></el-table-column>
|
|
|
- <el-table-column align="center" prop="mainName" label="大类" min-width="80"></el-table-column>
|
|
|
- <el-table-column align="center" prop="smallName" label="小类" min-width="80"></el-table-column>
|
|
|
- <el-table-column align="center" prop="goodsName" label="商品名称" min-width="200"></el-table-column>
|
|
|
- <el-table-column align="center" prop="goodsSpecValue" label="规格型号" min-width="200"></el-table-column>
|
|
|
- <el-table-column align="center" prop="sendNum" label="数量" min-width="80"></el-table-column>
|
|
|
- <el-table-column align="center" prop="saleType" label="发货方式" min-width="80">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{{YES: '自提', NO: '快递物流'}[scope.row.pickType]}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column align="center" prop="pickName" label="提货人" min-width="80"></el-table-column>
|
|
|
- <el-table-column align="center" prop="pickPhone" label="提货人电话" min-width="120"></el-table-column>
|
|
|
- <el-table-column align="center" prop="companyName" label="快递公司" min-width="120"></el-table-column>
|
|
|
- <el-table-column align="center" prop="deliverTime" label="发货时间" min-width="160"></el-table-column>
|
|
|
+ <el-table-column prop="sendNum" align="center" label="发货数量"></el-table-column>
|
|
|
+ <el-table-column prop="refundNum" align="center" label="退货数量"></el-table-column>
|
|
|
+ <el-table-column prop="num" align="center" label="订单数量"></el-table-column>
|
|
|
+ <el-table-column prop="sendInsideCodeQty" align="center" label="内机数量"></el-table-column>
|
|
|
+ <el-table-column prop="sendOutCodeQty" align="center" label="外机数量"></el-table-column>
|
|
|
+ <el-table-column prop="sendPartsCodeQty" align="center" label="配件数量"></el-table-column>
|
|
|
+ <el-table-column prop="storageStockName" align="center" label="发货仓库" width="100"></el-table-column>
|
|
|
+ <el-table-column prop="pickType" align="center" label="发货方式">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.pickType == 'YES' ? '自提' : '快递物流'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="logisticsNo" align="center" label="快递单号" width="100"></el-table-column>
|
|
|
+ <el-table-column prop="companyName" align="center" label="物流公司" width="100"></el-table-column>
|
|
|
+ <el-table-column prop="pickName" align="center" label="提货人"></el-table-column>
|
|
|
+ <el-table-column prop="pickPhone" align="center" label="提货人电话" width="110"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="deliverTime" label="发货时间" min-width="160"></el-table-column>
|
|
|
+ <el-table-column prop="createBy" align="center" label="操作人" width="140"></el-table-column>
|
|
|
+ <el-table-column prop="createTime" align="center" label="操作时间" width="160"></el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<div class="pagination clearfix">
|
|
|
@@ -605,7 +604,7 @@ export default {
|
|
|
},
|
|
|
formRules: {
|
|
|
isReturnOld: [{ required: true, message: '请选择是否退旧机', trigger: 'change' }],
|
|
|
- storageStockId: [{ required: true, message: '请选择退货仓库', trigger: 'change' }],
|
|
|
+ // storageStockId: [{ required: true, message: '请选择退货仓库', trigger: 'change' }],
|
|
|
},
|
|
|
formType: 'add',
|
|
|
formVisible: false,
|
|
|
@@ -635,7 +634,7 @@ export default {
|
|
|
orderList: [],
|
|
|
waitChooseOrder: [],
|
|
|
|
|
|
- joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
|
|
|
+ joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -689,7 +688,7 @@ export default {
|
|
|
this.formData.receAddress = oData.receAddress;
|
|
|
this.oldList = oData.orderOldProductDTOList;
|
|
|
})
|
|
|
- getOrderCodeList({orderId: dData.orderId}).then(res => {
|
|
|
+ getOrderCodeList({deliveryId: dData.deliveryId}).then(res => {
|
|
|
this.codeList = res.data;
|
|
|
})
|
|
|
})
|
|
|
@@ -737,7 +736,7 @@ export default {
|
|
|
return this.operationBtn({
|
|
|
edit: {
|
|
|
conditions: ({ row, index, column }) => {
|
|
|
- return row.examineStatus != 'OK'
|
|
|
+ return row.examineStatus != 'OK' && row.examineStatus != 'FAIL'
|
|
|
},
|
|
|
btnType: 'text',
|
|
|
click: ({ row, index, column }) => {
|
|
|
@@ -799,6 +798,7 @@ export default {
|
|
|
this.formData.receUserName = data.orderInfo.receUserName;
|
|
|
this.formData.recePhone = data.orderInfo.recePhone;
|
|
|
this.formData.receAddress = data.orderInfo.receAddress;
|
|
|
+ this.formData.deliverStorageName = data.storageName;
|
|
|
|
|
|
this.formData.remark = data.remark;
|
|
|
this.formData.fileUrl = data.fileUrls;
|
|
|
@@ -838,7 +838,7 @@ export default {
|
|
|
formConfirm(cancel) {
|
|
|
this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
|
|
|
if (valid) {
|
|
|
- if(!this.formData.storageStockId) return this.$errorMsg('请选择退货仓库');
|
|
|
+ // if(!this.formData.storageStockId) return this.$errorMsg('请选择退货仓库');
|
|
|
|
|
|
salesReturnOrderSave({
|
|
|
id: this.formData.id || '',
|
|
|
@@ -854,11 +854,11 @@ export default {
|
|
|
refundAmount: item.waitRefundPrice,
|
|
|
}
|
|
|
}),
|
|
|
- orderOfflineItemCodes: this.joinCode ? this.codeList : [],
|
|
|
+ orderOfflineItemCodes: this.joinCode == 'CODE' ? this.codeList : [],
|
|
|
isOld: this.formData.isReturnOld,
|
|
|
ids: this.oldList.map(o => o.id),
|
|
|
- storageStockId: this.formData.storageStockId,
|
|
|
- storageStockName: this.storageList.find(o => o.storageId == this.formData.storageStockId).storageName,
|
|
|
+ storageStockId: this.formData.storageStockId || '',
|
|
|
+ storageStockName: this.formData.storageStockId ? this.storageList.find(o => o.storageId == this.formData.storageStockId).storageName : '',
|
|
|
}).then(res => {
|
|
|
this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
|
|
|
cancel('list')
|
|
|
@@ -1020,7 +1020,7 @@ export default {
|
|
|
// this.goodsList = data.orderDetails;
|
|
|
this.oldList = data.orderOldProductDTOList;
|
|
|
|
|
|
- getOrderCodeList({orderId: data.orderId}).then(res => {
|
|
|
+ getOrderCodeList({deliveryId: this.waitChooseOrder[0].deliveryId}).then(res => {
|
|
|
this.codeList = res.data;
|
|
|
})
|
|
|
|
linwenxin