出库报废按部门显示,部门查询修改

src/components/jeecg/modal/ProcessDelivery.vue

@@ -31,10 +31,10 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24" :hidden="showde">
               <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-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.id">{{item.departName}}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -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) => {

src/components/jeecg/modal/ProcessPlan.vue

@@ -31,17 +31,17 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24" :hidden="showdw">
               <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-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.id">{{item.departName}}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="流程计划">
                 <j-dict-select-tag type="list" v-model="queryParam.processPlan" dictCode="process_plan"
-                                   placeholder="请选择物资类型"  />
+                                   placeholder="请选择计划类型"  />
               </a-form-item>
             </a-col>
             <!--<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -188,6 +188,7 @@ export default {
   mixins: [JeecgListMixin],
   data() {
     return {
+      showdw: true,
       visible: false,
       confirmLoading: false,
       title: '预算计划采购流程管理列表',
@@ -257,7 +258,7 @@ export default {
          }*/
       ],
       url: {
-        listByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
+        listByuntil: '/unitwaste/processUnitWasteWarehouseCode/listAll',
         list: '/hy/processUdgetPlan/listByplan',
         delete: '/hy/processUdgetPlan/delete',
         deleteBatch: '/hy/processUdgetPlan/deleteBatch',
@@ -306,6 +307,9 @@ export default {
   mounted() {
     //this.loadColumnsInfo()
   },
+  created() {
+    this.showDepart()
+  },
   watch: {},
   computed: {
     showSearchFlag() {
@@ -313,6 +317,16 @@ export default {
     }
   },
   methods: {
+
+    //是否隐藏流程发起部门查询
+    showDepart(){
+      let ue= sessionStorage.getItem('USER_INFORMATION');
+      let res=JSON.parse(ue);
+      if(res.realname == "管理员"){
+        this.showdw = false;
+      }
+    },
+
     //流程发起时间
     processDateChange: function (value, dateString) {
       this.processTime = value
@@ -375,6 +389,15 @@ export default {
       }
       this.onClearSelected()
       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;
       getAction(this.url.list, params).then((res) => {
         if (res.success) {

src/views/wastematerials/ProcessWasteMaterialsList.vue

@@ -7,7 +7,7 @@
             <a-col :xl="6" :lg="7" :md="8" :sm="24" :hidden="show">
               <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-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.id">{{item.departName}}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -219,7 +219,7 @@
           exportXlsUrl: "/wastematerials/processWasteMaterials/ownExportXls",
           importExcelUrl: "/wastematerials/processWasteMaterials/importExcel",
           userRoleUrl: "/sys/user/queryUserRolePart",
-          listByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
+          listByuntil: '/unitwaste/processUnitWasteWarehouseCode/listAll',
           queryLibraryName: "/libraryassociation/processLibraryAssociation/list",
 
         },