|
@@ -68,27 +68,27 @@
|
|
<a-form-item label="对单状态">
|
|
<a-form-item label="对单状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.checkStatus"
|
|
v-model="queryParam.checkStatus"
|
|
- ref="printStatus"
|
|
|
|
- id="pushOrder-printStatus"
|
|
|
|
|
|
+ ref="checkStatus"
|
|
|
|
+ id="pushOrder-checkStatus"
|
|
code="CHECK_STATUS"
|
|
code="CHECK_STATUS"
|
|
placeholder="请选择对单状态"
|
|
placeholder="请选择对单状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="所在区域">
|
|
|
|
|
|
+ <a-form-item label="所在区域">
|
|
<subarea id="pushOrder-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
<subarea id="pushOrder-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
- </a-form-model-item>
|
|
|
|
|
|
+ </a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
|
|
|
|
|
|
+ <a-form-item label="地区" prop="shippingAddrProvinceSn">
|
|
<Area id="pushOrder-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
<Area id="pushOrder-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
- </a-form-model-item>
|
|
|
|
|
|
+ </a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24" v-show="isShowWarehouse">
|
|
<a-col :md="6" :sm="24" v-show="isShowWarehouse">
|
|
- <a-form-model-item label="出库仓库">
|
|
|
|
|
|
+ <a-form-item label="出库仓库">
|
|
<chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
|
|
<chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
|
|
- </a-form-model-item>
|
|
|
|
|
|
+ </a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
|
|
<a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
|
|
<a-form-item label="客服">
|
|
<a-form-item label="客服">
|
|
@@ -110,9 +110,9 @@
|
|
</a-form>
|
|
</a-form>
|
|
</div>
|
|
</div>
|
|
</a-card>
|
|
</a-card>
|
|
-
|
|
|
|
<a-card size="small" :bordered="false" class="pushOrder-wrap">
|
|
<a-card size="small" :bordered="false" class="pushOrder-wrap">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
|
|
+ <!-- 统计 -->
|
|
<div class="tongji-bar" style="margin-bottom:10px">
|
|
<div class="tongji-bar" style="margin-bottom:10px">
|
|
下推总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
下推总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
下推总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
@@ -167,7 +167,7 @@
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
|
|
|
|
- <!-- 操作提示 -->
|
|
|
|
|
|
+ <!-- 允许此单进行备货打印操作提示 -->
|
|
<commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
|
|
<commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
|
|
<div style="display:flex;flex-direction: column;align-items: center;">
|
|
<div style="display:flex;flex-direction: column;align-items: center;">
|
|
<div style="margin-bottom: 15px;font-size: 14px;"><strong>{{ tipData&&tipData.printType==1?'确认允许此单进行备货打印吗?':'确认此单取消备货打印吗?' }}</strong></div>
|
|
<div style="margin-bottom: 15px;font-size: 14px;"><strong>{{ tipData&&tipData.printType==1?'确认允许此单进行备货打印吗?':'确认此单取消备货打印吗?' }}</strong></div>
|
|
@@ -188,6 +188,7 @@
|
|
@cancel="closeDetailModal">
|
|
@cancel="closeDetailModal">
|
|
<salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
<salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
</commonModal>
|
|
</commonModal>
|
|
|
|
+
|
|
<!-- 发货说明 -->
|
|
<!-- 发货说明 -->
|
|
<explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
|
|
<explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
|
|
</a-spin>
|
|
</a-spin>
|
|
@@ -219,41 +220,41 @@ export default {
|
|
spinning: false,
|
|
spinning: false,
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
- showDetailModal: false,
|
|
|
|
- showInfoModal: false,
|
|
|
|
- bizSn: null,
|
|
|
|
- tableHeight: 0,
|
|
|
|
|
|
+ showDetailModal: false, // 销售单详情弹框
|
|
|
|
+ showInfoModal: false, // 发货说明弹框
|
|
|
|
+ bizSn: null, // 当前操作的销售单sn
|
|
|
|
+ tableHeight: 0, // 表格高度
|
|
time: [
|
|
time: [
|
|
moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
|
|
moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
|
|
moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
],
|
|
],
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParam: {
|
|
queryParam: {
|
|
- beginDate: getDate.getThreeMonthDays().starttime,
|
|
|
|
- endDate: getDate.getCurrMonthDays().endtime,
|
|
|
|
|
|
+ beginDate: getDate.getThreeMonthDays().starttime, // 开始时间
|
|
|
|
+ endDate: getDate.getCurrMonthDays().endtime, // 结束时间
|
|
buyerSn: undefined, // 客户名称
|
|
buyerSn: undefined, // 客户名称
|
|
receiverSn: undefined, // 收货客户
|
|
receiverSn: undefined, // 收货客户
|
|
salesBillNo: '', // 销售单号
|
|
salesBillNo: '', // 销售单号
|
|
dispatchBillNo: '', // 备货单号
|
|
dispatchBillNo: '', // 备货单号
|
|
billStatus: undefined, // 业务状态
|
|
billStatus: undefined, // 业务状态
|
|
subareaArea: {
|
|
subareaArea: {
|
|
- subareaSn: undefined,
|
|
|
|
- subareaAreaSn: undefined
|
|
|
|
|
|
+ subareaSn: undefined, // 区域
|
|
|
|
+ subareaAreaSn: undefined // 分区
|
|
},
|
|
},
|
|
- voidFlag: undefined,
|
|
|
|
- shippingAddrProvinceSn: undefined,
|
|
|
|
- printStatus: undefined,
|
|
|
|
- checkStatus: undefined,
|
|
|
|
- warehouseSn: undefined,
|
|
|
|
- bizUserSn: undefined
|
|
|
|
|
|
+ voidFlag: undefined, // 单据状态
|
|
|
|
+ shippingAddrProvinceSn: undefined, // 地区 省
|
|
|
|
+ printStatus: undefined, // 备货打印状态
|
|
|
|
+ checkStatus: undefined, // 对单状态
|
|
|
|
+ warehouseSn: undefined, // 仓库
|
|
|
|
+ bizUserSn: undefined // 客服
|
|
},
|
|
},
|
|
- totalData: {
|
|
|
|
- totalAmount: 0,
|
|
|
|
- totalQty: 0,
|
|
|
|
- totalRecord: 0
|
|
|
|
|
|
+ totalData: { // 统计数据
|
|
|
|
+ totalAmount: 0, // 总金额
|
|
|
|
+ totalQty: 0, // 总数量
|
|
|
|
+ totalRecord: 0 // 总条数
|
|
},
|
|
},
|
|
- showTipModal: false,
|
|
|
|
- tipData: null,
|
|
|
|
|
|
+ showTipModal: false, // 确认弹框操作提示
|
|
|
|
+ tipData: null, // 发货说明 数据
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
@@ -292,7 +293,6 @@ export default {
|
|
{ title: '出库仓库', dataIndex: 'warehouseName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '出库仓库', dataIndex: 'warehouseName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '产品款数', dataIndex: 'totalCategory', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '产品款数', dataIndex: 'totalCategory', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '产品数量', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '产品数量', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
- // { title: '总售价', dataIndex: 'totalAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
{ title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '财务状态', dataIndex: 'financialStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '财务状态', dataIndex: 'financialStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收款打印状态', dataIndex: 'settlePrintStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收款打印状态', dataIndex: 'settlePrintStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -303,25 +303,33 @@ export default {
|
|
{ title: '出库时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '出库时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
|
|
]
|
|
]
|
|
- if (this.$hasPermissions('M_pushOrderManagementList_salesPrice')) { // 售价权限
|
|
|
|
|
|
+ // 售价权限
|
|
|
|
+ if (this.$hasPermissions('M_pushOrderManagementList_salesPrice')) {
|
|
arr.splice(10, 0, { title: '总售价', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
arr.splice(10, 0, { title: '总售价', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
}
|
|
}
|
|
return arr
|
|
return arr
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- // 时间 change
|
|
|
|
|
|
+ // 选择时间
|
|
dateChange (date) {
|
|
dateChange (date) {
|
|
this.queryParam.beginDate = date[0]
|
|
this.queryParam.beginDate = date[0]
|
|
this.queryParam.endDate = date[1]
|
|
this.queryParam.endDate = date[1]
|
|
},
|
|
},
|
|
|
|
+ // 客户名称
|
|
custChange (val) {
|
|
custChange (val) {
|
|
this.queryParam.buyerSn = val.key
|
|
this.queryParam.buyerSn = val.key
|
|
},
|
|
},
|
|
|
|
+ // 选择区域
|
|
|
|
+ subareaChange (val) {
|
|
|
|
+ this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
|
|
+ this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
|
|
+ },
|
|
|
|
+ // 收货客户名称
|
|
shcustChange (val) {
|
|
shcustChange (val) {
|
|
this.queryParam.receiverSn = val.key
|
|
this.queryParam.receiverSn = val.key
|
|
},
|
|
},
|
|
- // 详情
|
|
|
|
|
|
+ // 详情,type 0 销售订单 1 销售退单
|
|
handleDetail (row, type) {
|
|
handleDetail (row, type) {
|
|
if (type == 0) {
|
|
if (type == 0) {
|
|
this.$store.state.app.curActionPermission = 'B_salesDetail'
|
|
this.$store.state.app.curActionPermission = 'B_salesDetail'
|
|
@@ -331,6 +339,7 @@ export default {
|
|
this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
|
|
this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ // 详情弹框关闭
|
|
closeDetailModal () {
|
|
closeDetailModal () {
|
|
this.showDetailModal = false
|
|
this.showDetailModal = false
|
|
this.$store.state.app.curActionPermission = ''
|
|
this.$store.state.app.curActionPermission = ''
|
|
@@ -346,13 +355,18 @@ export default {
|
|
this.tipData.printType = type
|
|
this.tipData.printType = type
|
|
this.showTipModal = true
|
|
this.showTipModal = true
|
|
},
|
|
},
|
|
|
|
+ // 发货说明弹框关闭
|
|
canselModal () {
|
|
canselModal () {
|
|
this.tipData = null
|
|
this.tipData = null
|
|
this.showTipModal = false
|
|
this.showTipModal = false
|
|
this.showInfoModal = false
|
|
this.showInfoModal = false
|
|
},
|
|
},
|
|
|
|
+ // 确认允许此单进行备货打印
|
|
updatePrintStatus () {
|
|
updatePrintStatus () {
|
|
- dispatchPrintStatus({ dispatchBillSn: this.tipData.dispatchBillSn, printStatus: this.tipData && this.tipData.printType == 1 ? 'NO_PRINT' : 'CANCEL_PRINT' }).then(res => {
|
|
|
|
|
|
+ dispatchPrintStatus({
|
|
|
|
+ dispatchBillSn: this.tipData.dispatchBillSn,
|
|
|
|
+ printStatus: this.tipData && this.tipData.printType == 1 ? 'NO_PRINT' : 'CANCEL_PRINT'
|
|
|
|
+ }).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.canselModal()
|
|
this.canselModal()
|
|
this.$message.info(res.message)
|
|
this.$message.info(res.message)
|
|
@@ -360,11 +374,7 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- subareaChange (val) {
|
|
|
|
- this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
|
|
- this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
|
|
- },
|
|
|
|
- // 重置
|
|
|
|
|
|
+ // 重置查询
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
|
|
this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
|
|
@@ -390,12 +400,14 @@ export default {
|
|
}
|
|
}
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
|
|
+ // 初始化
|
|
pageInit () {
|
|
pageInit () {
|
|
const _this = this
|
|
const _this = this
|
|
this.$nextTick(() => { // 页面渲染完成后的回调
|
|
this.$nextTick(() => { // 页面渲染完成后的回调
|
|
_this.setTableH()
|
|
_this.setTableH()
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ // 计算表格高度
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
this.tableHeight = window.innerHeight - tableSearchH - 230
|
|
this.tableHeight = window.innerHeight - tableSearchH - 230
|