|
@@ -2,49 +2,52 @@
|
|
|
<div class="bg-in-stock">
|
|
|
<el-form ref="orderReturnAddForm" :model="orderReturnAddForm" label-width="120px" inline style="width: 100%;">
|
|
|
<h3>退货单</h3>
|
|
|
- <el-form-item label="退货时间" prop="return_time">
|
|
|
- <el-date-picker v-model="orderReturnAddForm.return_time" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期时间">
|
|
|
+ <el-form-item label="退货时间:" prop="return_time">
|
|
|
+ <el-date-picker v-if="type !== 'detail'" v-model="orderReturnAddForm.return_time" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"
|
|
|
+ placeholder="选择日期时间">
|
|
|
</el-date-picker>
|
|
|
+ <span v-else>{{ orderReturnAddForm.return_time }}</span>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="订单" style="white-space: nowrap;">
|
|
|
- <el-button v-if="type !== 'detail'" class="button" size="mini" type="primary" @click="handleSelectOrderSn"
|
|
|
- :disabled="type === 'audit'">选择</el-button>
|
|
|
+ <el-form-item label="订单:" style="white-space: nowrap;">
|
|
|
+ <!-- <el-button v-if="type !== 'detail' || orderReturnAddForm.sn==''" class="button" size="mini" type="primary" @click="handleSelectOrderSn"
|
|
|
+ :disabled="type === 'audit'">选择</el-button> -->
|
|
|
<span v-if="orderReturnAddForm.sn">{{ orderReturnAddForm.sn }}</span>
|
|
|
</el-form-item>
|
|
|
<el-form-item></el-form-item>
|
|
|
- <el-form-item label="退货说明" prop="return_remark" style="width: 900px">
|
|
|
- <el-input style="width:525px" v-model="orderReturnAddForm.return_remark" type="textarea"
|
|
|
+ <el-form-item label="退货说明:" prop="return_remark" style="width: 900px">
|
|
|
+ <el-input style="width:525px" v-model="orderReturnAddForm.return_remark" v-if="type !== 'detail'" type="textarea"
|
|
|
:disabled="type === 'detail' || type === 'audit'" :autosize="{ minRows: 3, maxRows: 4 }"
|
|
|
placeholder="请输入退货说明"></el-input>
|
|
|
+ <span v-else>{{ orderReturnAddForm.return_remark }}</span>
|
|
|
</el-form-item>
|
|
|
<div class="mx">
|
|
|
<h3>退货明细</h3>
|
|
|
</div>
|
|
|
- <div >
|
|
|
+ <div>
|
|
|
<el-form-item style="width: 100%;">
|
|
|
<el-table :data="orderReturnAddForm.item_list" border :cell-style="{ textAlign: 'center' }"
|
|
|
:header-cell-style="{ textAlign: 'center' }" style="width: 100%; margin-top: 20px;">
|
|
|
- <el-table-column label="商品编号" >
|
|
|
+ <el-table-column label="商品编号">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.goods_vo.sn }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="商品名称" >
|
|
|
+ <el-table-column label="商品名称">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.goods_vo.name }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="product_vo.spec_name" label="规格型号" >
|
|
|
- <!-- <template slot-scope="scope">
|
|
|
+ <el-table-column prop="product_vo.spec_name" label="规格型号">
|
|
|
+ <!-- <template slot-scope="scope">
|
|
|
{{ scope.row.product_vo.spec_name.join('/') }}
|
|
|
</template> -->
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="单位" >
|
|
|
+ <el-table-column label="单位">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.product_vo.unit }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="单价" >
|
|
|
+ <el-table-column label="单价">
|
|
|
<template slot-scope="scope">
|
|
|
¥{{ scope.row.product_vo.price }}
|
|
|
</template>
|
|
@@ -52,28 +55,28 @@
|
|
|
<el-table-column label="购买数量">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="!id">{{ scope.row.num }}</span>
|
|
|
- <span v-else>{{scope.row.order_num}}</span>
|
|
|
+ <span v-else>{{ scope.row.order_num }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="退货数量" >
|
|
|
+ <el-table-column label="退货数量">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input maxlength="12" v-model="scope.row.return_num"
|
|
|
- @input="passInput(scope.row)"
|
|
|
+ <el-input maxlength="12" v-model="scope.row.return_num" @input="passInput(scope.row)"
|
|
|
:disabled="type === 'detail' || type === 'audit'" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="操作" >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button size="mini" :disabled="type === 'detail' || type === 'audit'" type="danger" @click="orderReturnAddForm.item_list.splice(scope.$index, 1)">删除
|
|
|
- </el-button>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column label="操作">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button size="mini" :disabled="type === 'detail' || type === 'audit'" type="danger"
|
|
|
+ @click="orderReturnAddForm.item_list.splice(scope.$index, 1)">删除
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
<div class="footer">
|
|
|
- <!-- <el-button v-if="type === 'audit'" type="primary" @click="auditorderReturnForm('AuditPass')">审核通过
|
|
|
+ <!-- <el-button v-if="type === 'audit'" type="primary" @click="auditorderReturnForm('AuditPass')">审核通过
|
|
|
</el-button>
|
|
|
<el-button v-if="type === 'audit'" type="danger" @click="auditorderReturnForm('AuditReject')">审核驳回
|
|
|
</el-button> -->
|
|
@@ -106,13 +109,19 @@ export default {
|
|
|
/** 供应商退货表单*/
|
|
|
orderReturnAddForm: {
|
|
|
order_id: '',
|
|
|
- item_list: []
|
|
|
+ item_list: [],
|
|
|
+ return_time:'',
|
|
|
},
|
|
|
type: ''
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
- ...mapGetters(['user'])
|
|
|
+ ...mapGetters(['user']),
|
|
|
+ timeDefault() {
|
|
|
+ var date = new Date();
|
|
|
+ var s1 = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + (date.getDate()) + " " + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
|
|
|
+ return s1;
|
|
|
+ },
|
|
|
},
|
|
|
mounted() {
|
|
|
this.GET_DeptList()
|
|
@@ -125,35 +134,46 @@ export default {
|
|
|
if (this.$route.name === 'orderReturnAudit') {
|
|
|
this.type = 'audit'
|
|
|
} else if (this.$route.name === 'orderReturnAdd') {
|
|
|
+ console.log(this.$route);
|
|
|
this.orderReturnAddForm = {
|
|
|
item_list: []
|
|
|
}
|
|
|
- /* this.orderReturnAddForm.handle_by_id = this.user.uid */
|
|
|
+ /* this.orderReturnAddForm.handle_by_id = this.user.uid */
|
|
|
/* this.orderReturnAddForm.dept_id = this.user.dept_id */
|
|
|
this.GET_WarehouseList({ dept_id: this.user.dept_id })
|
|
|
- /* this.$set(this.orderReturnAddForm, 'return_time', new Date().getTime()) */
|
|
|
+ this.GET_ReturnDetails(this.$route.params.id)
|
|
|
+ this.id = this.$route.params.id
|
|
|
+ this.orderReturnAddForm.return_time=this.timeDefault
|
|
|
+ /* this.$set(this.orderReturnAddForm, 'return_time', new Date().getTime()) */
|
|
|
this.type = 'add'
|
|
|
} else if (this.$route.name === 'orderReturnDetail') {
|
|
|
this.type = 'detail'
|
|
|
- }
|
|
|
- if (this.$route.params.id) {
|
|
|
this.id = this.$route.params.id
|
|
|
this.orderReturnAddForm.id = this.$route.params.id
|
|
|
this.GET_orderReturnDetail()
|
|
|
}
|
|
|
+ if (this.$route.params.id) {
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ GET_ReturnDetails(id) {
|
|
|
+ API_orderReturn.getWarehouseOutProduct(id).then(response => {
|
|
|
+ this.orderReturnAddForm.sn = response.sn
|
|
|
+ this.orderReturnAddForm.item_list = response.item_list
|
|
|
+ })
|
|
|
+ },
|
|
|
/* 校验输入数量 */
|
|
|
- passInput(value){
|
|
|
- if(value.num<value.return_num){
|
|
|
+ passInput(value) {
|
|
|
+ if (value.num < value.return_num) {
|
|
|
this.$message({
|
|
|
- message: "请重新输入退货数量",
|
|
|
- type: "error",
|
|
|
- showClose: true,
|
|
|
- });
|
|
|
- return;
|
|
|
+ message: "请重新输入退货数量",
|
|
|
+ type: "error",
|
|
|
+ showClose: true,
|
|
|
+ });
|
|
|
+ return;
|
|
|
}
|
|
|
},
|
|
|
/** 获取人员列表 */
|
|
@@ -174,48 +194,48 @@ export default {
|
|
|
/* orderApiParams: { ship_flag: true }, */
|
|
|
limit: 1
|
|
|
})
|
|
|
- this.orderReturnAddForm.order_id=orders[0].id
|
|
|
+ this.orderReturnAddForm.order_id = orders[0].id
|
|
|
if (orders) {
|
|
|
API_orderReturn.getWarehouseOutProduct(orders[0].id).then(response => {
|
|
|
/* const product_list =*/
|
|
|
- /* response.item_list.map(el => {
|
|
|
- el.allow_sn=el.goods_vo.allow_sn
|
|
|
- el.bar_code=el.goods_vo.bar_code
|
|
|
- el.brand_id=el.goods_vo.brand_id
|
|
|
- el.brand_name=el.goods_vo.brand_name
|
|
|
- el.category_id=el.goods_vo.category_id
|
|
|
- el.category_ids=el.goods_vo.category_ids
|
|
|
- el.category_name=el.goods_vo.category_name
|
|
|
- el.cost_price=el.goods_vo.cost_price
|
|
|
- el.create_time=el.goods_vo.create_time
|
|
|
- el.creator=el.goods_vo.creator
|
|
|
- el.description=el.goods_vo.description
|
|
|
- el.en_name=el.goods_vo.en_name
|
|
|
- el.freight_template_id=el.goods_vo.freight_template_id
|
|
|
- el.goods_style=el.goods_vo.goods_style
|
|
|
- el.goods_unit=el.goods_vo.goods_unit
|
|
|
- el.goods_unit=el.goods_vo.goods_unit
|
|
|
- el.have_spec=el.goods_vo.have_spec
|
|
|
- el.hire_or_sail=el.goods_vo.hire_or_sail
|
|
|
- el.id=el.goods_vo.id
|
|
|
- el.image=el.goods_vo.image
|
|
|
- el.image_list=el.goods_vo.image_list
|
|
|
- el.label_names=el.goods_vo.label_names
|
|
|
- el.market_enable=el.goods_vo.market_enable
|
|
|
- el.mkt_price=el.goods_vo.mkt_price
|
|
|
- el.name=el.goods_vo.name
|
|
|
- el.params_list=el.goods_vo.params_list
|
|
|
- el.price=el.goods_vo.price
|
|
|
- el.sn=el.goods_vo.sn
|
|
|
- el.sn_code=el.goods_vo.sn_code
|
|
|
- el.sort=el.goods_vo.sort
|
|
|
- el.update_time=el.goods_vo.update_time
|
|
|
- el.updater=el.goods_vo.updater
|
|
|
- el.usable_stock=el.goods_vo.usable_stock
|
|
|
- el.video=el.goods_vo.video
|
|
|
- return el
|
|
|
- })*/
|
|
|
- this.orderReturnAddForm.sn=response.sn
|
|
|
+ /* response.item_list.map(el => {
|
|
|
+ el.allow_sn=el.goods_vo.allow_sn
|
|
|
+ el.bar_code=el.goods_vo.bar_code
|
|
|
+ el.brand_id=el.goods_vo.brand_id
|
|
|
+ el.brand_name=el.goods_vo.brand_name
|
|
|
+ el.category_id=el.goods_vo.category_id
|
|
|
+ el.category_ids=el.goods_vo.category_ids
|
|
|
+ el.category_name=el.goods_vo.category_name
|
|
|
+ el.cost_price=el.goods_vo.cost_price
|
|
|
+ el.create_time=el.goods_vo.create_time
|
|
|
+ el.creator=el.goods_vo.creator
|
|
|
+ el.description=el.goods_vo.description
|
|
|
+ el.en_name=el.goods_vo.en_name
|
|
|
+ el.freight_template_id=el.goods_vo.freight_template_id
|
|
|
+ el.goods_style=el.goods_vo.goods_style
|
|
|
+ el.goods_unit=el.goods_vo.goods_unit
|
|
|
+ el.goods_unit=el.goods_vo.goods_unit
|
|
|
+ el.have_spec=el.goods_vo.have_spec
|
|
|
+ el.hire_or_sail=el.goods_vo.hire_or_sail
|
|
|
+ el.id=el.goods_vo.id
|
|
|
+ el.image=el.goods_vo.image
|
|
|
+ el.image_list=el.goods_vo.image_list
|
|
|
+ el.label_names=el.goods_vo.label_names
|
|
|
+ el.market_enable=el.goods_vo.market_enable
|
|
|
+ el.mkt_price=el.goods_vo.mkt_price
|
|
|
+ el.name=el.goods_vo.name
|
|
|
+ el.params_list=el.goods_vo.params_list
|
|
|
+ el.price=el.goods_vo.price
|
|
|
+ el.sn=el.goods_vo.sn
|
|
|
+ el.sn_code=el.goods_vo.sn_code
|
|
|
+ el.sort=el.goods_vo.sort
|
|
|
+ el.update_time=el.goods_vo.update_time
|
|
|
+ el.updater=el.goods_vo.updater
|
|
|
+ el.usable_stock=el.goods_vo.usable_stock
|
|
|
+ el.video=el.goods_vo.video
|
|
|
+ return el
|
|
|
+ })*/
|
|
|
+ this.orderReturnAddForm.sn = response.sn
|
|
|
this.orderReturnAddForm.item_list = response.item_list
|
|
|
|
|
|
})
|
|
@@ -257,13 +277,14 @@ export default {
|
|
|
submitorderReturnAddForm() {
|
|
|
const { id } = this.orderReturnAddForm
|
|
|
const params = this.MixinClone(this.orderReturnAddForm)
|
|
|
- const mapList={}
|
|
|
- params.order_sn=params.sn
|
|
|
- params.item_list=params.item_list.map(el=>{
|
|
|
- mapList.order_item_id= el.id
|
|
|
- mapList.order_num=el.num
|
|
|
- mapList.product_id=el.product_id
|
|
|
- mapList.return_num=el.return_num
|
|
|
+ const mapList = {}
|
|
|
+ params.order_id=this.id
|
|
|
+ params.order_sn = params.sn
|
|
|
+ params.item_list = params.item_list.map(el => {
|
|
|
+ mapList.order_item_id = el.id
|
|
|
+ mapList.order_num = el.num
|
|
|
+ mapList.product_id = el.product_id
|
|
|
+ mapList.return_num = el.return_num
|
|
|
return mapList
|
|
|
})
|
|
|
if (id) {
|
|
@@ -403,7 +424,8 @@ export default {
|
|
|
|
|
|
/deep/ .el-form-item {
|
|
|
width: 100%;
|
|
|
- .el-form-item__content{
|
|
|
+
|
|
|
+ .el-form-item__content {
|
|
|
width: 80%;
|
|
|
}
|
|
|
}
|