From 9a88930a044c2ea86ae68b54a0054d2a8f75c2dd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 21 Apr 2025 09:47:20 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=9F=B9=E8=AE=AD?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachment/components/SignatureTemplate/TemplateForm.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
index 5f30ba3f..fa373d63 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
@@ -77,7 +77,7 @@ export default {
         FileTypeId: '',
         Name: '',
         Path: '',
-        IsDeleted: false,
+        IsDeleted: true,
         SignViewMinimumMinutes: null,
         DocUserSignType: 0,
         CurrentStaffTrainDays: null,

From a25aa2482f10c17a85e7464d9004db845791bf62 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 21 Apr 2025 10:57:32 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=9F=B9=E8=AE=AD?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E5=8F=91=E5=B8=83=E3=80=81=E4=B8=8B=E7=BA=BF?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SignatureTemplate/index.vue         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index 78d3203e..74f5a03c 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -75,7 +75,7 @@
       <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
         @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
         <!-- <el-table-column type="index" width="40" /> -->
-        <el-table-column type="selection" width="55" :selectable="handleSelectable">
+        <el-table-column type="selection" width="55">
         </el-table-column>
         <el-table-column prop="FileType" :label="$t('dictionary:signature:table:FileType')" show-overflow-tooltip
           sortable="custom" min-width="120px" />
@@ -140,8 +140,7 @@
             <el-button type="text" @click="handleEdit(scope.row)">
               {{ $t('common:button:edit') }}
             </el-button>
-            <el-button :disabled="scope.row.IsPublish || scope.row.IsDeleted" type="text"
-              @click="publishSystemDocument([scope.row])">
+            <el-button :disabled="scope.row.IsPublish" type="text" @click="publishSystemDocument([scope.row])">
               {{ $t('dictionary:signature:button:publish') }}
             </el-button>
             <el-button :disabled="scope.row.IsDeleted" type="text" @click="handleRepeal([scope.row])">
@@ -239,9 +238,6 @@ export default {
     this.getUserType()
   },
   methods: {
-    handleSelectable(row) {
-      return !row.IsDeleted
-    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
@@ -253,8 +249,9 @@ export default {
           distinguishCancelAndClose: true,
         })
         if (!confirm) return false
+        let arr = list.filter(item => !item.IsPublish)
         let data = {
-          ids: list.map(item => item.Id)
+          ids: arr.map(item => item.Id)
         }
         this.loading = true
         let res = await publishSystemDocument(data)
@@ -340,8 +337,9 @@ export default {
         distinguishCancelAndClose: true,
       })
         .then(() => {
+          let arr = row.filter(item => !item.IsDeleted)
           let data = {
-            Ids: row.map(item => item.Id)
+            Ids: arr.map(item => item.Id)
           }
           this.loading = true
           outLineSystemDocument(data)

From fb671defb5968a37b1e4a938665a6c84aa6358c1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 21 Apr 2025 11:09:55 +0800
Subject: [PATCH 3/5] 1

---
 .../attachment/components/SignatureTemplate/index.vue           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index 74f5a03c..d921736d 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -250,6 +250,7 @@ export default {
         })
         if (!confirm) return false
         let arr = list.filter(item => !item.IsPublish)
+        if (arr.length <= 0) return false
         let data = {
           ids: arr.map(item => item.Id)
         }
@@ -338,6 +339,7 @@ export default {
       })
         .then(() => {
           let arr = row.filter(item => !item.IsDeleted)
+          if (arr.length <= 0) return false
           let data = {
             Ids: arr.map(item => item.Id)
           }

From 38c31af137814c3f9c2e23feb8f642f949c970d4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 21 Apr 2025 11:28:41 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83=E3=80=81?=
 =?UTF-8?q?=E5=B7=B2=E4=B8=8B=E7=BA=BF=E7=9A=84=E5=9F=B9=E8=AE=AD=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=8F=AF=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachment/components/SignatureTemplate/index.vue    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index d921736d..b0eb58a2 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -75,7 +75,7 @@
       <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
         @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
         <!-- <el-table-column type="index" width="40" /> -->
-        <el-table-column type="selection" width="55">
+        <el-table-column type="selection" width="55" :selectable="handleSelectable">
         </el-table-column>
         <el-table-column prop="FileType" :label="$t('dictionary:signature:table:FileType')" show-overflow-tooltip
           sortable="custom" min-width="120px" />
@@ -238,6 +238,9 @@ export default {
     this.getUserType()
   },
   methods: {
+    handleSelectable(row) {
+      return !row.IsDeleted || !row.IsPublish
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
@@ -250,7 +253,7 @@ export default {
         })
         if (!confirm) return false
         let arr = list.filter(item => !item.IsPublish)
-        if (arr.length <= 0) return false
+        if (arr.length <= 0) return this.getList()
         let data = {
           ids: arr.map(item => item.Id)
         }
@@ -339,7 +342,7 @@ export default {
       })
         .then(() => {
           let arr = row.filter(item => !item.IsDeleted)
-          if (arr.length <= 0) return false
+          if (arr.length <= 0) return this.getList()
           let data = {
             Ids: arr.map(item => item.Id)
           }

From 33b3818a9ec3a78fd64734202e9645d2d5d55b31 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 22 Apr 2025 10:44:48 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachment/components/SignatureTemplate/TemplateForm.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
index fa373d63..7a70ca84 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
@@ -36,10 +36,10 @@
         <el-input-number v-model="form.SignViewMinimumMinutes" controls-position="right" :min="1" :max="50" />
       </el-form-item>
       <el-form-item :label="$t('dictionary:signature:form:CurrentStaffTrainDays')" prop="CurrentStaffTrainDays">
-        <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="1" :max="1000" />
+        <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="0" :max="1000" />
       </el-form-item>
       <el-form-item :label="$t('dictionary:signature:form:NewStaffTrainDays')" prop="NewStaffTrainDays">
-        <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="1" :max="1000" />
+        <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="0" :max="1000" />
       </el-form-item>
       <!-- <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">