From 6e6420c65c3fb18840190ee61688a89557d060a2 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 23 Apr 2024 13:44:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constructionSite/constructionSite.vue            |  2 ++
 .../views/claimAndRefund/receive/receiveApply.vue    |  2 ++
 .../claimAndRefund/receiveByCq/receiveApply.vue      |  2 ++
 .../store/newBuy/newDevices/newDevicesAccept.vue     |  1 -
 .../newBuy/newDevices/newDevicesWarehousing.vue      | 12 ++++++------
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
index 0f69eefc..b2bd6e9b 100644
--- a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
+++ b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
@@ -543,6 +543,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.unitId = ''
+      this.queryParams.lotId  = ''
       this.resetForm('queryForm')
       this.handleQuery()
     },
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
index faa467ad..85d6af43 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
@@ -415,6 +415,8 @@
             /** 重置按钮操作 */
             resetQuery() {
                 this.queryParams.time = []
+                this.queryParams.unitId = ''
+                this.queryParams.proId  = ''
                 this.resetForm('queryForm')
                 this.GetUnitData()
                 this.GetProData()
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
index 40b8f62a..14918e39 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
@@ -431,6 +431,8 @@
             /** 重置按钮操作 */
             resetQuery() {
                 this.queryParams.time = []
+                this.queryParams.unitId = ''
+                this.queryParams.proId  = ''
                 this.resetForm('queryForm')
                 this.GetUnitData()
                 this.GetProData()
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index 519abcbf..3ff849fb 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -227,7 +227,6 @@
             :autosize="{ minRows: 4, maxRows: 6}"
             placeholder="请输入通知内容"
             style="width: 80%;"
-            disabled
           />
         </el-form-item>
       </el-form>
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 9201f191..7c8a8773 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -290,7 +290,7 @@
                         "
           >入库单</div>
           <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
-            <div
+            <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -300,7 +300,7 @@
                             "
             >
               <span>工程名称：</span>
-            </div>
+            </div> -->
             <div
               class="item"
               style="
@@ -312,7 +312,7 @@
             >
               <span>日期：</span>
             </div>
-            <div
+            <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -322,8 +322,8 @@
                             "
             >
               <span>领料单号</span>
-            </div>
-            <div
+            </div> -->
+            <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -333,7 +333,7 @@
                             "
             >
               <span>车辆信息：</span>
-            </div>
+            </div> -->
           </div>
           <el-table
             :data="printTableData"

From d2d9f5b6c423fd0cbf265dd912ea0c8291956573 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 23 Apr 2024 14:35:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
index 309ebc4d..8e9334d1 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -126,7 +126,7 @@
             size="mini"
             type="primary"
             @click="handleNumReturn(scope.row)"
-            v-if="!isView&&(scope.row.manageType=='1'||'2')&&scope.row.num>0"
+            v-if="!isView&&(scope.row.manageType=='1'||scope.row.manageType=='2')&&scope.row.num>0"
           >数量退料</el-button>
           <el-button
             size="mini"