|
@@ -51,17 +51,17 @@
|
|
<a-button size="small" type="danger" @click="handleDel(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 0 8px">删除</a-button>
|
|
<a-button size="small" type="danger" @click="handleDel(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 0 8px">删除</a-button>
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
- <!-- 新增/编辑仓库 -->
|
|
|
|
- <inventory-unChecking-modal :openModal="openModal" :nowData="nowData" :itemId="itemId" @ok="handleOk" @close="closeModal" />
|
|
|
|
|
|
+ <!-- 新增/编辑盘点单 -->
|
|
|
|
+ <inventory-checking-tips-modal :openModal="openModal" :nowData="nowData" :itemId="itemId" @ok="handleOk" @close="closeModal" />
|
|
</a-card>
|
|
</a-card>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import { warehouseFindAll, warehouseDel } from '@/api/warehouse'
|
|
import { warehouseFindAll, warehouseDel } from '@/api/warehouse'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
-import inventoryUnCheckingModal from './unCheckingModal.vue'
|
|
|
|
|
|
+import inventoryCheckingTipsModal from './checkingTipsModal.vue'
|
|
export default {
|
|
export default {
|
|
- components: { STable, VSelect, inventoryUnCheckingModal },
|
|
|
|
|
|
+ components: { STable, VSelect, inventoryCheckingTipsModal },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
queryParam: { // 查询条件
|
|
queryParam: { // 查询条件
|
|
@@ -75,9 +75,9 @@ export default {
|
|
{ title: '序号', dataIndex: 'no', width: 70, align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: 70, align: 'center' },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: 180, align: 'center' },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: 180, align: 'center' },
|
|
{ title: '盘点单号', dataIndex: 'nsso', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '盘点单号', dataIndex: 'nsso', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '库存总款数', dataIndex: 'no', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '库存总数量', dataIndex: 'no', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '开单人', dataIndex: 'no', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '库存总款数', dataIndex: 'no3', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
+ { title: '库存总数量', dataIndex: 'n4o', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
+ { title: '开单人', dataIndex: 'neo', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单据审核时间', dataIndex: 'shcreateDate', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单据审核时间', dataIndex: 'shcreateDate', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '状态', dataIndex: 'name', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '状态', dataIndex: 'name', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '盘点类型', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '盘点类型', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -86,10 +86,26 @@ export default {
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
- return warehouseFindAll( this.queryParam ).then(res => {
|
|
|
|
- const data = res.data
|
|
|
|
- this.disabled = false
|
|
|
|
- return data
|
|
|
|
|
|
+ // return warehouseFindAll( this.queryParam ).then(res => {
|
|
|
|
+ // const data = res.data
|
|
|
|
+ // this.disabled = false
|
|
|
|
+ // return data
|
|
|
|
+ // })
|
|
|
|
+ const _this = this
|
|
|
|
+ return new Promise(function(resolve, reject){
|
|
|
|
+ const data = {
|
|
|
|
+ pageNo: 1,
|
|
|
|
+ pageSize: 10,
|
|
|
|
+ list: [
|
|
|
|
+ { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
|
|
|
|
+ ],
|
|
|
|
+ count: 10
|
|
|
|
+ }
|
|
|
|
+ for (var i = 0; i < data.list.length; i++) {
|
|
|
|
+ data.list[i].no = i + 1
|
|
|
|
+ }
|
|
|
|
+ _this.disabled = false
|
|
|
|
+ resolve(data)
|
|
})
|
|
})
|
|
},
|
|
},
|
|
openModal: false, // 新增编辑 弹框
|
|
openModal: false, // 新增编辑 弹框
|
|
@@ -135,6 +151,7 @@ export default {
|
|
content: '删除后不可恢复,确定要进行删除吗?',
|
|
content: '删除后不可恢复,确定要进行删除吗?',
|
|
okText: '确定',
|
|
okText: '确定',
|
|
cancelText: '取消',
|
|
cancelText: '取消',
|
|
|
|
+ centered: true,
|
|
onOk () {
|
|
onOk () {
|
|
// warehouseDel({
|
|
// warehouseDel({
|
|
// id: row.id
|
|
// id: row.id
|