|
@@ -18,13 +18,16 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="调往对象">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.putTenantName"
|
|
|
- ref="putTenantName"
|
|
|
- id="chainTransferOutList-putTenantName"
|
|
|
- code="PAYMENT_TYPE"
|
|
|
+ <a-select
|
|
|
placeholder="请选择调往对象"
|
|
|
- allowClear></v-select>
|
|
|
+ allowClear
|
|
|
+ id="chainTransferOutList-putTenantSn"
|
|
|
+ v-model="queryParam.putTenantSn"
|
|
|
+ :showSearch="true"
|
|
|
+ option-filter-prop="children"
|
|
|
+ :filter-option="filterOption">
|
|
|
+ <a-select-option v-for="item in putTenantSnData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -33,20 +36,20 @@
|
|
|
v-model="queryParam.allocationType"
|
|
|
ref="allocationType"
|
|
|
id="chainTransferOutList-allocationType"
|
|
|
- code="PAYMENT_TYPE"
|
|
|
+ code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
|
|
|
placeholder="请选择调出产品类型"
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="单据状态">
|
|
|
+ <a-form-item label="业务状态">
|
|
|
<v-select
|
|
|
v-model="queryParam.state"
|
|
|
ref="state"
|
|
|
id="chainTransferOutList-state"
|
|
|
- code="PAYMENT_TYPE"
|
|
|
- placeholder="请选择单据状态"
|
|
|
+ code="ALLOCATION_LINKAGE_OUT_STATUS"
|
|
|
+ placeholder="请选择业务状态"
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -64,7 +67,7 @@
|
|
|
</div>
|
|
|
<!-- 操作按钮 -->
|
|
|
<div class="table-operator">
|
|
|
- <a-button id="chainTransferOutList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
|
|
|
+ <a-button id="chainTransferOutList-add" type="prim ary" class="button-error" @click="openModal=true">新增</a-button>
|
|
|
</div>
|
|
|
<!-- 列表 -->
|
|
|
<s-table
|
|
@@ -80,12 +83,41 @@
|
|
|
<template slot="allocationLinkageOutNo" slot-scope="text, record">
|
|
|
<span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocationLinkageOutNo }}</span>
|
|
|
</template>
|
|
|
+ <!-- 财务状态 -->
|
|
|
+ <template slot="settleState" slot-scope="text, record">
|
|
|
+ <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
|
|
|
+ </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
- <a-button size="small" type="link" class="button-success" @click="handleExamine(record)" id="chainTransferOutList-examine-btn">审核</a-button>
|
|
|
- <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="chainTransferOutList-edit-btn">编辑</a-button>
|
|
|
- <a-button size="small" type="link" class="button-warning" @click="handleOut(record)" id="chainTransferOutList-out-btn">出库</a-button>
|
|
|
- <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="chainTransferOutList-del-btn">删除</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ v-if="record.state == 'WAIT_AUDIT'"
|
|
|
+ class="button-warning"
|
|
|
+ @click="handleExamine(record)"
|
|
|
+ id="chainTransferOutList-examine-btn">审核</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ v-if="record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT'"
|
|
|
+ class="button-info"
|
|
|
+ @click="handleEdit(record)"
|
|
|
+ id="chainTransferOutList-edit-btn">编辑</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ v-if="record.state == 'WAIT_OUT_WAREHOUSE'"
|
|
|
+ class="button-primary"
|
|
|
+ @click="handleOut(record)"
|
|
|
+ id="chainTransferOutList-out-btn">出库</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ v-if="record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT' || record.state == 'WAIT_OUT_WAREHOUSE'"
|
|
|
+ class="button-error"
|
|
|
+ @click="handleDel(record)"
|
|
|
+ id="chainTransferOutList-del-btn">删除</a-button>
|
|
|
+ <span v-if="record.state != 'WAIT_SUBMIT' && record.state != 'WAIT_AUDIT' && record.state != 'WAIT_OUT_WAREHOUSE'">--</span>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
<!-- 新增/编辑 -->
|
|
@@ -94,9 +126,10 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+import moment from 'moment'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import basicInfoModal from './basicInfoModal.vue'
|
|
|
-import { allocLinkageOutList } from '@/api/allocLinkageOut'
|
|
|
+import { allocLinkageOutList, allocLinkageAudit, allocLinkageOutDel, allocLinkageOutStock, getTenantList } from '@/api/allocLinkageOut'
|
|
|
export default {
|
|
|
components: { STable, VSelect, basicInfoModal },
|
|
|
data () {
|
|
@@ -104,9 +137,9 @@ export default {
|
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
|
createDate: undefined, // 创建时间
|
|
|
queryParam: { // 查询条件
|
|
|
- putTenantName: undefined, // 调往对象
|
|
|
+ putTenantSn: undefined, // 调往对象
|
|
|
allocationType: undefined, // 调出产品类型
|
|
|
- state: undefined // 单据状态
|
|
|
+ state: undefined // 业务状态
|
|
|
},
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
dateFormat: 'YYYY-MM-DD',
|
|
@@ -119,15 +152,22 @@ export default {
|
|
|
{ title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '调拨类型', dataIndex: 'allocationType', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '调拨类型', dataIndex: 'allocationTypeDictValue', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '财务状态', dataIndex: 'settleStateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 210, align: 'center', fixed: 'right' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
- this.queryParam = {}
|
|
|
+ // 创建时间
|
|
|
+ if (this.createDate && this.createDate.length > 0) {
|
|
|
+ this.queryParam.beginDate = moment(this.createDate[0]).format(this.dateFormat)
|
|
|
+ this.queryParam.endDate = moment(this.createDate[1]).format(this.dateFormat)
|
|
|
+ } else {
|
|
|
+ this.queryParam.beginDate = undefined
|
|
|
+ this.queryParam.endDate = undefined
|
|
|
+ }
|
|
|
return allocLinkageOutList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
const data = res.data
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
@@ -138,6 +178,7 @@ export default {
|
|
|
return data
|
|
|
})
|
|
|
},
|
|
|
+ putTenantSnData: [],
|
|
|
openModal: false, // 新增编辑 弹框
|
|
|
itemId: '' // 当前品牌id
|
|
|
}
|
|
@@ -149,7 +190,7 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.queryParam.putTenantName = undefined
|
|
|
+ this.queryParam.putTenantSn = undefined
|
|
|
this.queryParam.allocationType = undefined
|
|
|
this.queryParam.state = undefined
|
|
|
this.createDate = undefined
|
|
@@ -157,7 +198,7 @@ export default {
|
|
|
},
|
|
|
// 基本信息 保存
|
|
|
handleOk (data) {
|
|
|
- this.$router.push({ path: `/allocationManagement/chainTransferOut/add/${data.allocationLinkageOutSn}` })
|
|
|
+ this.$router.push({ path: `/allocationManagement/chainTransferOut/add/${data.id}/${data.allocationLinkageOutSn}` })
|
|
|
},
|
|
|
// 删除
|
|
|
handleDel (row) {
|
|
@@ -167,39 +208,46 @@ export default {
|
|
|
content: '删除后不可恢复,确定要进行删除吗?',
|
|
|
centered: true,
|
|
|
onOk () {
|
|
|
- // delectRolePower({
|
|
|
- // id: row.id
|
|
|
- // }).then(res => {
|
|
|
- // console.log(res, 'res1111')
|
|
|
- // if (res.status == 200) {
|
|
|
- // _this.$message.success(res.message)
|
|
|
- // _this.$refs.table.refresh()
|
|
|
- // }
|
|
|
- // })
|
|
|
+ allocLinkageOutDel({ sn: row.allocationLinkageOutSn }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ _this.$message.success(res.message)
|
|
|
+ _this.$refs.table.refresh()
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
// 出库
|
|
|
handleOut (row) {
|
|
|
-
|
|
|
+ const _this = this
|
|
|
+ this.$confirm({
|
|
|
+ title: '提示',
|
|
|
+ content: '确认要出库吗?',
|
|
|
+ centered: true,
|
|
|
+ onOk () {
|
|
|
+ allocLinkageOutStock({ sn: row.allocationLinkageOutSn }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ _this.$message.success(res.message)
|
|
|
+ _this.$refs.table.refresh()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
// 审核
|
|
|
- handleExamine () {
|
|
|
+ handleExamine (row) {
|
|
|
const _this = this
|
|
|
this.$confirm({
|
|
|
title: '提示',
|
|
|
content: '确认要审核通过吗?',
|
|
|
centered: true,
|
|
|
onOk () {
|
|
|
- // delectRolePower({
|
|
|
- // id: row.id
|
|
|
- // }).then(res => {
|
|
|
- // console.log(res, 'res1111')
|
|
|
- // if (res.status == 200) {
|
|
|
- // _this.$message.success(res.message)
|
|
|
- // _this.$refs.table.refresh()
|
|
|
- // }
|
|
|
- // })
|
|
|
+ allocLinkageAudit({ sn: row.allocationLinkageOutSn }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ _this.$message.success(res.message)
|
|
|
+ _this.$refs.table.refresh()
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -210,7 +258,23 @@ export default {
|
|
|
// 新增/编辑
|
|
|
handleEdit (row) {
|
|
|
this.$router.push({ path: `/allocationManagement/chainTransferOut/edit/${row.id}/${row.allocationLinkageOutSn}` })
|
|
|
+ },
|
|
|
+ // 调往对象
|
|
|
+ getPutTenantList () {
|
|
|
+ getTenantList({}).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.putTenantSnData = res.data
|
|
|
+ } else {
|
|
|
+ this.putTenantSnData = []
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
+ },
|
|
|
+ beforeRouteEnter (to, from, next) {
|
|
|
+ next(vm => {
|
|
|
+ vm.openModal = false
|
|
|
+ vm.getPutTenantList()
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
</script>
|