|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<popu>
|
|
|
- <div >
|
|
|
+ <div>
|
|
|
<div class="menu-list">
|
|
|
<div>
|
|
|
<div class="main-title">
|
|
@@ -35,14 +35,16 @@
|
|
|
</div>
|
|
|
<div v-else class="child">
|
|
|
<div class="item">
|
|
|
- <el-link class="link" :underline="false" @click="clickMenu(item.fullUrl)">{{ item.moduleName }}</el-link>
|
|
|
+ <el-link class="link" :underline="false" @click="clickMenu(item.fullUrl)">{{
|
|
|
+ item.moduleName
|
|
|
+ }}</el-link>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 弹窗 -->
|
|
|
- <el-dialog title="菜单配置" :visible.sync="dialogVisible" width="70%">
|
|
|
+ <el-dialog title="菜单配置" append-to-body :visible.sync="dialogVisible" width="70%">
|
|
|
<el-checkbox-group v-model="checkList" :max="10">
|
|
|
<div v-for="(item, index) in menuList" :key="index" class="group">
|
|
|
<div v-if="item.moduleName != '首页'">
|
|
@@ -218,73 +220,81 @@
|
|
|
<!-- 到货通知 -->
|
|
|
<div v-show="type == '5'" class="table">
|
|
|
<div class="mymain-container">
|
|
|
- <el-form ref="form" label-width="80px" label-position="left" size="mini">
|
|
|
- <el-row>
|
|
|
- <el-col>
|
|
|
- <el-form-item prop="specification" label="规格型号">
|
|
|
- <div style="display: flex">
|
|
|
- <el-input v-model="specification" clearable style="margin-right: 10px" />
|
|
|
- <el-button
|
|
|
- @click="
|
|
|
- specification = ''
|
|
|
- getListInvoiceOrder()
|
|
|
- "
|
|
|
- >重置</el-button
|
|
|
- >
|
|
|
- <el-button type="primary" @click="getListInvoiceOrder">查询</el-button>
|
|
|
- </div>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form>
|
|
|
- <div class="table">
|
|
|
- <el-table ref="table"
|
|
|
- v-loading="listLoading"
|
|
|
- :data="arrivalNoticeList"
|
|
|
- element-loading-text="Loading"
|
|
|
- border
|
|
|
- fit
|
|
|
- highlight-current-row
|
|
|
- stripe>
|
|
|
- <el-table-column
|
|
|
- property="materialOldNumber"
|
|
|
- align="left"
|
|
|
- min-width="120"
|
|
|
- label="产品编号"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- property="materialNumber"
|
|
|
- align="left"
|
|
|
- min-width="100"
|
|
|
- label="物料编码"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- property="materialName"
|
|
|
- align="left"
|
|
|
- min-width="250"
|
|
|
- label="产品名称"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- property="specification"
|
|
|
- align="left"
|
|
|
- min-width="350"
|
|
|
- label="规格型号"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column property="stockName" align="left" min-width="100" label="到货仓库" show-overflow-tooltip />
|
|
|
- <el-table-column
|
|
|
- property="updateTime"
|
|
|
- align="left"
|
|
|
- min-width="200"
|
|
|
- label="到货通知时间"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
+ <el-form ref="form" label-width="80px" label-position="left" size="mini">
|
|
|
+ <el-row>
|
|
|
+ <el-col>
|
|
|
+ <el-form-item prop="specification" label="规格型号">
|
|
|
+ <div style="display: flex">
|
|
|
+ <el-input v-model="specification" clearable style="margin-right: 10px" />
|
|
|
+ <el-button
|
|
|
+ @click="
|
|
|
+ specification = ''
|
|
|
+ getListInvoiceOrder()
|
|
|
+ "
|
|
|
+ >重置</el-button
|
|
|
+ >
|
|
|
+ <el-button type="primary" @click="getListInvoiceOrder">查询</el-button>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+ <div class="table">
|
|
|
+ <el-table
|
|
|
+ ref="table"
|
|
|
+ v-loading="listLoading"
|
|
|
+ :data="arrivalNoticeList"
|
|
|
+ element-loading-text="Loading"
|
|
|
+ border
|
|
|
+ fit
|
|
|
+ highlight-current-row
|
|
|
+ stripe
|
|
|
+ >
|
|
|
+ <el-table-column
|
|
|
+ property="materialOldNumber"
|
|
|
+ align="left"
|
|
|
+ min-width="120"
|
|
|
+ label="产品编号"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ property="materialNumber"
|
|
|
+ align="left"
|
|
|
+ min-width="100"
|
|
|
+ label="物料编码"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ property="materialName"
|
|
|
+ align="left"
|
|
|
+ min-width="250"
|
|
|
+ label="产品名称"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ property="specification"
|
|
|
+ align="left"
|
|
|
+ min-width="350"
|
|
|
+ label="规格型号"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ property="stockName"
|
|
|
+ align="left"
|
|
|
+ min-width="100"
|
|
|
+ label="到货仓库"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ property="updateTime"
|
|
|
+ align="left"
|
|
|
+ min-width="200"
|
|
|
+ label="到货通知时间"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<br />
|
|
|
<br />
|
|
@@ -435,8 +445,8 @@ export default {
|
|
|
visible: false,
|
|
|
orderId: '',
|
|
|
logisticsDetail: [],
|
|
|
- arrivalNoticeList:[],
|
|
|
- specification:''
|
|
|
+ arrivalNoticeList: [],
|
|
|
+ specification: ''
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -606,7 +616,6 @@ export default {
|
|
|
},
|
|
|
// 获取返利确认单数据
|
|
|
async getRebateList(data) {
|
|
|
-
|
|
|
const res = await getRebateOrderList(data)
|
|
|
this.rebateList = res.data.records
|
|
|
this.listTotal = res.data.total
|
|
@@ -624,7 +633,7 @@ export default {
|
|
|
...data,
|
|
|
pageSize: this.pageSize,
|
|
|
pageNum: this.currentPage,
|
|
|
- specification:this.specification
|
|
|
+ specification: this.specification
|
|
|
}
|
|
|
const res = await getListInvoiceOrder(data)
|
|
|
this.invoiceOrderList = res.data.records
|
|
@@ -709,11 +718,11 @@ export default {
|
|
|
}
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
-::v-deep .el-input__inner {
|
|
|
- /* width: 80px; */
|
|
|
- font-size: 16px;
|
|
|
- color: #333333;
|
|
|
- /* border: 0 !important; */
|
|
|
+::v-deep .el-input__inner {
|
|
|
+ /* width: 80px; */
|
|
|
+ font-size: 16px;
|
|
|
+ color: #333333;
|
|
|
+ /* border: 0 !important; */
|
|
|
}
|
|
|
.dashboard {
|
|
|
&-container {
|