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

入库关联预算

dev
kilo 2 years ago
parent
32cf07e3a8
commit
605a641c7c
2 changed files with 421 additions and 353 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. 67
      src/components/jeecg/modal/ProcessPlan.vue
  2. 41
      src/views/wastematerials/ProcessWasteMaterialsList.vue

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

@ -15,19 +15,42 @@
<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-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="物资类型">
<j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
placeholder="请选择物资类型" />
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker
format="YYYY-MM-DD"
:value="processTime"
:placeholder="['开始时间', '结束时间']"
@change="processDateChange"
/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="流程发起部门">
<a-select v-model="queryParam.departId" placeholder="请输入项目部" @mouseenter="getUnit" >
<a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.unit">{{item.unit_dictText}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="流程计划">
<j-dict-select-tag type="list" v-model="queryParam.processPlan" dictCode="process_plan"
placeholder="请选择物资类型" />
</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.needTime"></j-date>
</a-form-item>
</a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<span style="overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
@ -191,7 +214,7 @@
{
title: '流程发起部门',
align: 'center',
dataIndex: 'sysOrgCode_dictText'
dataIndex: 'departId_dictText'
},
{
title: '流程发起人',
@ -229,6 +252,7 @@
}*/
],
url: {
listByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
list: '/hy/processUdgetPlan/listByplan',
delete: '/hy/processUdgetPlan/delete',
deleteBatch: '/hy/processUdgetPlan/deleteBatch',
@ -258,7 +282,19 @@
selectedRowKeys: [],
modalWidth: MODAL_WIDTH,
changeData: '',
getFileData: false
getFileData: false,
//部门查询
queryParamsUntil:[],
//时间相关查询
processTime:[],
labelCol: {
xs: { span: 4 },
sm: { span: 4 },
},
wrapperCol: {
xs: { span: 20 },
sm: { span: 20 },
},
}
},
mounted() {
@ -271,6 +307,23 @@
}
},
methods: {
//流程发起时间
processDateChange: function (value, dateString) {
this.processTime = value
this.queryParam.processTimeBegin=dateString[0];
this.queryParam.processTimeEnd=dateString[1];
console.log(this.queryParam)
},
//加載項目部
getUnit(){
getAction(this.url.listByuntil).then((res) => {
if (res.success) {
this.queryParamsUntil = res.result.records||res.result;
console.log(this.queryParamsUntil)
}
})
},
// initDictConfig(){
// initDictOptions('sys_depart,depart_name,id').then((res) => {
// if (res.success) {
@ -439,10 +492,11 @@
//this.loadData();
},
searchReset() {
this.processTime=[]
Object.keys(this.queryParam).forEach(key => {
this.queryParam[key] = ''
})
//this.loadData(1);
this.loadData(1);
},
combineRowKey(record) {
let res = ''
@ -454,7 +508,6 @@
}
return res
},
clickThenCheck(record) {
return {
on: {

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

@ -4,30 +4,31 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目部">
<a-select v-model="queryParam.departId" placeholder="请输入项目部" @mouseenter="getUnit" >
<a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.unit">{{item.unit_dictText}}</a-select-option>
</a-select>
</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.materialGroup"></a-input>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="物料">
<a-input placeholder="请输入物料" v-model="queryParam.materialNumber"></a-input>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<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="4" :lg="7" :md="8" :sm="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="核算属性">
<j-dict-select-tag placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></j-dict-select-tag>
<!-- <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></a-input>-->
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="所属部门">
<j-select-depart v-model="queryParam.departId" />
<!-- <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></a-input>-->
</a-form-item>
</a-col>
@ -207,13 +208,15 @@
exportXlsUrl: "/wastematerials/processWasteMaterials/exportXls",
importExcelUrl: "wastematerials/processWasteMaterials/importExcel",
listByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
queryLibraryName: "/libraryassociation/processLibraryAssociation/list",
},
dictOptions:{},
superFieldList:[],
libraryNames:[],
Listmaterials:[]
Listmaterials:[],
queryParamsUntil:[],
}
},
created() {
@ -228,7 +231,19 @@
},
},
methods: {
//加載項目部
getUnit(){
getAction(this.url.listByuntil).then((res) => {
if (res.success) {
this.queryParamsUntil = res.result.records||res.result;
console.log(this.queryParamsUntil)
// // for (let i = 0; i <this.queryParamsUntil.length; i++) {
// // console.log(this.queryParamsUntil[i].unit)
// // }
// // console.log(this.queryParamsUntilList)
}
})
},
loadData(arg) {
if(!this.url.list){
this.$message.error("请设置url.list属性!")
@ -294,7 +309,7 @@
//根据字典Code, 初始化字典数组
ajaxGetDictItems(this.dictCode, null).then((res) => {
if (res.success) {
// console.log(res.result);
console.log(res.result);
this.dictOptions = res.result;
}
})

Write Preview
Loading…
Cancel
Save