|
|
@@ -1,6 +1,8 @@
|
|
|
<template>
|
|
|
<div class="sellReturn pagePadding">
|
|
|
- <div v-if="powers.some((i) => i == '001')">
|
|
|
+ <div
|
|
|
+ v-if=" powers.some((i) => i == '001')"
|
|
|
+ >
|
|
|
<ex-table
|
|
|
v-loading="loading"
|
|
|
:table="table"
|
|
|
@@ -26,62 +28,63 @@
|
|
|
<div style="width: 100%">
|
|
|
<el-row style="padding: 0 0 0 80px">
|
|
|
<el-col :span="24">
|
|
|
- <el-col :span="4" style="margin-right: 10px">
|
|
|
- <el-input
|
|
|
- v-model="parmValue.returnCode"
|
|
|
- placeholder="售后退货单号"
|
|
|
- size="mini"
|
|
|
- clearable
|
|
|
- @change="
|
|
|
- pageInfo.curr = 1;
|
|
|
- parmValue.page = 1;
|
|
|
- searchList();
|
|
|
- "
|
|
|
- />
|
|
|
- </el-col>
|
|
|
+ <el-col :span="6" style="margin-right:10px">
|
|
|
+ <el-input placeholder="关键字" size="mini" v-model="queryValue" @blur="pageInfo.curr=1;parmValue.page=1;searchList()">
|
|
|
+ <template #prepend>
|
|
|
+ <el-select style="width:120px" v-model="queryKey" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
|
|
|
+ <el-option value="returnCode" label="退货单编码" />
|
|
|
+ <el-option value="orderCode" label="订单编码" />
|
|
|
+ <el-option value="outChildCode" label="发货工单编码" />
|
|
|
+ <el-option value="return_wsm_code" label="退货仓库编码" />
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-input>
|
|
|
+ </el-col>
|
|
|
|
|
|
- <el-col :span="4" style="margin-right: 10px">
|
|
|
- <el-select
|
|
|
- style="width: 100%"
|
|
|
- placeholder="仓库类型"
|
|
|
- size="mini"
|
|
|
- clearable
|
|
|
- v-model="parmValue.type"
|
|
|
- @change="
|
|
|
- pageInfo.curr = 1;
|
|
|
- parmValue.page = 1;
|
|
|
- searchList();
|
|
|
- "
|
|
|
- >
|
|
|
- <el-option label="销售仓" value="1" />
|
|
|
- <el-option label="次品仓" value="2" />
|
|
|
- </el-select>
|
|
|
- </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <search-work-company
|
|
|
+ :value="companyNo"
|
|
|
+ :placeholder="'业务公司'"
|
|
|
+ :size="searchSize"
|
|
|
+ @searchChange="companyNosearchChange"
|
|
|
+ />
|
|
|
+ </el-col>
|
|
|
|
|
|
- <el-col :span="4" style="margin-left: 10px">
|
|
|
- <el-select
|
|
|
- :size="searchSize"
|
|
|
- v-model="parmValue.order_type"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="商品类型"
|
|
|
- style="width: 100%"
|
|
|
- @change="
|
|
|
- pageInfo.curr = 1;
|
|
|
- parmValue.page = 1;
|
|
|
- searchList();
|
|
|
- "
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in xs_order_type_options"
|
|
|
- :key="'orderstatus' + item.id"
|
|
|
- :label="item.label"
|
|
|
- :value="item.id"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-col>
|
|
|
+ <el-col :span="4" style="margin:0px 10px">
|
|
|
+ <el-select style="width:100%" placeholder="仓库类型" size="mini" clearable v-model="parmValue.type" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
|
|
|
+ <el-option label="销售仓" value="1" />
|
|
|
+ <el-option label="次品仓" value="2" />
|
|
|
+ </el-select>
|
|
|
+ </el-col>
|
|
|
|
|
|
- <el-col :span="4" class="fr" style="width: 66px; padding: 0 0 0 10px">
|
|
|
+ <el-col :span="4" style="width: 150px;margin-left:10px">
|
|
|
+ <el-select
|
|
|
+ :size="searchSize"
|
|
|
+ v-model="parmValue.order_type"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ placeholder="商品类型"
|
|
|
+ style="width: 100%"
|
|
|
+ @change="
|
|
|
+ pageInfo.curr = 1;
|
|
|
+ parmValue.page = 1;
|
|
|
+ searchList();
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in xs_order_type_options"
|
|
|
+ :key="'orderstatus' + item.id"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.id"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col
|
|
|
+ :span="4"
|
|
|
+ class="fr"
|
|
|
+ style="width: 66px; padding: 0 0 0 10px"
|
|
|
+ >
|
|
|
<el-button
|
|
|
type="warning"
|
|
|
class="fr"
|
|
|
@@ -116,37 +119,87 @@
|
|
|
></el-tag>
|
|
|
</template>
|
|
|
|
|
|
- <template #returnWsm="{ scope }">
|
|
|
+ <template #returnWsm="{scope}">
|
|
|
+ <el-popover placement="top" width="360" trigger="hover">
|
|
|
+ <i class="el-icon-warning-outline" slot="reference"></i>
|
|
|
+ <ul>
|
|
|
+ <li><h3>退货仓库</h3></li>
|
|
|
+ <li>
|
|
|
+ <span>编号:</span
|
|
|
+ ><span>{{ scope.row.return_wsm_code }}</span>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <span>名称:</span
|
|
|
+ ><span>{{ scope.row.return_wsm_name}}</span>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <span>负责人:</span
|
|
|
+ ><span>{{ scope.row.return_contactor_name}}</span>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <span>供应商编码:</span
|
|
|
+ ><span>{{ scope.row.return_supplierNo }}</span>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <span>供应商名称:</span
|
|
|
+ ><span>{{ scope.row.return_supplierName }}</span>
|
|
|
+ </li>
|
|
|
+ </ul>
|
|
|
+ </el-popover>
|
|
|
+ <span>{{ scope.row.return_wsm_name }}</span>
|
|
|
+ </template>
|
|
|
+
|
|
|
+ <template #order_type="{scope}">
|
|
|
+ <el-tag size="mini">{{(xs_order_type_options.find(({id}) => id === scope.row.order_type) || {})?.label || '--'}}</el-tag>
|
|
|
+ </template>
|
|
|
+
|
|
|
+ <template #stock_type="{scope}">
|
|
|
+ <el-tag size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
|
|
|
+ </template>
|
|
|
+
|
|
|
+ <template #sendWsm="{scope}">
|
|
|
<el-popover placement="top" width="360" trigger="hover">
|
|
|
<i class="el-icon-warning-outline" slot="reference"></i>
|
|
|
- <ul>
|
|
|
- <li><h3>退货仓库</h3></li>
|
|
|
- <li>
|
|
|
- <span>编号:</span><span>{{ scope.row.return_wsm_code }}</span>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <span>名称:</span><span>{{ scope.row.return_wsm_name }}</span>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <span>负责人:</span><span>{{ scope.row.return_contactor_name }}</span>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <span>供应商编码:</span><span>{{ scope.row.return_supplierNo }}</span>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <span>供应商名称:</span><span>{{ scope.row.return_supplierName }}</span>
|
|
|
- </li>
|
|
|
- </ul>
|
|
|
- </el-popover>
|
|
|
- <span>{{ scope.row.return_wsm_name }}</span>
|
|
|
+ <ul>
|
|
|
+ <li><h3>退货仓库</h3></li>
|
|
|
+ <li>
|
|
|
+ <span>编号:</span
|
|
|
+ ><span>{{ scope.row.send_wsm_code }}</span>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <span>名称:</span
|
|
|
+ ><span>{{ scope.row.send_wsm_name}}</span>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <span>负责人:</span
|
|
|
+ ><span>{{ scope.row.send_contactor_name}}</span>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <span>供应商编码:</span
|
|
|
+ ><span>{{ scope.row.send_supplierNo }}</span>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <span>供应商名称:</span
|
|
|
+ ><span>{{ scope.row.send_supplierName }}</span>
|
|
|
+ </li>
|
|
|
+ </ul>
|
|
|
+ </el-popover>
|
|
|
+ <span>{{ scope.row.send_wsm_name }}</span>
|
|
|
</template>
|
|
|
|
|
|
+ <template #type="{scope}">
|
|
|
+ <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</el-tag>
|
|
|
+ </template>
|
|
|
+
|
|
|
<template #order_type="{ scope }">
|
|
|
<el-tag
|
|
|
- size="mini"
|
|
|
+ :size="tablebtnSize"
|
|
|
v-text="
|
|
|
- (xs_order_type_options.find((id) => id === scope.row.order_type) || {})
|
|
|
- .label || '--'
|
|
|
+ (
|
|
|
+ xs_order_type_options.find(
|
|
|
+ (item) => item.id == scope.row.order_type
|
|
|
+ ) || {}
|
|
|
+ ).label || '--'
|
|
|
"
|
|
|
></el-tag>
|
|
|
</template>
|
|
|
@@ -156,47 +209,13 @@
|
|
|
:size="tablebtnSize"
|
|
|
v-text="
|
|
|
(
|
|
|
- xs_order_source_options.find(
|
|
|
+ xs_order_source_options.find(
|
|
|
(item) => item.id == scope.row.order_source
|
|
|
) || {}
|
|
|
).label || '--'
|
|
|
"
|
|
|
></el-tag>
|
|
|
</template>
|
|
|
- <template #stock_type="{ scope }">
|
|
|
- <el-tag size="mini">{{ scope.row.type === "1" ? "销售仓" : "次品仓" }}</el-tag>
|
|
|
- </template>
|
|
|
-
|
|
|
- <template #sendWsm="{ scope }">
|
|
|
- <el-popover placement="top" width="360" trigger="hover">
|
|
|
- <i class="el-icon-warning-outline" slot="reference"></i>
|
|
|
- <ul>
|
|
|
- <li><h3>退货仓库</h3></li>
|
|
|
- <li>
|
|
|
- <span>编号:</span><span>{{ scope.row.send_wsm_code }}</span>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <span>名称:</span><span>{{ scope.row.send_wsm_name }}</span>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <span>负责人:</span><span>{{ scope.row.send_contactor_name }}</span>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <span>供应商编码:</span><span>{{ scope.row.send_supplierNo }}</span>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <span>供应商名称:</span><span>{{ scope.row.send_supplierName }}</span>
|
|
|
- </li>
|
|
|
- </ul>
|
|
|
- </el-popover>
|
|
|
- <span>{{ scope.row.send_wsm_name }}</span>
|
|
|
- </template>
|
|
|
-
|
|
|
- <template #type="{ scope }">
|
|
|
- <el-tag size="mini">{{
|
|
|
- scope.row.type === "1" ? "未发货退货" : "售后退货"
|
|
|
- }}</el-tag>
|
|
|
- </template>
|
|
|
|
|
|
<template #operation="{ scope }">
|
|
|
<el-tooltip
|
|
|
@@ -218,13 +237,12 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
-
|
|
|
-<script>
|
|
|
+ <script>
|
|
|
import mixinPage from "@/mixins/elPaginationHandle";
|
|
|
import resToken from "@/mixins/resToken";
|
|
|
import asyncRequest from "@/apis/service/sellOut/returnGoodWorkOrder";
|
|
|
-import { xs_order_type_options, xs_order_source_options } from "@/assets/js/statusList";
|
|
|
-import companyHelper from "@/mixins/companyHelper";
|
|
|
+import { xs_order_type_options ,xs_order_source_options} from "@/assets/js/statusList";
|
|
|
+import companyHelper from "@/mixins/companyHelper"
|
|
|
import urlConfig from "@/apis/url-config";
|
|
|
import { mapGetters } from "vuex";
|
|
|
import columns from "./columns";
|
|
|
@@ -237,7 +255,7 @@ export default {
|
|
|
powers() {
|
|
|
const tran =
|
|
|
this.$store.getters.btnList.find(
|
|
|
- (item) => item.menu_route == "supplierDeliveryWorkOrder"
|
|
|
+ (item) => item.menu_route == "supplierReturnWorkOrder"
|
|
|
) || {};
|
|
|
const { action } = tran ?? {};
|
|
|
return action ?? [];
|
|
|
@@ -245,12 +263,14 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ companyNo: "",
|
|
|
xs_order_type_options,
|
|
|
xs_order_source_options,
|
|
|
fileUrl: urlConfig.baseURL,
|
|
|
select: "outChildCode", //默认选择下拉框
|
|
|
s_input: "", //搜索框内容
|
|
|
- select_list: [],
|
|
|
+ select_list:[],
|
|
|
+ supplierNo:[],
|
|
|
sitem: null,
|
|
|
// 状态
|
|
|
statusOptions: [
|
|
|
@@ -262,12 +282,16 @@ export default {
|
|
|
isDetail: false,
|
|
|
modelId: 0,
|
|
|
parmValue: {
|
|
|
- returnCode: "",
|
|
|
- status: "", //节点状态
|
|
|
+ type:'',
|
|
|
+ order_type: "",
|
|
|
+ returnCode:"",
|
|
|
+ status: "",
|
|
|
page: 1, // 页码
|
|
|
size: 15, // 每页显示条数
|
|
|
// order_type: "",
|
|
|
},
|
|
|
+ queryKey: "returnCode",
|
|
|
+ queryValue: "",
|
|
|
tableData: [],
|
|
|
passwordModel: false,
|
|
|
passwordModelId: 0,
|
|
|
@@ -318,10 +342,10 @@ export default {
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
- async supplierChange(e) {
|
|
|
- const { code, label } = e;
|
|
|
- this.supplierNo = code ? [code] : [];
|
|
|
- this.searchList();
|
|
|
+ async companyNosearchChange(e) {
|
|
|
+ const { code } = e
|
|
|
+ this.companyNo = code || ''
|
|
|
+ this.searchList()
|
|
|
},
|
|
|
customer_code_change(e) {
|
|
|
if (e && e.code) {
|
|
|
@@ -331,26 +355,23 @@ export default {
|
|
|
}
|
|
|
this.searchList();
|
|
|
},
|
|
|
- handleExport() {
|
|
|
+ handleExport(){
|
|
|
if (!this.loading) {
|
|
|
this.loading = true;
|
|
|
let httpType = `aplication/zip`;
|
|
|
-
|
|
|
+
|
|
|
let model = JSON.parse(JSON.stringify(this.parmValue));
|
|
|
- delete model["s_input"];
|
|
|
+ delete model['s_input']
|
|
|
|
|
|
axios({
|
|
|
method: "post",
|
|
|
- url: this.fileUrl + "/admin/child_export",
|
|
|
+ url: this.fileUrl + "/admin/child_export",
|
|
|
responseType: "blob",
|
|
|
data: {
|
|
|
...model,
|
|
|
[this.select]: this.s_input,
|
|
|
- customer_code: Array.isArray(this.parmValue.customer_code)
|
|
|
- ? this.parmValue.customer_code[0]
|
|
|
- : this.parmValue.customer_code,
|
|
|
- supplierNo: this.currentCompany,
|
|
|
- noRelation: true,
|
|
|
+ customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
|
|
|
+ needRela: true
|
|
|
},
|
|
|
headers: {
|
|
|
Accept: httpType,
|
|
|
@@ -387,8 +408,8 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
- handleSelection(order) {
|
|
|
- const { list } = order;
|
|
|
+ handleSelection(order){
|
|
|
+ const { list } = order
|
|
|
this.select_list = list;
|
|
|
},
|
|
|
getRouter(toRouter, queryId) {
|
|
|
@@ -408,7 +429,7 @@ export default {
|
|
|
model.preModel = JSON.stringify(routerModel);
|
|
|
|
|
|
this.routeGoto(toRouter, model);
|
|
|
- }
|
|
|
+ }
|
|
|
},
|
|
|
restSearch() {
|
|
|
this.s_input = ""; //清除输入框内容
|
|
|
@@ -417,7 +438,7 @@ export default {
|
|
|
this.parmValue = {
|
|
|
order_type: "",
|
|
|
company_name: "", //申请人部门
|
|
|
- good_code: "",
|
|
|
+ good_code:"",
|
|
|
returnCode: "", //销售退货code
|
|
|
orderCode: "", //销售订单code
|
|
|
apply_name: "", //申请人
|
|
|
@@ -427,7 +448,7 @@ export default {
|
|
|
page: 1, // 页码
|
|
|
size: 15, // 每页显示条数
|
|
|
};
|
|
|
-
|
|
|
+
|
|
|
// 表格 - 分页
|
|
|
this.pageInfo = {
|
|
|
size: 15,
|
|
|
@@ -452,7 +473,7 @@ export default {
|
|
|
.then(async () => {
|
|
|
const model = {
|
|
|
id: id,
|
|
|
- status: status + "" === "1" ? "0" : "1",
|
|
|
+ status: status + '' === "1" ? "0" : "1",
|
|
|
};
|
|
|
const res = await asyncRequest.status(model);
|
|
|
if (res && res.code === 0) {
|
|
|
@@ -482,17 +503,16 @@ export default {
|
|
|
this.loading = true;
|
|
|
|
|
|
let model = JSON.parse(JSON.stringify(this.parmValue));
|
|
|
- delete model["s_input"];
|
|
|
+ delete model['s_input']
|
|
|
|
|
|
const res = await asyncRequest.list({
|
|
|
...model,
|
|
|
- [this.select]: this.s_input,
|
|
|
is_authority: "1",
|
|
|
- customer_code: Array.isArray(this.parmValue.customer_code)
|
|
|
- ? this.parmValue.customer_code[0]
|
|
|
- : this.parmValue.customer_code,
|
|
|
- supplierNo: this.currentCompany,
|
|
|
- noRelation: true,
|
|
|
+ [this.select]: this.s_input,
|
|
|
+ [this.queryKey]: this.queryValue,
|
|
|
+ companyNo: this.companyNo,
|
|
|
+ supplierNo:this.currentCompany,
|
|
|
+ noRelation: true
|
|
|
});
|
|
|
|
|
|
if (res && res.code === 0 && res.data) {
|
|
|
@@ -520,7 +540,7 @@ export default {
|
|
|
company_idsearchChange(e) {
|
|
|
const { code } = e;
|
|
|
this.parmValue.companyNo = code || "";
|
|
|
- this.searchList();
|
|
|
+ this.searchList()
|
|
|
},
|
|
|
|
|
|
// 时间
|
|
|
@@ -543,7 +563,8 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
-<style lang="scss" scoped>
|
|
|
+ <style lang="scss" scoped>
|
|
|
.sellReturn {
|
|
|
}
|
|
|
</style>
|
|
|
+
|
