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

修改采购名称查询

dev
caoyizhong 2 years ago
parent
00b5b084a2
commit
754b6cd104
11 changed files with 231 additions and 90 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. BIN
      public/static/excle/物资清单表12323123_1672369326884.xlsx
  2. 83
      src/components/jeecg/PEditableTable.vue
  3. 6
      src/mixins/JeecgListMixin.js
  4. 4
      src/utils/hasPermission.js
  5. 142
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  6. 14
      src/views/description/ProcessDescriptionList.vue
  7. 10
      src/views/materialstorage/ProcessMaterialStorageList.vue
  8. 24
      src/views/merchandisenews/ProcessMerchandiseNewsList.vue
  9. 10
      src/views/supplier/ProcessSupplierList.vue
  10. 10
      src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
  11. 18
      src/views/waste/ProcessWasteList.vue

BIN
public/static/excle/物资清单表12323123_1672369326884.xlsx
View File

Binary file not shown.

83
src/components/jeecg/PEditableTable.vue
Unescape View File

@ -537,7 +537,6 @@
@change="(v)=>handleSearchSelectChange(v,id,row,col)"
allowClear
:filterOption="false"
/>
<!-- :filterOption="filterOption"-->
<span
@ -714,6 +713,19 @@
type: String,
default: 'orderNum'
},
//查询类型
dragSortType: {
type: String,
},
//归口部门
putUnder: {
type: String,
},
//切换
qeihuan: {
type: String,
},
// 是否一直显示编辑框，如果为false则只有点击的时候才出现输入框
alwaysEdit: {
type: Boolean,
@ -891,6 +903,15 @@
// console.log('watch.rows:', cloneObject({ val, old }))
}
},
qeihuan:{
immediate: true,
handler: function (newValue) {
// console.log(newValue,"监听到了");
this.$nextTick( () =>{
this.getClone();
});
}
},
dataSource: {
immediate: true,
handler: function (newValue) {
@ -963,7 +984,17 @@
shuChange(val,b,c){
// console.log("sdtgfsd",val,b,c)
},
//清除数据
getClone(){
let ids= [];
this.getValues((a,b,c)=>{
b.forEach(it => {
ids.push(it.id);
});
this.removeRows(ids);
});
},
a(){
// console.log("执行l");
// this.getSelection((a,b,c)=>{
@ -2154,7 +2185,9 @@
}
}
// 存储输入的值
this.inputValues[index][column.key] = value
this.inputValues[index][column.key] = value;
// console.log("-=-=-=",value)
// this.searchOption(value,null,index);
// console.log("sadfgasdf",value);
// //查询信息
// let pam ={
@ -2675,7 +2708,7 @@
this.elemValueChange(FormTypes.list_multi, row, column, value)
},
handleSearchSelectChange(value, id, row, column) {
console.log("handleSearchSelectChange=================",value,id,row,column)
// console.log("handleSearchSelectChange=================",value,id,row,column)
this.searchSelectValues = this.bindValuesChange(value, id, 'searchSelectValues')
this.validateOneInput(value, row, column, this.notPassedIds, true, 'change')
this.elemValueChange(FormTypes.sel_search, row, column, value)
@ -2689,8 +2722,19 @@
searchOption (input,pro,index){
// console.log("searchOption=========",input,pro,index);
return new Promise(async (resolve, reject) => {
if(index == 2 && !input){
return;
}
let ib = false;
let par = {
materialsNumber: input
materialsNumber: input,
materialType: this.dragSortType,
materialDepart: this.putUnder
}
// console.log("this.dragSortType",this.dragSortType);
let pattern = new RegExp("[\u4E00-\u9FA5]+");
if(pattern.test(input) && index == 2){
ib = true;
}
let url = '' ;
if(!this.appropriationPlan){
@ -2715,8 +2759,19 @@
}else{
val = item.merchandiseNewsId
}
// console.log("item=======",item);
let name = null;
if(ib){
// console.log("item11111111",item.merchandiseName);
name = item.merchandiseName;
// val = item.materialsNumber;
}else{
// console.log("item11111111",item.materialsNumber);
name = item.materialsNumber;
}
// console.log(val,"================");
a.push({
title : item.materialsNumber,
title : name,
value : val,
disabled: isb
})
@ -2728,24 +2783,6 @@
});
// await getAction(this.url.merchandiseNewsList,par).then( (res)=>{
// // getAction(this.url.descriptionRake,par).then((res)=>{
// let a= [];
// if(res.success){
// let pam = res.result.records||res.result;
// console.log("222222222222222===",pam);
// pam.forEach( item => {
// a.push({
// title : item.materialClassify,
// value : item.id,
// })
// })
// }
// // this.columns[index].options = a
// // console.log( this.columns[index].options)
// resolve( this.columns[index].options = a );
// });
})
},

