查询

src/components/jeecg/modal/ProcessDelivery.vue

@@ -38,12 +38,6 @@
                 </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="请选择物资类型"  />
-              </a-form-item>
-            </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -209,7 +203,7 @@
           {
             title: '流程发起部门',
             align: 'center',
-            dataIndex: 'sysOrgCode_dictText'
+            dataIndex: 'departId_dictText'
           },
           {
             title: '流程发起人',
@@ -503,6 +497,7 @@
         //this.loadData();
       },
       searchReset() {
+        this.processTime = []
         Object.keys(this.queryParam).forEach(key => {
           this.queryParam[key] = ''
         })

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -632,7 +632,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
       this.processUdgetPlanIds=ids.join(",");
       let params = {}
       params.ids = JSON.stringify(ids)
-     await this.requestSubTableData(this.url.list, params, this.processMaterialWarehousingListTable)
+     await this.requestSubTableDatas(this.url.list, params, this.processMaterialWarehousingListTable)
       // getAction(this.url.list,params).then((res)=>{
       //   if(res.success){
       //     console.log('将要回填的数据',res.result)

src/views/processmaterials/ProcessMaterialWarehousingListList.vue

@@ -116,7 +116,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/wastematerials/ProcessWasteMaterialsList.vue

@@ -4,7 +4,7 @@
       <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="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>
@@ -217,13 +217,13 @@
         libraryNames:[],
         Listmaterials:[],
         queryParamsUntil:[],
+        show: true
       }
     },
     created() {
-
-    this.getSuperFieldList();
-    this.initDictConfig();
-
+      this.showDepart();
+      this.getSuperFieldList();
+      this.initDictConfig();
     },
     computed: {
       importExcelUrl: function(){
@@ -272,13 +272,22 @@
         })
       },
 
+      //是否隐藏项目部查询
+      showDepart(){
+        let ue= sessionStorage.getItem('USER_INFORMATION');
+        let res=JSON.parse(ue);
+        if(res.realname == "管理员"){
+          this.show = false;
+        }
+      },
+
       //获取部门ID
       section(){
         let ue= sessionStorage.getItem('USER_INFORMATION');
         let res=JSON.parse(ue);
-        // console.log("23r4qwerfasdfgzsfh",res)
+        console.log("23r4qwerfasdfgzsfh",res)
         if(res.realname !== "管理员"){
-          this.queryParam.sysOrgCode = res.departIds;
+          this.queryParam.departIds = res.departIds;
         }
       },