|
@@ -20,12 +20,12 @@
|
|
|
<a-select
|
|
|
placeholder="请选择调出对象"
|
|
|
allowClear
|
|
|
- id="chainTransferInList-putTenantSn"
|
|
|
- v-model="queryParam.putTenantSn"
|
|
|
+ id="chainTransferInList-outTenantSn"
|
|
|
+ v-model="queryParam.outTenantSn"
|
|
|
: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-option v-for="item in outTenantSnData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -104,6 +104,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+import moment from 'moment'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import { allocLinkagePutList, allocLinkagePutAudit, allocLinkagePutSubmit } from '@/api/allocLinkagePut'
|
|
|
import { getTenantList } from '@/api/allocLinkageOut'
|
|
@@ -114,7 +115,7 @@ export default {
|
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
|
time: undefined, // 入库时间
|
|
|
queryParam: { // 查询条件
|
|
|
- outTenantName: undefined, // 调出对象
|
|
|
+ outTenantSn: undefined, // 调出对象
|
|
|
allocationType: undefined, // 调拨产品类型
|
|
|
state: undefined, // 业务状态
|
|
|
settleState: undefined
|
|
@@ -139,7 +140,14 @@ export default {
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
- this.queryParam = {}
|
|
|
+ // 入库时间
|
|
|
+ if (this.time && this.time.length > 0) {
|
|
|
+ this.queryParam.beginDate = moment(this.time[0]).format(this.dateFormat)
|
|
|
+ this.queryParam.endDate = moment(this.time[1]).format(this.dateFormat)
|
|
|
+ } else {
|
|
|
+ this.queryParam.beginDate = undefined
|
|
|
+ this.queryParam.endDate = undefined
|
|
|
+ }
|
|
|
return allocLinkagePutList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
const data = res.data
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
@@ -150,7 +158,7 @@ export default {
|
|
|
return data
|
|
|
})
|
|
|
},
|
|
|
- putTenantSnData: []
|
|
|
+ outTenantSnData: []
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -160,7 +168,7 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.queryParam.outTenantName = undefined
|
|
|
+ this.queryParam.outTenantSn = undefined
|
|
|
this.queryParam.allocationType = undefined
|
|
|
this.queryParam.state = undefined
|
|
|
this.queryParam.settleState = undefined
|
|
@@ -217,9 +225,9 @@ export default {
|
|
|
getPutTenantList () {
|
|
|
getTenantList({}).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
- this.putTenantSnData = res.data
|
|
|
+ this.outTenantSnData = res.data
|
|
|
} else {
|
|
|
- this.putTenantSnData = []
|
|
|
+ this.outTenantSnData = []
|
|
|
}
|
|
|
})
|
|
|
},
|