|
@@ -16,7 +16,16 @@
|
|
|
<a-input id="inventoryCheckList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-item label="仓库">
|
|
|
+ <warehouse
|
|
|
+ v-model="queryParam.warehouseSn"
|
|
|
+ id="inventoryCheckList-warehouseSn"
|
|
|
+ placeholder="请选择仓库"
|
|
|
+ />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
<a-form-item label="盘点状态">
|
|
|
<v-select
|
|
|
v-model="queryParam.checkState"
|
|
@@ -28,7 +37,7 @@
|
|
|
></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
<a-form-item label="监盘状态">
|
|
|
<v-select
|
|
|
v-model="queryParam.checkSuperviseState"
|
|
@@ -94,11 +103,12 @@ import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import inventoryCheckAddModal from './addModal.vue'
|
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
+import warehouse from '@/views/common/chooseWarehouse.js'
|
|
|
import { checkWarehouseList, checkWarehouseStartCheck } from '@/api/checkWarehouse'
|
|
|
export default {
|
|
|
name: 'InventoryCheckList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, inventoryCheckAddModal, commonModal },
|
|
|
+ components: { STable, VSelect, inventoryCheckAddModal, commonModal, warehouse },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -107,6 +117,7 @@ export default {
|
|
|
deleteFlag: this.$route.params.type,
|
|
|
checkWarehouseNo: '',
|
|
|
checkState: undefined,
|
|
|
+ warehouseSn: undefined,
|
|
|
checkSuperviseState: undefined
|
|
|
},
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
@@ -145,12 +156,13 @@ export default {
|
|
|
if (this.queryParam.deleteFlag == '0') { // 正常
|
|
|
arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
- { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '14%', align: 'center' },
|
|
|
+ { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '10%', align: 'center' },
|
|
|
+ { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '盘点状态', dataIndex: 'checkStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '监盘状态', dataIndex: 'checkSuperviseStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '盘点提交时间', dataIndex: 'checkTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '监盘提交时间', dataIndex: 'checkSuperviseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '财务确认时间', dataIndex: 'financeAuditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '盘点单创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -159,12 +171,13 @@ export default {
|
|
|
} else if (this.queryParam.deleteFlag == '1') { // 已作废
|
|
|
arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
- { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '14%', align: 'center' },
|
|
|
+ { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '10%', align: 'center' },
|
|
|
+ { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '盘点状态', dataIndex: 'checkStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '监盘状态', dataIndex: 'checkSuperviseStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '盘点提交时间', dataIndex: 'checkTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '监盘提交时间', dataIndex: 'checkSuperviseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '盘点单创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '盘点单作废时间', dataIndex: 'deleteTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|