Browse Source

帐外+总库查询显示

dev
kilo 2 years ago
parent
commit
1a5851d1aa
  1. 220
      src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
  2. 226
      src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
  3. 4
      src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
  4. 16
      src/views/wastematerials/ProcessWasteMaterialsLists.vue

220
src/views/suppliesstronger/ProcessSuppliesStrongerList.vue

@ -2,122 +2,31 @@
<div>
<a-card :bordered="false" v-if="!item">
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<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.processId"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
<!-- {{ toggleSearchStatus ? '收起' : '展开' }}-->
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
<!-- </a>-->
<!-- </span>-->
<!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="供应商">
<a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
</a-form-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="供应商描述">-->
<!-- <j-search-select-tag placeholder="请选择供应商描述" v-model="queryParam.supplierDescription" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料组">
<!-- <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup" dict=",,"/>-->
<a-select v-model="queryParam.itemGroup" placeholder="请选择" >
<a-select-option v-for="(item,index) in bigId" :key="index" :value="item.itemGroup">{{item.itemGroup}}</a-select-option>
</a-select>
<a-input placeholder="请输入物料组" v-model="queryParam.itemGroup"></a-input>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料">
<a-input placeholder="请输入物料" v-model="queryParam.item" dict=",,"/>
<a-input placeholder="请输入物料" v-model="queryParam.item"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料描述">
<a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription" dict=",,"/>
<a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="核算属性">
<j-dict-select-tag placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></j-dict-select-tag>
</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.unitMeasurement"></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.amount"></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.price"></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.rates"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="仓储地点">-->
<!-- <j-search-select-tag placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="存储仓位">-->
<!-- <j-search-select-tag placeholder="请选择存储仓位" v-model="queryParam.freightSpace" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="生产时间">-->
<!-- <j-date placeholder="请选择生产时间" v-model="queryParam.productionTime"></j-date>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="保质期">-->
<!-- <j-date placeholder="请选择保质期" v-model="queryParam.expirationDate"></j-date>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="批次">-->
<!-- <j-search-select-tag placeholder="请选择批次" v-model="queryParam.batch" dict=",,"/>-->
<!-- </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.arrivalNotice"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="入库时间">-->
<!-- <j-date placeholder="请选择入库时间" v-model="queryParam.inboundTime"></j-date>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="入库人">-->
<!-- <j-search-select-tag placeholder="请选择入库人" v-model="queryParam.librarySign" dict=",,"/>-->
<!-- </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.accountingAttributes"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
</template>
</a-row>
</a-form>
@ -133,8 +42,6 @@
</a-upload>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<!-- 高级查询区域 -->
<!-- <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>
@ -186,9 +93,7 @@
<span slot="action" slot-scope="text, record" style="overflow: hidden;" class="table-page-search-submitButtons">
<a-dropdown>
<a class="ant-dropdown-link" @click="handleDetaills(record)">详情<a-icon type="down" /></a>
<a class="ant-dropdown-link" @click="handleDetaills(record)">详情<a-icon type="down" /></a>
</a-dropdown>
</span>
@ -197,7 +102,6 @@
<process-supplies-stronger-modal ref="modalForm" @ok="modalFormOk"></process-supplies-stronger-modal>
</a-card>
<!--<ProcessSuppliesStrongerLists v-if="item" @strongerExit = "strongerExit"/>-->
</div>
</template>
@ -223,7 +127,6 @@
},
data () {
return {
// item:false,
description: '物资总库管理页面',
//
bigId:[],
@ -238,21 +141,6 @@
return parseInt(index)+1;
}
},
// {
// title:'',
// align:"center",
// dataIndex: 'processId'
// },
{
title:'供应商',
align:"center",
dataIndex: 'supplierId'
},
// {
// title:'',
// align:"center",
// dataIndex: 'supplierDescription_dictText'
// },
{
title:'物料组',
align:"center",
@ -278,69 +166,10 @@
align:"center",
dataIndex: 'amount'
},
// {
// title:'',
// align:"center",
// dataIndex: 'price'
// },
// {
// title:'',
// align:"center",
// dataIndex: 'rates'
// },
// {
// title:'_id',
// align:"center",
// dataIndex: 'unitWasteWarehouseCodeId_dictText'
// },
// {
// title:'',
// align:"center",
// dataIndex: 'freightSpace_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: 'batch_dictText'
// },
// {
// title:'',
// align:"center",
// dataIndex: 'arrivalNotice'
// },
// {
// title:'',
// align:"center",
// dataIndex: 'inboundTime',
// customRender:function (text) {
// return !text?"":(text.length>10?text.substr(0,10):text)
// }
// },
// {
// title:'',
// align:"center",
// dataIndex: 'librarySign_dictText'
// },
{
title:'核算属性',
align:"center",
dataIndex: 'accountingAttributes'
dataIndex: 'accountingAttributes_dictText'
},
{
title: '详情',
@ -372,36 +201,31 @@
},
},
methods: {
handleDetaills(){
// this.item = true;
this.$router.push({path:'/src/views/suppliesstronger/ProcessSuppliesStrongerLists'})
},
strongerExit(){
this.item = false;
handleDetaills(record){
this.$router.push({name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',params:{item: record.item}})
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'processId',text:'流程表单号',dictCode:''})
fieldList.push({type:'string',value:'supplierId',text:'供应商',dictCode:''})
fieldList.push({type:'sel_search',value:'supplierDescription',text:'供应商描述',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'sel_search',value:'itemGroup',text:'物料组',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'sel_search',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'sel_search',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'itemGroup',text:'物料组',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位',dictCode:''})
fieldList.push({type:'int',value:'amount',text:'数量',dictCode:''})
fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
fieldList.push({type:'BigDecimal',value:'rates',text:'金额',dictCode:''})
fieldList.push({type:'sel_search',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'sel_search',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'date',value:'productionTime',text:'生产时间'})
fieldList.push({type:'string',value:'expirationDate',text:'保质期'})
fieldList.push({type:'sel_search',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'arrivalNotice',text:'是否到货',dictCode:''})
fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
fieldList.push({type:'sel_search',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
this.superFieldList = fieldList

226
src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@ -1,95 +1,54 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<h3 >总库物资管理详情页</h3>
<div class="table-page-search-wrapper">
<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.processId"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="供应商">
<a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
</a-form-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="供应商描述">-->
<!-- <j-search-select-tag placeholder="请选择供应商描述" v-model="queryParam.supplierDescription" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="物料组">-->
<!-- <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="物料">-->
<!-- <a-input placeholder="请输入物料" v-model="queryParam.item" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="物料描述">-->
<!-- <a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription" dict=",,"/>-->
<!-- </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.unitMeasurement"></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.amount"></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.price"></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.rates"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="供应商">
<a-input placeholder="请输入供应商信息" v-model="queryParam.supplier"></a-input>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料组">
<a-input placeholder="请输入物料组" v-model="queryParam.itemGroup"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料">
<a-input placeholder="请输入物料" v-model="queryParam.item" disabled="disabled"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料描述">
<a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="仓储地点">
<a-input placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>
<a-input placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="存储仓位">
<a-input placeholder="请选择存储仓位" v-model="queryParam.freightSpace" dict=",,"/>
<a-input placeholder="请选择存储仓位" v-model="queryParam.freightSpace"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="生产时间">
<j-date placeholder="请选择生产时间" v-model="queryParam.productionTime"></j-date>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="保质期">
<j-date placeholder="请选择保质期" v-model="queryParam.expirationDate"></j-date>
<a-form-item label="入库批次">
<a-input placeholder="请选择批次" v-model="queryParam.batch"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="批次">
<a-input placeholder="请选择批次" v-model="queryParam.batch" dict=",,"/>
<a-form-item label="保质期">
<a-input placeholder="请选择保质期" v-model="queryParam.expirationDate"/>
</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.arrivalNotice"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="入库时间">
<j-date placeholder="请选择入库时间" v-model="queryParam.inboundTime"></j-date>
@ -97,24 +56,9 @@
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="入库人">
<a-input placeholder="请选择入库人" v-model="queryParam.librarySign" dict=",,"/>
<a-input placeholder="请选择入库人" v-model="queryParam.librarySign"/>
</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.accountingAttributes"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- </template>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
<!-- {{ toggleSearchStatus ? '收起' : '展开' }}-->
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
<!-- </a>-->
<!-- </span>-->
<!-- </a-col>-->
</a-row>
</a-form>
</div>
@ -122,7 +66,6 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<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>
@ -183,18 +126,6 @@
</a-button>
</template>
<span slot="action" slot-scope="text, record" style="overflow: hidden;" class="table-page-search-submitButtons">
<a-dropdown>
<a class="ant-dropdown-link" @click="handleDetaills(record)">查看详情<a-icon type="down" /></a>
</a-dropdown>
</span>
</a-table>
</div>
@ -211,6 +142,7 @@
import JDate from '@/components/jeecg/JDate.vue'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
import { getAction } from '@api/manage'
export default {
@ -224,8 +156,20 @@
},
data () {
return {
queryParam: {
supplier: null,
itemGroup: null,
item: this.$route.params.item,
itemDescription: null,
unitWasteWarehouseCodeId: null,
freightSpace: null,
productionTime: null,
batch: null,
expirationDate: null,
inboundTime: null,
librarySign: null,
},
description: '物资总库管理详情页面',
//
columns: [
{
title: '#',
@ -245,7 +189,7 @@
{
title:'供应商',
align:"center",
dataIndex: 'supplierId'
dataIndex: 'supplier'
},
{
title:'供应商描述',
@ -308,10 +252,7 @@
{
title:'保质期',
align:"center",
dataIndex: 'expirationDate',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
dataIndex: 'expirationDate'
},
{
title:'批次',
@ -339,19 +280,11 @@
{
title:'核算属性',
align:"center",
dataIndex: 'accountingAttributes'
},
// {
// title: '',
// dataIndex: 'action',
// align:"center",
// fixed:"right",
// width:147,
// scopedSlots: { customRender: 'action' }
// }
dataIndex: 'accountingAttributes_dictText'
}
],
url: {
list: "/suppliesstronger/processSuppliesStronger/list",
list: "/suppliesstronger/processSuppliesStronger/lists",
delete: "/suppliesstronger/processSuppliesStronger/delete",
deleteBatch: "/suppliesstronger/processSuppliesStronger/deleteBatch",
exportXlsUrl: "/suppliesstronger/processSuppliesStronger/exportXls",
@ -363,7 +296,15 @@
}
},
created() {
this.getSuperFieldList();
//
this.judgeRouterParam();
this.getSuperFieldList();
},
watch: {
$route() {
this.queryParam.item = this.$route.params.item
this.loadData()
}
},
computed: {
importExcelUrl: function(){
@ -371,34 +312,61 @@
},
},
methods: {
handleDetaills(){
this.item = true;
searchReset(){
this.queryParam = {
supplier: null,
itemGroup: null,
item: this.$route.params.item,
itemDescription: null,
unitWasteWarehouseCodeId: null,
freightSpace: null,
productionTime: null,
batch: null,
expirationDate: null,
inboundTime: null,
librarySign: null,
del_flag: 0
},
getAction(this.url.list,this.queryParam).then((res)=>{
if(res.success){
this.dataSource=res.result.records;
}
});
},
handlereturn(){
this.$emit("strongerExit",false);
judgeRouterParam(){
if (this.$route.params.item == null){
this.$router.go(-1);
}
},
initDictConfig(){
},
loadData(){
getAction(this.url.list,this.queryParam).then((res)=>{
if(res.success){
this.dataSource=res.result.records;
}
});
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'processId',text:'流程表单号',dictCode:''})
fieldList.push({type:'string',value:'supplierId',text:'供应商',dictCode:''})
fieldList.push({type:'sel_search',value:'supplierDescription',text:'供应商描述',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'sel_search',value:'itemGroup',text:'物料组',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'sel_search',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'sel_search',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'itemGroup',text:'物料组',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位',dictCode:''})
fieldList.push({type:'int',value:'amount',text:'数量',dictCode:''})
fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
fieldList.push({type:'BigDecimal',value:'rates',text:'金额',dictCode:''})
fieldList.push({type:'sel_search',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'sel_search',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'date',value:'productionTime',text:'生产时间'})
fieldList.push({type:'date',value:'expirationDate',text:'保质期'})
fieldList.push({type:'sel_search',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
fieldList.push({type:'string',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'int',value:'arrivalNotice',text:'是否到货',dictCode:''})
fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
fieldList.push({type:'sel_search',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
this.superFieldList = fieldList
}

4
src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue

@ -10,7 +10,7 @@
</a-col>
<a-col :span="8">
<a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['supplierId']" placeholder="请输入供应商id" />
<a-input v-decorator="['supplier']" placeholder="请输入供应商" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -251,7 +251,7 @@
that.confirmLoading = false;
})
}
})
},
popupCallback(row){

16
src/views/wastematerials/ProcessWasteMaterialsLists.vue

@ -20,11 +20,11 @@
<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" :read-only="true"></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" disabled="disabled"></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>
@ -267,6 +267,12 @@
this.judgeRouterParam();
this.getSuperFieldList();
},
watch: {
$route() {
this.queryParam.material = this.$route.params.material
this.loadData()
}
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;

Loading…
Cancel
Save