From 09ece59d52071e4d2de263c0533b3247eb431c37 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Sat, 5 Jul 2025 14:09:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(goods):=20=E5=95=86=E5=93=81-=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E8=AE=BE=E7=BD=AE=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/goodsManage/goodsList/goodsEdit/jcsz.vue | 7 +++++--
 src/views/goodsManage/goodsRelease/jcsz.vue        | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
index 49c09ef..c453f30 100644
--- a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
+++ b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
@@ -540,13 +540,16 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item :label="'标签提示'">
+              <el-col :span="8">
+                <el-form-item :label="'自定义标签'">
                   <el-input
                     v-model="form.warnMessage"
                     clearable
                     :disabled="methods==0"
                     :placeholder="'请输入'"
+                    :maxlength="4"
+                    :minlength="2"
+                    show-word-limit
                   />
                 </el-form-item>
               </el-col>
diff --git a/src/views/goodsManage/goodsRelease/jcsz.vue b/src/views/goodsManage/goodsRelease/jcsz.vue
index 5ee4cc5..87fa76a 100644
--- a/src/views/goodsManage/goodsRelease/jcsz.vue
+++ b/src/views/goodsManage/goodsRelease/jcsz.vue
@@ -510,12 +510,15 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item :label="'标签提示'">
+              <el-col :span="8">
+                <el-form-item :label="'自定义标签'">
                   <el-input
                     v-model="form.warnMessage"
                     clearable
                     :placeholder="'请输入'"
+                    :maxlength="4"
+                    :minlength="2"
+                    show-word-limit
                   />
                 </el-form-item>
               </el-col>

From e5213ec8652d94943236e04f0cd346043670ba2c Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 8 Jul 2025 15:55:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(financialCase):=20=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0=E5=BF=AB=E9=80=9F=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/financialCase.js                  |  9 +++
 src/views/financial/cashDetails/index.vue | 81 +++++++++++++++++++++--
 2 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/src/api/financialCase.js b/src/api/financialCase.js
index ab76c96..984caa2 100644
--- a/src/api/financialCase.js
+++ b/src/api/financialCase.js
@@ -263,3 +263,12 @@ export function getTreeType(params) {
   })
 }
 
+// 批量驳回
+export function batchReject(data) {
+  return request({
+    url: '/member/manager/withdraw/reject',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/views/financial/cashDetails/index.vue b/src/views/financial/cashDetails/index.vue
index 7e020ac..a9c82d4 100644
--- a/src/views/financial/cashDetails/index.vue
+++ b/src/views/financial/cashDetails/index.vue
@@ -224,8 +224,18 @@
               class="thebtn4"
               @click="handleExport"
             >
-              {{ '导出' }}</el-button>
+              导出
+            </el-button>
+            <el-button
+              style="padding: 8px"
+              size="small"
+              class="thebtn2"
+              @click="batchRejectHandle"
+            >
+              驳回
+            </el-button>
           </div>
+
         </div>
 
         <div style="overflow:auto;">
@@ -496,12 +506,7 @@
               prop="payerRemarks"
               :label="'打款备注'"
             />
-            <el-table-column
-              v-if="showData.approveStateVal"
-              align="center"
-              prop="approveStateVal"
-              :label="'审核状态'"
-            />
+
             <el-table-column
               v-if="showData.withdrawCode"
               align="center"
@@ -509,6 +514,13 @@
               width="200"
               :label="'单据编号'"
             />
+            <el-table-column
+              v-if="showData.approveStateVal"
+              align="center"
+              prop="approveStateVal"
+              :label="'审核状态'"
+              fixed="right"
+            />
             <el-table-column
               align="center"
               prop="time"
@@ -552,6 +564,7 @@
                   >
                     {{ '导出' }}
                   </el-button>
+
                 </div>
               </template>
             </el-table-column>
@@ -591,6 +604,28 @@
         }}</el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      title="驳回原因"
+      :visible.sync="rejectDialogVisible"
+      width="30%"
+      :close-on-click-modal="false"
+      center
+    >
+      <el-form ref="rejectForm" :model="rejectForm" label-width="auto">
+        <el-form-item required label="驳回原因">
+          <el-input
+            v-model="rejectForm.rejectRemark"
+            :maxlength="80"
+            show-word-limit
+            type="textarea"
+          />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="rejectDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveRejectForm">确认</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -660,7 +695,11 @@ export default {
       form: {
         payerRemarks: ''
       },
+      rejectForm: {
+        payerRemarks: ''
+      },
       isCz: 0,
+      rejectDialogVisible: false,
       checkArrAll: [],
       statusList: [],
       vertexList: [],
@@ -811,6 +850,34 @@ export default {
   methods: {
     isLocals,
     isLocalSymbol,
+    saveRejectForm() {
+      const data = {
+        idList: this.checkArr,
+        rejectRemark: this.rejectForm.rejectRemark
+      }
+      api.batchReject(data).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            message: res.msg,
+            type: 'success'
+          })
+          this.rejectDialogVisible = false
+          this.getDataList()
+        }
+      })
+    },
+    batchRejectHandle() {
+      const canReject = this.checkArrAll.every((item) => item.approveState == 1)
+      console.log(canReject)
+      if (!canReject) {
+        this.$message({
+          message: '存在已审核单据，请重新选择',
+          type: 'warning'
+        })
+        return false
+      }
+      this.rejectDialogVisible = true
+    },
     getUserRole() {
       getRoleMenu('CashDetails').then((res) => {
         const obj = {}

From ad50cb087830737caf3cd7b704ba9d626fbe55e7 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 9 Jul 2025 10:12:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(cashDetails):=20=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/financial/cashDetails/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/financial/cashDetails/index.vue b/src/views/financial/cashDetails/index.vue
index a9c82d4..318764f 100644
--- a/src/views/financial/cashDetails/index.vue
+++ b/src/views/financial/cashDetails/index.vue
@@ -227,6 +227,7 @@
               导出
             </el-button>
             <el-button
+              v-has-buttons="['CashDetailsReject']"
               style="padding: 8px"
               size="small"
               class="thebtn2"
@@ -868,7 +869,6 @@ export default {
     },
     batchRejectHandle() {
       const canReject = this.checkArrAll.every((item) => item.approveState == 1)
-      console.log(canReject)
       if (!canReject) {
         this.$message({
           message: '存在已审核单据，请重新选择',