diff --git a/src/components/jeecg/modal/ProcessDelivery.vue b/src/components/jeecg/modal/ProcessDelivery.vue
index 8134ac2..5da24f5 100644
--- a/src/components/jeecg/modal/ProcessDelivery.vue
+++ b/src/components/jeecg/modal/ProcessDelivery.vue
@@ -31,10 +31,10 @@
/>
-
+
- {{item.unit_dictText}}
+ {{item.departName}}
@@ -173,6 +173,7 @@
mixins: [JeecgListMixin],
data() {
return {
+ showde: true,
visible: false,
confirmLoading: false,
title: '物资出库流程管理列表',
@@ -231,7 +232,7 @@
// }
],
url: {
- listByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
+ listByuntil: '/unitwaste/processUnitWasteWarehouseCode/listAll',
list: '/hy/processMaterialsDelivery/listByDel',
delete: '/hy/processMaterialsDelivery/delete',
deleteBatch: '/hy/processMaterialsDelivery/deleteBatch',
@@ -293,12 +294,23 @@
},
}
},*/
+ created() {
+ this.showDepart()
+ },
computed: {
showSearchFlag() {
return this.queryInfo && this.queryInfo.length > 0
}
},
methods: {
+ //是否隐藏流程发起部门查询
+ showDepart(){
+ let ue= sessionStorage.getItem('USER_INFORMATION');
+ let res=JSON.parse(ue);
+ if(res.realname == "管理员"){
+ this.showde = false;
+ }
+ },
//流程发起时间
processDateChange: function (value, dateString) {
@@ -340,6 +352,16 @@
this.ipagination.current = 1;
}
var params = this.getQueryParams();//查询条件
+
+ let ue= sessionStorage.getItem('USER_INFORMATION');
+ let res=JSON.parse(ue);
+ if(res.realname !== "管理员"){
+ if(!!res.departIds){
+ params.departId = res.departIds ;
+ }else{
+ return ;
+ }
+ }
this.loading = true;
console.log("params>>>>>>",params)
getAction(this.url.list, params).then((res) => {
diff --git a/src/components/jeecg/modal/ProcessPlan.vue b/src/components/jeecg/modal/ProcessPlan.vue
index 53cc112..67a96e1 100644
--- a/src/components/jeecg/modal/ProcessPlan.vue
+++ b/src/components/jeecg/modal/ProcessPlan.vue
@@ -31,17 +31,17 @@
/>
-
+
- {{item.unit_dictText}}
+ {{item.departName}}
+ placeholder="请选择计划类型" />