From 5040f02ecd93174b97e3c3c258706610c5c67333 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Fri, 23 Dec 2022 14:10:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/applyHome.vue           | 4 ++--
 src/views/activiti/applyList.vue           | 6 +++---
 src/views/activiti/doneManage.vue          | 4 ++--
 src/views/activiti/processFinishManage.vue | 4 ++--
 src/views/activiti/processInsManage.vue    | 4 ++--
 src/views/activiti/todoManage.vue          | 4 ++--
 src/views/waste/ProcessWasteList.vue       | 6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/activiti/applyHome.vue b/src/views/activiti/applyHome.vue
index e8de5b4..af229c0 100644
--- a/src/views/activiti/applyHome.vue
+++ b/src/views/activiti/applyHome.vue
@@ -219,11 +219,11 @@
   }
   /deep/.ant-modal-content{
     height: 100%;
-    overflow-y: hidden;
+    overflow-y: scroll;
    }
   /deep/.ant-modal-body{
     height: 100%;
-    overflow-y: scroll;
+    /*overflow-y: scroll;*/
   }
   /deep/.ant-modal{
     top:45px
diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index 48053ab..ade6a5f 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -533,7 +533,7 @@
         this.modalCancelVisible = true;
       },
       handelSubmitCancel(v) {
-        this.loading=true;
+        // this.loading=true;
         this.$confirm({
           title: '撤回',
           content: `您确定要撤回吗？`,
@@ -599,11 +599,11 @@
 }
 /deep/.ant-modal-content{
   height: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
 }
 /deep/.ant-modal-body{
   height: 100%;
-  overflow-y: scroll;
+  /*overflow-y: scroll;*/
 }
 /deep/.ant-modal{
   top:45px
diff --git a/src/views/activiti/doneManage.vue b/src/views/activiti/doneManage.vue
index 0218ff9..d8fc2de 100644
--- a/src/views/activiti/doneManage.vue
+++ b/src/views/activiti/doneManage.vue
@@ -272,11 +272,11 @@ export default {
 }
 /deep/.ant-modal-content{
   height: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
 }
 /deep/.ant-modal-body{
   height: 100%;
-  overflow-y: scroll;
+  /*overflow-y: scroll;*/
 }
 /deep/.ant-modal{
   top:45px
diff --git a/src/views/activiti/processFinishManage.vue b/src/views/activiti/processFinishManage.vue
index 01bb11d..47eea2d 100644
--- a/src/views/activiti/processFinishManage.vue
+++ b/src/views/activiti/processFinishManage.vue
@@ -277,11 +277,11 @@ export default {
 }
 /deep/.ant-modal-content{
   height: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
 }
 /deep/.ant-modal-body{
   height: 100%;
-  overflow-y: scroll;
+  /*overflow-y: scroll;*/
 }
 /deep/.ant-modal{
   top:45px
diff --git a/src/views/activiti/processInsManage.vue b/src/views/activiti/processInsManage.vue
index 5235fee..0338be0 100644
--- a/src/views/activiti/processInsManage.vue
+++ b/src/views/activiti/processInsManage.vue
@@ -339,11 +339,11 @@ export default {
   }
   /deep/.ant-modal-content{
     height: 100%;
-    overflow-y: hidden;
+    overflow-y: scroll;
   }
   /deep/.ant-modal-body{
     height: 100%;
-    overflow-y: scroll;
+    /*overflow-y: scroll;*/
   }
   /deep/.ant-modal{
     top:45px
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index 9d445f6..862a63e 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -717,11 +717,11 @@
 }
 /deep/.ant-modal-content{
   height: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
 }
 /deep/.ant-modal-body{
   height: 100%;
-  overflow-y: scroll;
+  /*overflow-y: scroll;*/
 }
 /deep/.ant-modal{
   top:45px
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
index 2a57b8b..52f40cf 100644
--- a/src/views/waste/ProcessWasteList.vue
+++ b/src/views/waste/ProcessWasteList.vue
@@ -28,14 +28,14 @@
           <a-col :xl="4" :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.unit">{{item.departName}}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
           <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="存放地点">
               <a-select v-model="queryParam.depositary" 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.unit">{{item.departName}}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -226,7 +226,7 @@
           exportXlsUrl: "/waste/processWaste/exportXls",
           importExcelUrl: "waste/processWaste/importExcel",
           userRoleUrl: "/sys/user/queryUserRolePart",
-          listByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
+          listByuntil: '/unitwaste/processUnitWasteWarehouseCode/listAllNoPage',
         },
         dictOptions:{},
         superFieldList:[],