java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

添加入库表

dev
caoyizhong 2 years ago
parent
2022db3041
commit
56d874f73d
4 changed files with 168 additions and 154 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/components/jeecg/modal/ProcessPlan.vue
  2. 307
      src/views/processmaterials/ProcessMaterialWarehousingListList.vue
  3. 3
      src/views/processmaterials/modules/ProcessMaterialWarehousingListModal.vue
  4. 2
      src/views/wastematerials/ProcessWasteMaterialsList.vue

10
src/components/jeecg/modal/ProcessPlan.vue
Unescape View File

@ -156,6 +156,9 @@
<a-tab-pane tab="预算计划采购流程物料清单表" key="1">
<ProcessUdgetPlanMaterialList :mainId="selectedRowKeys"/>
</a-tab-pane>
<a-tab-pane tab="预算计划采购流程物料已入清单表" key="2">
<ProcessMaterialWarehousingListList :mainId="selectedMainId" />
</a-tab-pane>
</a-tabs>
</a-card>
@ -167,6 +170,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@/api/manage'
import { filterObj } from '@/utils/util'
import ProcessUdgetPlanMaterialList from '../../../views/processmaterials/ProcessUdgetPlanMaterialList'
import ProcessMaterialWarehousingListList from '@views/processmaterials/ProcessMaterialWarehousingListList'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
import '@/assets/less/TableExpand.less'
@ -177,6 +181,7 @@ export default {
props: ['multi', 'code', 'groupId', 'param'],
components: {
ProcessUdgetPlanMaterialList,
ProcessMaterialWarehousingListList,
JSuperQuery,
JDictSelectTag
},
@ -278,6 +283,7 @@ export default {
total: 0
},
selectedMainId: '',
materialWarehousingListID: undefined,
superFieldList: [],
selectedRowKeys: [],
modalWidth: MODAL_WIDTH,
@ -352,8 +358,8 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
// console.log("selectedRowKeys>>>>>>>>>>>>>>>",selectedRowKeys)
// console.log("selectionRows>>>>>>>>>>>>>>>>>>>",selectionRows)
console.log("selectedRowKeys>>>>>>>>>>>>>>>",selectedRowKeys)
console.log("selectionRows>>>>>>>>>>>>>>>>>>>",selectionRows)
this.selectedMainId = selectedRowKeys[0]
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows

307
src/views/processmaterials/ProcessMaterialWarehousingListList.vue
Unescape View File

@ -1,34 +1,34 @@
<template>
<a-card :bordered="false" :class="'cust-erp-sub-tab'">
<!-- 操作按钮区域 -->
<div class="table-operator" v-if="mainId">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('物资入库流程清单表')">导出</a-button>
<a-upload
name="file"
:showUploadList="false"
:multiple="false"
:headers="tokenHeader"
:action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- <div class="table-operator" v-if="mainId">-->
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('物资入库流程清单表')">导出</a-button>-->
<!-- <a-upload-->
<!-- name="file"-->
<!-- :showUploadList="false"-->
<!-- :multiple="false"-->
<!-- :headers="tokenHeader"-->
<!-- :action="importExcelUrl"-->
<!-- @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">导入</a-button>-->
<!-- </a-upload>-->
<!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
<!-- </a-dropdown>-->
<!-- </div>-->
<!-- table区域-begin -->
<!-- &lt;!&ndash; table区域-begin &ndash;&gt;-->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
<!-- </div>-->
<a-table
ref="table"
@ -40,41 +40,44 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
<!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"-->
<template slot="materialDescription" slot-scope="text, record">
<j-ellipsis :value="text" :length="15"/>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</span>
<!-- <template slot="htmlSlot" slot-scope="text">-->
<!-- <div v-html="text"></div>-->
<!-- </template>-->
<!-- <template slot="imgSlot" slot-scope="text">-->
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>-->
<!-- <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
<!-- </template>-->
<!-- <template slot="fileSlot" slot-scope="text">-->
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
<!-- <a-button-->
<!-- v-else-->
<!-- :ghost="true"-->
<!-- type="primary"-->
<!-- icon="download"-->
<!-- size="small"-->
<!-- @click="downloadFile(text)">-->
<!-- 下载-->
<!-- </a-button>-->
<!-- </template>-->
<!-- <span slot="action" slot-scope="text, record">-->
<!-- <a @click="handleEdit(record)">编辑</a>-->
<!-- <a-divider type="vertical" />-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!-- <a>删除</a>-->
<!-- </a-popconfirm>-->
<!-- </span>-->
</a-table>
</div>
<processMaterialWarehousingList-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></processMaterialWarehousingList-modal>
<!-- <processMaterialWarehousingList-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></processMaterialWarehousingList-modal>-->
</a-card>
</template>
@ -89,21 +92,21 @@
name: "ProcessMaterialWarehousingListList",
mixins:[JeecgListMixin],
components: { ProcessMaterialWarehousingListModal,JSuperQuery },
props:{
mainId:{
type:String,
default:'',
required:false
props: {
mainId: {
type: String,
required: false
}
},
watch:{
mainId:{
immediate: true,
handler(val) {
console.log("val============",val)
if(!this.mainId){
this.clearList()
}else{
this.queryParam['processMaterialWarehousingId'] = val
this.queryParam['id'] = val
this.loadData(1);
}
}
@ -128,81 +131,64 @@
{
title:'物料组',
align:"center",
dataIndex: 'materialGroup_dictText',
dataIndex: 'materialClassify',
},
{
title:'物料号',
align:"center",
dataIndex: 'materialNumber_dictText',
},
{
title:'物料描述',
align:"center",
dataIndex: 'materialDescription'
},
{
title:'仓储地点_id',
align:"center",
dataIndex: 'unitWasteWarehouseCodeId_dictText',
},
{
title:'生产时间',
align:"center",
dataIndex: 'productionTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'保质期',
align:"center",
dataIndex: 'expirationDate',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'是否到货',
align:"center",
dataIndex: 'arrivalNotice_dictText',
},
{
title:'入库时间',
align:"center",
dataIndex: 'storageTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'入库人',
align:"center",
dataIndex: 'librarySign_dictText',
dataIndex: 'materialNumber',
},
{
title:'核算属性',
align:"center",
dataIndex: 'accountingAttributes_dictText',
},
{
title:'器材编号',
title:'物料名称及规格型号',
align:"center",
dataIndex: 'equipment_dictText',
dataIndex: 'materialDescription',
scopedSlots: { customRender: 'materialDescription' },
},
// {
// title:'仓储地点_id',
// align:"center",
// dataIndex: 'unitWasteWarehouseCodeId_dictText',
// },
// {
// title:'生产时间',
// align:"center",
// dataIndex: 'productionTime',
// customRender:function (text) {
// return !text?"":(text.length>10?text.substr(0,10):text)
// }
// },
// {
// title:'保质期',
// align:"center",
// dataIndex: 'expirationDate',
// customRender:function (text) {
// return !text?"":(text.length>10?text.substr(0,10):text)
// }
// },
// {
// title:'是否到货',
// align:"center",
// dataIndex: 'arrivalNotice_dictText',
// },
// {
// title:'器材编号',
// align:"center",
// dataIndex: 'equipment_dictText',
// },
{
title:'WBS',
align:"center",
dataIndex: 'wbs_dictText',
},
{
title:'物料名称及规格型号',
align:"center",
dataIndex: 'materialName_dictText',
},
// {
// title:'物料名称及规格型号',
// align:"center",
// dataIndex: 'materialName_dictText',
// },
{
title:'单位',
align:"center",
dataIndex: 'materialUnit_dictText',
dataIndex: 'materialUnit',
},
{
title:'单价',
@ -210,14 +196,19 @@
dataIndex: 'materialPrice'
},
{
title:'金额',
title:'数量',
align:"center",
dataIndex: 'materialAmount'
dataIndex: 'materialQuantity'
},
// {
// title:'金额',
// align:"center",
// dataIndex: 'materialAmount'
// },
{
title:'供应商',
align:"center",
dataIndex: 'supplier'
dataIndex: 'supplierId'
},
{
title:'批次',
@ -225,42 +216,60 @@
dataIndex: 'supplierBatch'
},
{
title:'批次入库时间',
title:'入库时间',
align:"center",
dataIndex: 'warehousingTime',
dataIndex: 'storageTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'用途',
align:"center",
dataIndex: 'purpose'
},
{
title:'删除标志',
align:"center",
dataIndex: 'defFlag'
},
{
title:'删除时间',
title:'入库人',
align:"center",
dataIndex: 'delTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
dataIndex: 'librarySign',
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' },
}
// {
// title:'核算属性',
// align:"center",
// dataIndex: 'accountingAttributes_dictText',
// },
// {
// title:'批次入库时间',
// align:"center",
// dataIndex: 'warehousingTime',
// customRender:function (text) {
// return !text?"":(text.length>10?text.substr(0,10):text)
// }
// },
// {
// title:'用途',
// align:"center",
// dataIndex: 'purpose'
// },
// {
// title:'删除标志',
// align:"center",
// dataIndex: 'defFlag'
// },
// {
// title:'删除时间',
// align:"center",
// dataIndex: 'delTime',
// customRender:function (text) {
// return !text?"":(text.length>10?text.substr(0,10):text)
// }
// },
// {
// title: '操作',
// dataIndex: 'action',
// align:"center",
// fixed:"right",
// width:147,
// scopedSlots: { customRender: 'action' },
// }
],
url: {
list: "/hy/processMaterialWarehousing/listProcessMaterialWarehousingListByMainId",
list: "/hy/processMaterialWarehousing/queryMaterialWarehousingListByMainId",
delete: "/hy/processMaterialWarehousing/deleteProcessMaterialWarehousingList",
deleteBatch: "/hy/processMaterialWarehousing/deleteBatchProcessMaterialWarehousingList",
exportXlsUrl: "/hy/processMaterialWarehousing/exportProcessMaterialWarehousingList",
@ -304,5 +313,5 @@
}
</script>
<style scoped>
@import '~@assets/less/common.less'
@import '~@assets/less/common.less';
</style>

3
src/views/processmaterials/modules/ProcessMaterialWarehousingListModal.vue
Unescape View File

@ -145,9 +145,8 @@
},
props:{
mainId:{
type:String,
type:Array,
required:false,
default:''
}
},
data () {

2
src/views/wastematerials/ProcessWasteMaterialsList.vue
Unescape View File

@ -212,7 +212,7 @@
delete: "/wastematerials/processWasteMaterials/delete",
deleteBatch: "/wastematerials/processWasteMaterials/deleteBatch",
exportXlsUrl: "/wastematerials/processWasteMaterials/ownExportXls",
importExcelUrl: "wastematerials/processWasteMaterials/importExcel",
importExcelUrl: "/wastematerials/processWasteMaterials/importExcel",
userRoleUrl: "/sys/user/queryUserRolePart",
listByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
queryLibraryName: "/libraryassociation/processLibraryAssociation/list",

Write Preview
Loading…
Cancel
Save