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

帐外物资页面修改

dev
kilo 3 years ago
parent
f2604d9b00
commit
26a7076fe6
2 changed files with 20 additions and 100 deletions
Split View
  1. 116
      src/views/wastematerials/ProcessWasteMaterialsList.vue
  2. 4
      src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue

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

@ -5,44 +5,24 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="供应商">
<a-input placeholder="请输入供应商" v-model="queryParam.supplier"></a-input>
<a-form-item label="物料组">
<a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="供应商描述">
<a-input placeholder="请输入供应商描述" v-model="queryParam.supplierDescription"></a-input>
<a-form-item label="物料">
<a-input placeholder="请输入物料" v-model="queryParam.material"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="物料组">
<a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="物料">
<a-input placeholder="请输入物料" v-model="queryParam.material"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="物料描述">
<a-input placeholder="请输入物料描述" v-model="queryParam.materialDescription"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="生产日期">
<j-date placeholder="请选择生产日期" v-model="queryParam.productionDate"></j-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="保质期">
<j-date placeholder="请选择保质期" v-model="queryParam.expirationDate"></j-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="入库时间">
<a-input placeholder="请输入入库时间" v-model="queryParam.inboundTime"></a-input>
<a-form-item label="核算属性">
<a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes"></a-input>
</a-form-item>
</a-col>
</template>
@ -120,21 +100,9 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
<a class="ant-dropdown-link" @click="handleDetail(record)">查看详情<a-icon type="down" /></a>
</a-dropdown>
</span>
@ -151,14 +119,12 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ProcessWasteMaterialsModal from './modules/ProcessWasteMaterialsModal'
import JDate from '@/components/jeecg/JDate.vue'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
export default {
name: 'ProcessWasteMaterialsList',
mixins:[JeecgListMixin, mixinDevice],
components: {
JDate,
ProcessWasteMaterialsModal,
JSuperQuery,
},
@ -177,16 +143,6 @@
return parseInt(index)+1;
}
},
{
title:'供应商',
align:"center",
dataIndex: 'supplier'
},
{
title:'供应商描述',
align:"center",
dataIndex: 'supplierDescription'
},
{
title:'物料组',
align:"center",
@ -202,66 +158,28 @@
align:"center",
dataIndex: 'materialDescription'
},
{
title:'库存位置',
align:"center",
dataIndex: 'materialStorageId'
},
{
title:'库存仓位',
align:"center",
dataIndex: 'freightSpace'
},
{
title:'计量单位',
align:"center",
dataIndex: 'unitMeasurement'
},
{
title:'数量',
align:"center",
dataIndex: 'number'
},
{
title:'单价',
align:"center",
dataIndex: 'price'
},
{
title:'金额',
align:"center",
dataIndex: 'money'
},
{
title:'生产日期',
align:"center",
dataIndex: 'productionDate',
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:'入库时间',
title:'现有数量',
align:"center",
dataIndex: 'inboundTime'
dataIndex: 'existingNumber'
},
{
title:'入库人',
title:'消耗数量',
align:"center",
dataIndex: 'warehousePeople'
dataIndex: 'consumeNumber'
},
{
title:'核算属性',
title: '查看详情',
dataIndex: 'action',
align:"center",
dataIndex: 'accountingAttributes'
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
@ -297,6 +215,8 @@
fieldList.push({type:'string',value:'materialStorageId',text:'库存位置',dictCode:''})
fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位',dictCode:''})
fieldList.push({type:'int',value:'existingNumber',text:'现有数量',dictCode:''})
fieldList.push({type:'string',value:'consumeNumber',text:'消耗数量',dictCode:''})
fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})

4
src/views/wastematerials/modules/ProcessWasteMaterialsForm.vue
Unescape View File

@ -180,7 +180,7 @@
this.model = Object.assign({}, record);
this.visible = true;
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unitMeasurement','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
this.form.setFieldsValue(pick(this.model,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unitMeasurement','existingNumber','consumeNumber','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
})
},
//渲染流程表单数据
@ -226,7 +226,7 @@
})
},
popupCallback(row){
this.form.setFieldsValue(pick(row,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unitMeasurement','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
this.form.setFieldsValue(pick(row,'supplier','supplierDescription','materialGroup','material','materialDescription','materialStorageId','freightSpace','unitMeasurement','existingNumber','consumeNumber','number','price','money','productionDate','expirationDate','inboundTime','warehousePeople','accountingAttributes'))
},
}
}

Write Preview
Loading…
Cancel
Save