6
src/mixins/JeecgListMixin.js
Unescape View File

@ -56,7 +56,7 @@ export const JeecgListMixin = {
},
created() {
if(!this.disableMixinCreated){
console.log(' -- mixin created -- ')
// console.log(' -- mixin created -- ')
this.loadData();
//初始化字典配置 在自己页面定义
this.initDictConfig();
@ -69,7 +69,7 @@ export const JeecgListMixin = {
if ($antTable[0]){
width = $antTable[0].clientWidth;
}
console.log("$antTable",$antTable)
// console.log("$antTable",$antTable)
return {
// x:'max-content',
x:width,
@ -123,7 +123,7 @@ export const JeecgListMixin = {
})
},
initDictConfig(){
console.log("--这是一个假的方法!")
// console.log("--这是一个假的方法!")
},
handleSuperQuery(params, matchType) {
//高级查询方法

4
src/utils/hasPermission.js
Unescape View File

@ -5,7 +5,7 @@ const hasPermission = {
//console.log(options);
Vue.directive('has', {
inserted: (el, binding, vnode)=>{
console.log("页面权限控制----");
// console.log("页面权限控制----");
//console.time()
//节点权限处理，如果命中则不进行全局权限处理
if(!filterNodePermission(el, binding, vnode)){
@ -68,7 +68,7 @@ export function filterNodePermission(el, binding, vnode) {
* 全局权限控制
*/
export function filterGlobalPermission(el, binding, vnode) {
console.log("全局页面权限--Global--");
// console.log("全局页面权限--Global--");
let permissionList = [];
let allPermissionList = [];

142
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -101,7 +101,7 @@
</a-form>
</j-form-container>
<!-- 子表单区域 -->
<a-tabs v-model="activeKey" @change="handleChangeTabs" ref="tabs" style="background-color: #fbfcfd;margin-top: 20px;padding: 15px 10px">
<a-tabs v-model="activeKey" @change="handleChangeTabs" ref="tabs" style="background-color: #fbfcfd;margin-top: 20px;padding: 15px 10px;">
<a-tab-pane tab="预算计划采购流程物料清单表" :key="refKeys[0]" :forceRender="true">
<p-editable-table
ref="processUdgetPlanMaterial"
@ -109,7 +109,10 @@
:columns="processUdgetPlanMaterialTable.columns"
:dataSource="processUdgetPlanMaterialTable.dataSource"
@valueChange="onSelect"
:maxHeight="220"
:maxHeight="200"
:dragSortType = this.assigneesText
:putUnder = this.putUnder
:qeihuan = this.qeihuan
:action-button="true"
:rowNumber="true"
:disabled="hiegs"
@ -280,6 +283,8 @@
materialAmount: 0,
describes: '',
hiegs: true,
qeihuan: '',
putUnder: '',
historyBigId: [],
historyPrices: [],
wateNumber: 0,
@ -420,13 +425,13 @@
{
title: '物料名称及规格型号',
key: 'materialName',
type: FormTypes.input,
type: FormTypes.sel_search,
disabled: this.disabled,
// type: FormTypes.sel_search,
// dictCode: '',
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
options: []
},
{
@ -705,7 +710,7 @@
// console.log("执行了",a,b,c);
},
shifu() {
console.log('执行了')
// console.log('执行了')
this.isShifu = true
},
@ -755,7 +760,12 @@
this.hiegs = false
// this.fetchData();
// this.fetchDataRake()
this.assigneesText = val
this.assigneesText = val;
this.qeihuan = val;
this.putUnder = null; //归口部门
this.form.setFieldsValue({
putUnder: null
})
this.fetchMerchandiseNews()
}
if(this.routePlanName == '采购员'){
@ -948,35 +958,41 @@
}
}
if (!b) {
// console.log("进来了111");
await this.fetchMerchandiseNews(null, record.row.materialNumber)
// console.log("进来了111",record.value);
await this.fetchMerchandiseNews(null, record.value);
}
}
this.isShifu = false
if (record.column.key !== 'materialPrice' && record.column.key !== 'materialQuantity') {
if (!!record.row.materialNumber && this.isBu !== record.row.materialNumber) {
// console.log("2出发了");
if (record.column.key == 'materialNumber' || record.column.key == 'materialName') {
// console.log("进来了111",record);
// if (!!record.row.materialName && this.isBu !== record.row.materialName) {
// console.log("2出发了");
let materialName = {}
this.bigIdMerchandiseNewsList.forEach(item => {
if (item.id === record.row.materialNumber) {
if (item.id === record.value) {
console.log("=====",item);
materialName = {
materialClassify: item.materialClassify,
name: item.merchandiseName,
unit: item.materialsUnit,
supplierId: item.supplierId,
descriptionId: item.descriptionId
descriptionId: item.descriptionId,
materialsNumber: item.id,
merchandiseName: item.merchandiseName,
type: !item.type ? null : item.type
}
this.form.setFieldsValue({
putUnder: item.materialDepart
})
this.putUnder = item.materialDepart;
}
})
// console.log("============", this.bigIdMerchandiseNewsList.length);
if (!!record.row.id && Object.keys(materialName).length > 0) {
await this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
// console.log("bbbbbbbbbbbbbb",b)
b.forEach(item => {
if (item.materialNumber === record.row.materialNumber && !!item.materialGroup && !record.row.materialGroup) {
if (item.materialNumber === record.value && !!item.materialGroup ) {
let values = [
{
rowKey: record.row.id,
@ -993,7 +1009,10 @@
}
]
// console.log("sadf1111")
this.$refs.processUdgetPlanMaterial.setValues(values)
this.$refs.processUdgetPlanMaterial.setValues(values);
this.isShifu = false;
this.fetchMerchandiseNews();
return
}
@ -1009,10 +1028,10 @@
{
rowKey: record.row.id,
values: {
'materialNumber': record.row.materialNumber,
'materialNumber': materialName.materialsNumber,
'materialGroup': materialName.descriptionId,
// 'materialGroup': this.materialId,
'materialSeries': record.row.materialSeries,
'materialSeries': materialName.type,
'materialName': materialName.name,
'materialUnit': materialName.unit,
'supplierId': materialName.supplierId
@ -1020,10 +1039,83 @@
}
]
this.$refs.processUdgetPlanMaterial.setValues(values)
this.isBu = record.row.materialNumber
this.isBu = record.value;
isEr = false
}
}
// }
// if (!!record.row.materialNumber && this.isBu !== record.row.materialNumber) {
// console.log("2出发了");
// let materialName = {}
// this.bigIdMerchandiseNewsList.forEach(item => {
// if (item.id === record.row.materialNumber) {
// materialName = {
// materialClassify: item.materialClassify,
// name: item.merchandiseName,
// unit: item.materialsUnit,
// supplierId: item.supplierId,
// descriptionId: item.descriptionId
// }
// this.form.setFieldsValue({
// putUnder: item.materialDepart
// })
// }
// })
//
// if (!!record.row.id && Object.keys(materialName).length > 0) {
// await this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
// // console.log("bbbbbbbbbbbbbb",b)
// b.forEach(item => {
// if (item.materialNumber === record.row.materialNumber && !!item.materialGroup && !record.row.materialGroup) {
// let values = [
// {
// rowKey: record.row.id,
// values: {
// 'materialGroup': '',
// 'materialNumber': '',
// 'materialSeries': '',
// 'materialName': '',
// 'materialUnit': '',
// 'supplierId': '',
// 'materialAmount': '',
// 'materialType': ''
// }
// }
// ]
// // console.log("sadf1111")
// this.$refs.processUdgetPlanMaterial.setValues(values)
// return
//
// }
// })
//
// })
//
// this.processUdgetPlanMaterialTable.columns[0].options.push({
// title: materialName.materialClassify,
// value: materialName.descriptionId
// })
// let values = [
// {
// rowKey: record.row.id,
// values: {
// 'materialNumber': record.row.materialNumber,
// 'materialGroup': materialName.descriptionId,
// // 'materialGroup': this.materialId,
// 'materialSeries': record.row.materialSeries,
// 'materialName': materialName.name,
// 'materialUnit': materialName.unit,
// 'supplierId': materialName.supplierId
// }
// }
// ]
// this.$refs.processUdgetPlanMaterial.setValues(values)
// this.isBu = record.row.materialNumber
// isEr = false
// }
// }
}
if (!!record.row.materialQuantity && !!record.row.materialPrice && isEr) {
@ -1067,6 +1159,9 @@
if (!!this.assigneesText) {
par.materialType = this.assigneesText
}
if (!!this.putUnder) {
par.materialDepart = this.putUnder;
}
this.bigIdMerchandiseNews = []
this.bigIdMerchandiseNewsList = []
let qc = []
@ -1074,9 +1169,12 @@
if (this.processUdgetPlanMaterialTable.columns[1].options.length > 0) {
this.processUdgetPlanMaterialTable.columns[1].options = []
}
if (this.processUdgetPlanMaterialTable.columns[2].options.length > 0) {
this.processUdgetPlanMaterialTable.columns[2].options = []
}
this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
b.forEach(item => {
if (item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null) {
if (!!item.materialNumber) {
numberList.push(item.materialNumber)
}
})
@ -1099,7 +1197,7 @@
})
numberList.forEach(num => {
qc.forEach(i => {
// console.log("111111111111111",i.value)
// console.log("111111111111111",i.value,num)
if (num === i.value && !!num) {
i.disabled = true
}

14
src/views/description/ProcessDescriptionList.vue
Unescape View File

@ -44,17 +44,17 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'description:add'">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('品名分类')" v-has="'description:export'">导出</a-button>
<a-button type="primary" icon="download" @click="downloadText('/static/excle/品名分类导入模板_166799700623.xlsx','品名分类导入模板.xlsx')" v-h="'merchandiseNews:import'">品名分类导入模板</a-button>
<a-button type="primary" icon="download" @click="downloadText('/static/excle/品名分类导入模板_166799700623.xlsx','品名分类导入模板.xlsx')" v-has="'merchandiseNews:import'">品名分类导入模板</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import" v-has="'description:export'" v-h="'merchandiseNews:import'">导入</a-button>
<a-button type="primary" icon="import" v-has="'merchandiseNews: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" v-has="'merchandiseNews:delete'"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px" v-has="'description:delete'" v-h="'merchandiseNews:delete'"> 批量操作 <a-icon type="down" /></a-button>
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'merchandiseNews:delete'">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete" v-has="'merchandiseNews:delete'"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<a-button style="margin-left: 8px" @click="batchDel"><a-icon type="delete" />删除 </a-button>
</a-dropdown>
</div>

10
src/views/materialstorage/ProcessMaterialStorageList.vue
Unescape View File

@ -56,11 +56,11 @@
</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" v-has="'materialStorageList:dekete'"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px" v-has="'materialStorageList:delete'"> 批量操作 <a-icon type="down" /></a-button>
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'materialStorageList:dekete'">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete" v-has="'materialStorageList:dekete'"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<a-button style="margin-left: 8px" @click="batchDel"><a-icon type="delete" />删除</a-button>
</a-dropdown>
</div>

24
src/views/merchandisenews/ProcessMerchandiseNewsList.vue
Unescape View File

@ -62,11 +62,11 @@
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="物资区分">
<a-form-item label="物资属性">
<!-- <a-input placeholder="供应商" v-model="queryParam.materialsUnit"></a-input>-->
<a-select v-model="queryParam.materialsUnit" placeholder="请选择" >
<a-select-option value="0">一般物资</a-select-option>
<a-select-option value="1">资产物资</a-select-option>
<a-select v-model="queryParam.materialAttributes" placeholder="请选择" >
<a-select-option value="一般类物资">一般类物资</a-select-option>
<a-select-option value="资产类物资">资产类物资</a-select-option>
</a-select>
</a-form-item>
</a-col>
@ -116,11 +116,11 @@
</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" v-has="'merchandiseNews:delete'"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px" v-has="'merchandiseNews:delete'"> 批量操作 <a-icon type="down" /></a-button>
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'merchandiseNews:delete'">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete" v-has="'merchandiseNews:delete'"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<a-button style="margin-left: 8px" @click="batchDel"><a-icon type="delete" />删除</a-button>
</a-dropdown>
</div>
@ -299,6 +299,12 @@
scopedSlots: { customRender: 'materialType' },
dataIndex: 'materialType'
},
{
title:'物资属性',
align:"center",
scopedSlots: { customRender: 'materialAttributes' },
dataIndex: 'materialAttributes'
},
// {
// title:'简介概要',
// align:"center",

10
src/views/supplier/ProcessSupplierList.vue
Unescape View File

@ -75,11 +75,11 @@
<!-- 高级查询区域 -->
<!-- <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" v-has="'regulate:delete'"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px" v-has="'regulate:delete'"> 批量操作 <a-icon type="down" /></a-button>
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'regulate:delete'">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete" v-has="'regulate:delete'"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<a-button style="margin-left: 8px"@click="batchDel"><a-icon type="delete" />删除</a-button>
</a-dropdown>
</div>

10
src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
Unescape View File

@ -67,11 +67,11 @@
</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" v-has="'unitWaste:delete'"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px" v-has="'unitWaste:delete'"> 批量操作 <a-icon type="down" /></a-button>
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'unitWaste:delete'">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete" v-has="'unitWaste:delete'"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<a-button style="margin-left: 8px" @click="batchDel"><a-icon type="delete" />删除</a-button>
</a-dropdown>
</div>

18
src/views/waste/ProcessWasteList.vue
Unescape View File

@ -53,17 +53,17 @@
<div class="table-operator">
<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-button type="primary" icon="download" @click="handleExportXls('废旧物资库表')">导出</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表')" v-has="'waste:export'">导出</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-button type="primary" icon="import" v-has="'waste:import'">导入</a-button>
</a-upload>
<a-button type="primary" icon="download" @click="downloadText('/static/excle/废旧物资库表导入模板_1669801633970.xlsx','报废导入模板.xlsx')">报废导入模板</a-button>
<a-button @click="handleInto" type="primary">电缆</a-button>
<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-button type="primary" icon="download" @click="downloadText('/static/excle/废旧物资库表导入模板_1669801633970.xlsx','报废导入模板.xlsx')" >报废导入模板</a-button>
<a-button @click="handleInto" type="primary" v-has="'waste:cable'">电缆</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'waste:delete'">
<!-- <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" @click="batchDel"><a-icon type="delete" />删除</a-button>
</a-dropdown>
</div>

Write Preview
Loading…
Cancel
Save