From db0b2480a7b3e81caa1ce95321f4403482a3e74a Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 11 Nov 2022 11:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=A4=96=E7=89=A9?=
 =?UTF-8?q?=E8=B5=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialsDeliveryForm.vue     |  1 +
 src/views/activiti/form/ProcessUdgetPlan.vue  |  2 +-
 .../activiti/form/ProcessUdgetPlanForm.vue    |  9 ++--
 .../ProcessWasteMaterialsList.vue             | 43 ++++++++++++++++++-
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index e525673..d83bd37 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -950,6 +950,7 @@
         //  console.log("this.data==============>",this.data) //部门id
         let params = {}
         params.id = sessionStorage.getItem('PUWWC_Id')//关联中间表id
+        console.log("322222232323",params.id);
         getAction(this.url.unitWasteWarehouseList, params).then((res) => {
           console.log(res)
           if (res.success) {
diff --git a/src/views/activiti/form/ProcessUdgetPlan.vue b/src/views/activiti/form/ProcessUdgetPlan.vue
index 66f4b3b..975975a 100644
--- a/src/views/activiti/form/ProcessUdgetPlan.vue
+++ b/src/views/activiti/form/ProcessUdgetPlan.vue
@@ -54,7 +54,7 @@
       hieg: {
         type: Boolean,
         default: true,
-        required: true
+        required: false
       }
     },
     // props: {
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 498348e..4721bf0 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -75,7 +75,7 @@
           :maxHeight="300"
           :action-button="true"
           :rowNumber="true"
-          :disabled="hieg"
+          :disabled="hiegs"
           :isabled = "isabled"
           :rowSelection="true"
           :actionButton="true"
@@ -251,7 +251,7 @@
         materialPrice:0,
         materialAmount:0,
         describes:'',
-        // hieg:true,
+        hiegs:true,
         historyBigId:[],
         isHistoryBigId:false,
         bigIdMerchandiseNews:[],
@@ -546,7 +546,7 @@
       hieg: {
         type: Boolean,
         default: true,
-        required: true
+        required: false
       }
     },
     computed: {
@@ -559,6 +559,7 @@
         }
         console.log("523452345",this.disabled);
         console.log("34523452345",this.hieg);
+        this.hiegs = this.hieg;
         return this.disabled
       },
       showFlowSubmitButton() {
@@ -633,7 +634,7 @@
 
       elect(val){
         if(val != undefined){
-          this.hieg = false;
+          this.hiegs = false;
           // this.fetchData();
           this.fetchDataRake();
         }
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index c7a98de..6a68d59 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -124,7 +124,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -198,9 +198,10 @@
       }
     },
     created() {
+
     this.getSuperFieldList();
     this.initDictConfig();
-    console.log()
+
     },
     computed: {
       importExcelUrl: function(){
@@ -208,6 +209,44 @@
       },
     },
     methods: {
+
+      loadData(arg) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        this.section();
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        console.log("params>>>>>>",params)
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records||res.result;
+            if(res.result.total)
+            {
+              this.ipagination.total = res.result.total;
+            }
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+
+      //获取部门ID
+      section(){
+        let ue= sessionStorage.getItem('USER_INFORMATION');
+        let res=JSON.parse(ue);
+        if(res.realname !== "管理员"){
+          this.queryParam.sysOrgCode = res.departIds;
+        }
+      },
+
       handleDetail(record){
         console.log("1111111111111111111111111111111111")
         console.log(record);