|
@@ -13,8 +13,7 @@
|
|
<el-radio-button :label="2">返利确认单</el-radio-button>
|
|
<el-radio-button :label="2">返利确认单</el-radio-button>
|
|
<el-radio-button :label="3">物流通知</el-radio-button>
|
|
<el-radio-button :label="3">物流通知</el-radio-button>
|
|
<el-radio-button :label="4">到货通知</el-radio-button>
|
|
<el-radio-button :label="4">到货通知</el-radio-button>
|
|
- <el-radio-button :label="5">货满订单</el-radio-button>
|
|
|
|
-
|
|
|
|
|
|
+ <!-- <el-radio-button :label="5">货满订单</el-radio-button> -->
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
<!-- 系统通知 -->
|
|
<!-- 系统通知 -->
|
|
<div v-show="type === 0" class="table">
|
|
<div v-show="type === 0" class="table">
|
|
@@ -33,16 +32,22 @@
|
|
<el-table-column align="center" label="标题" prop="title" min-width="160" show-overflow-tooltip />
|
|
<el-table-column align="center" label="标题" prop="title" min-width="160" show-overflow-tooltip />
|
|
<el-table-column align="center" label="来源" prop="source" min-width="160" show-overflow-tooltip />
|
|
<el-table-column align="center" label="来源" prop="source" min-width="160" show-overflow-tooltip />
|
|
<el-table-column align="center" label="时间" prop="issueTime" min-width="160" show-overflow-tooltip />
|
|
<el-table-column align="center" label="时间" prop="issueTime" min-width="160" show-overflow-tooltip />
|
|
- <el-table-column align="center" label="是否已读" prop="isTopRead" min-width="160" show-overflow-tooltip >
|
|
|
|
|
|
+ <el-table-column align="center" label="是否已读" prop="isTopRead" min-width="160" show-overflow-tooltip>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- {{scope.row.isTopRead ? '已读':'未读'}}
|
|
|
|
|
|
+ {{ scope.row.isTopRead ? '已读' : '未读' }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
|
|
<el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <el-button :style="{
|
|
|
|
- color: scope.row.readFlag ? '#c0c4cc' : ''
|
|
|
|
- }" type="text" class="textColor" @click="lookInDialog(scope.row.id)">查看</el-button>
|
|
|
|
|
|
+ <el-button
|
|
|
|
+ :style="{
|
|
|
|
+ color: scope.row.readFlag ? '#c0c4cc' : ''
|
|
|
|
+ }"
|
|
|
|
+ type="text"
|
|
|
|
+ class="textColor"
|
|
|
|
+ @click="lookInDialog(scope.row.id)"
|
|
|
|
+ >查看</el-button
|
|
|
|
+ >
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -104,40 +109,32 @@
|
|
<el-input v-model="invoiceOrderForm.invoiceId" placeholder="请输入发货单" />
|
|
<el-input v-model="invoiceOrderForm.invoiceId" placeholder="请输入发货单" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col
|
|
|
|
- :xs="24"
|
|
|
|
- :sm="12"
|
|
|
|
- :lg="8"
|
|
|
|
- ><el-form-item prop="time" label="发货单时间">
|
|
|
|
- <el-date-picker
|
|
|
|
- v-model="invoiceOrderForm.time"
|
|
|
|
- style="width: 100%"
|
|
|
|
- type="daterange"
|
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
- range-separator="至"
|
|
|
|
- start-placeholder="开始日期"
|
|
|
|
- end-placeholder="结束日期"
|
|
|
|
- /></el-form-item></el-col>
|
|
|
|
- <el-col
|
|
|
|
- :xs="24"
|
|
|
|
- :sm="12"
|
|
|
|
- :lg="8"
|
|
|
|
- ><el-form-item prop="userName" label="收货客户">
|
|
|
|
- <el-input v-model="invoiceOrderForm.userName" placeholder="请输入收货客户" /> </el-form-item></el-col>
|
|
|
|
- <el-col
|
|
|
|
- :xs="24"
|
|
|
|
- :sm="12"
|
|
|
|
- :lg="8"
|
|
|
|
- ><el-form-item prop="address" label="收货地址">
|
|
|
|
- <el-input v-model="invoiceOrderForm.address" placeholder="请输入收货地址" /> </el-form-item></el-col>
|
|
|
|
- <el-col
|
|
|
|
- :xs="24"
|
|
|
|
- :sm="12"
|
|
|
|
- :lg="8"
|
|
|
|
- ><el-form-item prop="remark" label="内容"> <el-input v-model="invoiceOrderForm.remark" placeholder="请输入内容" /> </el-form-item></el-col>
|
|
|
|
- <el-col :xs="24" :sm="12" :lg="8" style="text-align: right;">
|
|
|
|
- <el-button size="mini" @click="handleReset($event,'invoiceOrde')">重置</el-button>
|
|
|
|
- <el-button size="mini" type="primary" @click="currentPage = 1,getListInvoiceOrder()">查询</el-button>
|
|
|
|
|
|
+ <el-col :xs="24" :sm="12" :lg="8"
|
|
|
|
+ ><el-form-item prop="time" label="发货单时间">
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="invoiceOrderForm.time"
|
|
|
|
+ style="width: 100%"
|
|
|
|
+ type="daterange"
|
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
+ range-separator="至"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ end-placeholder="结束日期" /></el-form-item
|
|
|
|
+ ></el-col>
|
|
|
|
+ <el-col :xs="24" :sm="12" :lg="8"
|
|
|
|
+ ><el-form-item prop="userName" label="收货客户">
|
|
|
|
+ <el-input v-model="invoiceOrderForm.userName" placeholder="请输入收货客户" /> </el-form-item
|
|
|
|
+ ></el-col>
|
|
|
|
+ <el-col :xs="24" :sm="12" :lg="8"
|
|
|
|
+ ><el-form-item prop="address" label="收货地址">
|
|
|
|
+ <el-input v-model="invoiceOrderForm.address" placeholder="请输入收货地址" /> </el-form-item
|
|
|
|
+ ></el-col>
|
|
|
|
+ <el-col :xs="24" :sm="12" :lg="8"
|
|
|
|
+ ><el-form-item prop="remark" label="内容">
|
|
|
|
+ <el-input v-model="invoiceOrderForm.remark" placeholder="请输入内容" /> </el-form-item
|
|
|
|
+ ></el-col>
|
|
|
|
+ <el-col :xs="24" :sm="12" :lg="8" style="text-align: right">
|
|
|
|
+ <el-button size="mini" @click="handleReset($event, 'invoiceOrde')">重置</el-button>
|
|
|
|
+ <el-button size="mini" type="primary" @click=";(currentPage = 1), getListInvoiceOrder()">查询</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
</el-form>
|
|
</el-form>
|
|
@@ -187,7 +184,7 @@
|
|
<div style="display: flex">
|
|
<div style="display: flex">
|
|
<el-input v-model="specification" clearable style="margin-right: 10px" placeholder="请输入规格型号" />
|
|
<el-input v-model="specification" clearable style="margin-right: 10px" placeholder="请输入规格型号" />
|
|
<el-button @click="handleReset">重置</el-button>
|
|
<el-button @click="handleReset">重置</el-button>
|
|
- <el-button type="primary" size="mini" @click="currentPage = 1,getArrivalNotice()">查询</el-button>
|
|
|
|
|
|
+ <el-button type="primary" size="mini" @click=";(currentPage = 1), getArrivalNotice()">查询</el-button>
|
|
</div>
|
|
</div>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -259,7 +256,12 @@
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
<el-form-item prop="stockOrderSpecification" label="机型">
|
|
<el-form-item prop="stockOrderSpecification" label="机型">
|
|
<div style="display: flex">
|
|
<div style="display: flex">
|
|
- <el-input v-model="stockOrderSpecification" clearable style="margin-right: 10px" placeholder="请输入机型" />
|
|
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="stockOrderSpecification"
|
|
|
|
+ clearable
|
|
|
|
+ style="margin-right: 10px"
|
|
|
|
+ placeholder="请输入机型"
|
|
|
|
+ />
|
|
</div>
|
|
</div>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -267,7 +269,7 @@
|
|
<el-form-item prop="stockTimes" label="日期">
|
|
<el-form-item prop="stockTimes" label="日期">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="stockTimes"
|
|
v-model="stockTimes"
|
|
- style="width: 100%;"
|
|
|
|
|
|
+ style="width: 100%"
|
|
type="daterange"
|
|
type="daterange"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
range-separator="至"
|
|
range-separator="至"
|
|
@@ -277,8 +279,10 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
- <div style="float: right;"> <el-button size="mini" @click="handleReset($event, 'stockCost')">重置</el-button>
|
|
|
|
- <el-button type="primary" size="mini" @click="currentPage = 1,getStockCostList()">查询</el-button></div>
|
|
|
|
|
|
+ <div style="float: right">
|
|
|
|
+ <el-button size="mini" @click="handleReset($event, 'stockCost')">重置</el-button>
|
|
|
|
+ <el-button type="primary" size="mini" @click=";(currentPage = 1), getStockCostList()">查询</el-button>
|
|
|
|
+ </div>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
</el-form>
|
|
</el-form>
|
|
@@ -293,50 +297,21 @@
|
|
highlight-current-row
|
|
highlight-current-row
|
|
stripe
|
|
stripe
|
|
>
|
|
>
|
|
- <el-table-column
|
|
|
|
- type="index"
|
|
|
|
- align="left"
|
|
|
|
- min-width="50"
|
|
|
|
- label="序号"
|
|
|
|
- />
|
|
|
|
- <el-table-column
|
|
|
|
- property="orderId"
|
|
|
|
- align="left"
|
|
|
|
- min-width="150"
|
|
|
|
- label="订单号"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- >
|
|
|
|
|
|
+ <el-table-column type="index" align="left" min-width="50" label="序号" />
|
|
|
|
+ <el-table-column property="orderId" align="left" min-width="150" label="订单号" show-overflow-tooltip>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-link type="primary" :underline="false" @click="handleToDaily(scope.row.orderId)">{{
|
|
<el-link type="primary" :underline="false" @click="handleToDaily(scope.row.orderId)">{{
|
|
scope.row.orderId
|
|
scope.row.orderId
|
|
}}</el-link>
|
|
}}</el-link>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column
|
|
|
|
- property="specification"
|
|
|
|
- align="left"
|
|
|
|
- min-width="250"
|
|
|
|
- label="机型"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- />
|
|
|
|
- <el-table-column
|
|
|
|
- property="full"
|
|
|
|
- align="left"
|
|
|
|
- min-width="120"
|
|
|
|
- label="是否已生成仓租"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- >
|
|
|
|
|
|
+ <el-table-column property="specification" align="left" min-width="250" label="机型" show-overflow-tooltip />
|
|
|
|
+ <el-table-column property="full" align="left" min-width="120" label="是否已生成仓租" show-overflow-tooltip>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- {{ scope.row.full =='YES'? '是': '否' }}
|
|
|
|
|
|
+ {{ scope.row.full == 'YES' ? '是' : '否' }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column
|
|
|
|
- property="fullTime"
|
|
|
|
- align="left"
|
|
|
|
- min-width="150"
|
|
|
|
- label="货满日期"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- />
|
|
|
|
|
|
+ <el-table-column property="fullTime" align="left" min-width="150" label="货满日期" show-overflow-tooltip />
|
|
<el-table-column property="fullNum" align="left" min-width="80" label="计算天数" show-overflow-tooltip />
|
|
<el-table-column property="fullNum" align="left" min-width="80" label="计算天数" show-overflow-tooltip />
|
|
<el-table-column align="center" label="操作" min-width="80" show-overflow-tooltip fixed="right">
|
|
<el-table-column align="center" label="操作" min-width="80" show-overflow-tooltip fixed="right">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
@@ -380,10 +355,10 @@
|
|
:preview-src-list="[imageURL + item.url]"
|
|
:preview-src-list="[imageURL + item.url]"
|
|
/>
|
|
/>
|
|
<div v-else class="box2" @click="openLink(item.url)">
|
|
<div v-else class="box2" @click="openLink(item.url)">
|
|
- <img v-if="checkFileType(item.url) == 'word'" src="@/assets/common/word.png">
|
|
|
|
- <img v-if="checkFileType(item.url) == 'excel'" src="@/assets/common/excel.png">
|
|
|
|
- <img v-if="checkFileType(item.url) == 'ppt'" src="@/assets/common/ppt.png">
|
|
|
|
- <img v-if="checkFileType(item.url) == 'pdf'" src="@/assets/common/pdf.png">
|
|
|
|
|
|
+ <img v-if="checkFileType(item.url) == 'word'" src="@/assets/common/word.png" />
|
|
|
|
+ <img v-if="checkFileType(item.url) == 'excel'" src="@/assets/common/excel.png" />
|
|
|
|
+ <img v-if="checkFileType(item.url) == 'ppt'" src="@/assets/common/ppt.png" />
|
|
|
|
+ <img v-if="checkFileType(item.url) == 'pdf'" src="@/assets/common/pdf.png" />
|
|
<div class="name ellipsis-3">{{ item.name }}</div>
|
|
<div class="name ellipsis-3">{{ item.name }}</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -480,7 +455,14 @@ export default {
|
|
remark: '',
|
|
remark: '',
|
|
userName: ''
|
|
userName: ''
|
|
},
|
|
},
|
|
- fnArr: ['getDataList', 'getFileList', 'getRebateList', 'getListInvoiceOrder', 'getArrivalNotice', 'getStockCostList']
|
|
|
|
|
|
+ fnArr: [
|
|
|
|
+ 'getDataList',
|
|
|
|
+ 'getFileList',
|
|
|
|
+ 'getRebateList',
|
|
|
|
+ 'getListInvoiceOrder',
|
|
|
|
+ 'getArrivalNotice',
|
|
|
|
+ 'getStockCostList'
|
|
|
|
+ ]
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -687,14 +669,14 @@ export default {
|
|
},
|
|
},
|
|
handleJump(id) {
|
|
handleJump(id) {
|
|
// this.$router.push({ path: `/supply/pickup/sum_list?id=${id}` })
|
|
// this.$router.push({ path: `/supply/pickup/sum_list?id=${id}` })
|
|
- this.$router.push({name: 'exwarehouseSum_list', query:{id}})
|
|
|
|
|
|
+ this.$router.push({ name: 'exwarehouseSum_list', query: { id } })
|
|
this.type = 0
|
|
this.type = 0
|
|
this.$emit('reset')
|
|
this.$emit('reset')
|
|
this.$store.commit('user/showMessage', 'no')
|
|
this.$store.commit('user/showMessage', 'no')
|
|
},
|
|
},
|
|
handleToDaily(orderId) {
|
|
handleToDaily(orderId) {
|
|
// this.$router.push({ path: `/basic_data/dailyWarehouseRent?orderId=${orderId}` })
|
|
// this.$router.push({ path: `/basic_data/dailyWarehouseRent?orderId=${orderId}` })
|
|
- this.$router.push({ name: 'dailyWarehouseRent', query:{orderId}})
|
|
|
|
|
|
+ this.$router.push({ name: 'dailyWarehouseRent', query: { orderId } })
|
|
this.type = 0
|
|
this.type = 0
|
|
this.$emit('reset')
|
|
this.$emit('reset')
|
|
this.$store.commit('user/showMessage', 'no')
|
|
this.$store.commit('user/showMessage', 'no')
|
|
@@ -704,7 +686,8 @@ export default {
|
|
</script>
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
-::v-deep .el-form-item--mini .el-form-item__content, ::v-deep .el-form-item--mini .el-form-item__label{
|
|
|
|
|
|
+::v-deep .el-form-item--mini .el-form-item__content,
|
|
|
|
+::v-deep .el-form-item--mini .el-form-item__label {
|
|
line-height: 27px;
|
|
line-height: 27px;
|
|
}
|
|
}
|
|
::v-deep .el-range-editor--mini .el-range-separator {
|
|
::v-deep .el-range-editor--mini .el-range-separator {
|