|
@@ -27,8 +27,20 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
- <el-form-item label="仓库" prop="warehouse">
|
|
|
|
- <el-input v-model="screenForm.warehouse" placeholder="请输入仓库" />
|
|
|
|
|
|
+ <el-form-item label="仓库" prop="correspondId">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="screenForm.correspondId"
|
|
|
|
+ placeholder="请选择发货仓库"
|
|
|
|
+ size="mini"
|
|
|
|
+ style="margin-right: 10px"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="(item, index) in warehouseList"
|
|
|
|
+ :key="index"
|
|
|
|
+ :label="item.name"
|
|
|
|
+ :value="item.id"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
@@ -66,7 +78,7 @@
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="screenForm.date"
|
|
v-model="screenForm.date"
|
|
type="datetimerange"
|
|
type="datetimerange"
|
|
-:default-time="['00:00:00','23:59:59']"
|
|
|
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
range-separator="至"
|
|
range-separator="至"
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
@@ -80,7 +92,7 @@
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="screenForm.printTime"
|
|
v-model="screenForm.printTime"
|
|
type="datetimerange"
|
|
type="datetimerange"
|
|
-:default-time="['00:00:00','23:59:59']"
|
|
|
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
range-separator="至"
|
|
range-separator="至"
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
@@ -299,7 +311,7 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import { getPickupList, cancelData, getPickupManList } from '@/api/supply/pickup'
|
|
import { getPickupList, cancelData, getPickupManList } from '@/api/supply/pickup'
|
|
-
|
|
|
|
|
|
+import { getWarehouseList } from '@/api/supply/engin'
|
|
import PickupForm from '@/views/supply/pickup/components/pickup_form'
|
|
import PickupForm from '@/views/supply/pickup/components/pickup_form'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -318,7 +330,7 @@ export default {
|
|
orderNum: '',
|
|
orderNum: '',
|
|
jxsName: '',
|
|
jxsName: '',
|
|
jxsNum: '',
|
|
jxsNum: '',
|
|
- warehouse: '',
|
|
|
|
|
|
+ correspondId: '',
|
|
date: '',
|
|
date: '',
|
|
status: '',
|
|
status: '',
|
|
takerPhone: '',
|
|
takerPhone: '',
|
|
@@ -331,7 +343,8 @@ export default {
|
|
flag: false,
|
|
flag: false,
|
|
isCollapse: true,
|
|
isCollapse: true,
|
|
queryItem: {},
|
|
queryItem: {},
|
|
- isShowForm: false
|
|
|
|
|
|
+ isShowForm: false,
|
|
|
|
+ warehouseList: []
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
@@ -344,7 +357,7 @@ export default {
|
|
invoiceId: this.screenForm.orderNum,
|
|
invoiceId: this.screenForm.orderNum,
|
|
customerName: this.screenForm.jxsName,
|
|
customerName: this.screenForm.jxsName,
|
|
customerNumber: this.screenForm.jxsNum,
|
|
customerNumber: this.screenForm.jxsNum,
|
|
- stockName: this.screenForm.warehouse,
|
|
|
|
|
|
+ correspondId: this.screenForm.correspondId,
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
status: this.screenForm.status,
|
|
status: this.screenForm.status,
|
|
@@ -360,10 +373,21 @@ export default {
|
|
|
|
|
|
created() {
|
|
created() {
|
|
this.getList()
|
|
this.getList()
|
|
|
|
+ this.getWarehouseList()
|
|
this.getPickupManList()
|
|
this.getPickupManList()
|
|
},
|
|
},
|
|
|
|
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 获取仓库列表
|
|
|
|
+ getWarehouseList() {
|
|
|
|
+ getWarehouseList({
|
|
|
|
+ pageNum: 1,
|
|
|
|
+ pageSize: -1
|
|
|
|
+ }).then(res => {
|
|
|
|
+ this.warehouseList = res.data.records
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+
|
|
// 查询按钮权限
|
|
// 查询按钮权限
|
|
checkBtnRole(value) {
|
|
checkBtnRole(value) {
|
|
// let btnRole = this.$route.meta.roles;
|
|
// let btnRole = this.$route.meta.roles;
|
|
@@ -387,7 +411,7 @@ export default {
|
|
invoiceId: this.screenForm.orderNum,
|
|
invoiceId: this.screenForm.orderNum,
|
|
customerName: this.screenForm.jxsName,
|
|
customerName: this.screenForm.jxsName,
|
|
customerNumber: this.screenForm.jxsNum,
|
|
customerNumber: this.screenForm.jxsNum,
|
|
- stockName: this.screenForm.warehouse,
|
|
|
|
|
|
+ correspondId: this.screenForm.correspondId,
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
startTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
endTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
status: this.screenForm.status,
|
|
status: this.screenForm.status,
|
|
@@ -414,9 +438,7 @@ export default {
|
|
|
|
|
|
// 重置筛选表单
|
|
// 重置筛选表单
|
|
resetScreenForm() {
|
|
resetScreenForm() {
|
|
- this.$nextTick(()=>{
|
|
|
|
- this.$refs.screenForm.resetFields()
|
|
|
|
- })
|
|
|
|
|
|
+ this.$refs.screenForm.resetFields()
|
|
this.currentPage = 1
|
|
this.currentPage = 1
|
|
this.getList()
|
|
this.getList()
|
|
},
|
|
},
|