From 852b9aad2c6667948484434dc0fa8f4da7b114df Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 02:29:41 +0800
Subject: [PATCH] bug

---
 src/components/Approval/NotPassed.vue   | 20 +++++++---
 src/views/final/content/Content.vue     | 50 ++++++++++---------------
 src/views/task/content/PictureTable.vue |  2 +-
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue
index 04bad76..b2e53a5 100644
--- a/src/components/Approval/NotPassed.vue
+++ b/src/components/Approval/NotPassed.vue
@@ -30,8 +30,8 @@ const rules = {
 }
 
 const formData = reactive({
-  disposeTypeId: '',
-  failCauseId: '',
+  disposeTypeId: '262403670085013522',
+  failCauseId: '260402999231251188',
   comment: '',
 })
 
@@ -149,7 +149,7 @@ async function selectChange(id) {
               <n-select v-model:value="formData.failCauseId" filterable :options="failCauseOptions" @change="selectChange" />
             </n-form-item>
             <n-form-item v-show="showOther" class="form-item-area" label="" path="">
-              <n-input v-model:value="formData.comment" type="textarea" placeholder="备注内容" />
+              <n-input v-model:value="formData.comment" placeholder-class="pl" type="textarea" placeholder="备注内容" />
             </n-form-item>
           </div>
         </n-form>
@@ -157,9 +157,9 @@ async function selectChange(id) {
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit">
-            确认
+            确定
           </n-button>
-          <n-button secondary style="margin-left:15px" @click="closeModal">
+          <n-button secondary class="btn" style="margin-left:15px" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -219,6 +219,7 @@ async function selectChange(id) {
   .form-item-area{
     margin-top: -30px;
   }
+
 }
 
 ::v-deep(.n-card__content) {
@@ -234,4 +235,13 @@ async function selectChange(id) {
   margin-top: 0px;
   margin-bottom: 0px;
 }
+
+::v-deep(.n-input__placeholder) {
+  color: #333333!important;
+}
+
+.btn{
+  border: 1px solid #cad2dd;
+  background-color: #fff;
+}
 </style>
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 73cd966..c6a36dc 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -171,7 +171,6 @@ async function getColumns() {
       fixed: 'left',
       width: 50,
       disabled(row: any) {
-        console.log(row)
         return row.states !== 2
       },
     },
@@ -606,22 +605,6 @@ function actionHandler(action: any, row: any) {
 function validate(items: any[]) {
   if (items.length === 0)
     return '至少选中一个任务'
-
-  // const useInfo = userStore.getUserInfo
-  // const username = useInfo.loginname
-
-  // for (const item of items) {
-  //   const { iztrueorfalse, states, assignee } = item
-  //   if (iztrueorfalse === null)
-  //     return '未判别真假'
-
-  //   else if (states !== 2)
-  //     return '审批状态不合法'
-
-  //   else if (assignee !== username)
-  //     return '审批人不一致'
-  // }
-
   return null
 }
 
@@ -670,6 +653,13 @@ function singleApproval(row) {
 // 批量通过
 function batchApproval() {
   const items: any = getSelectItems()
+  const msg = validate(items)
+
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+  console.log(items)
   const list: any = []
   items.forEach((item) => {
     list.push({
@@ -688,17 +678,19 @@ function batchApproval() {
     failCauseName: '',
     flowTaskInfoList: list,
   }
-  console.log(param)
-  reload()
-  checkedRowKeys.value = []
-  console.log(selectionIds.value)
-  // doAudit(param)
+
+  doAudit(param)
+}
+
+// 批量不通过
+function batchReject() {
+  const items: any = getSelectItems()
+  rejectHandler(items)
 }
 
 // 审核不通过
 function rejectHandler(list) {
   const msg = validate(list)
-
   if (msg !== null) {
     message.error(msg)
     return
@@ -710,6 +702,8 @@ function rejectHandler(list) {
 
 function reload() {
   selectionIds.value = []
+  checkedRowKeys.value = []
+
   const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
   query(page!, pageSize!)
 }
@@ -766,13 +760,7 @@ function doAudit(param: any) {
           小结查重
         </NButton>
         <div class="batch">
-          <NButton text @click="setBatch(false)">
-            <template #icon>
-              <SvgIcon name="revoke" />
-            </template>
-            返回
-          </NButton>
-          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="rejectHandler">
+          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
           <SvgIcon size="24" name="vs" />
           <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
         </div>
@@ -822,7 +810,7 @@ function doAudit(param: any) {
       <SvgIcon
         style="cursor: pointer"
         size="18"
-        name="setting"
+        name="column"
         @click="showModal(customTabelRef)"
       />
     </div>
diff --git a/src/views/task/content/PictureTable.vue b/src/views/task/content/PictureTable.vue
index 68d0512..36ce636 100644
--- a/src/views/task/content/PictureTable.vue
+++ b/src/views/task/content/PictureTable.vue
@@ -19,7 +19,7 @@ defineProps({
     <tr>
       <th>图片名称</th>
       <td class="blue">
-        {{ data?.pictureInfo?.imgname }}
+        {{ data?.pictureInfo?.imgName }}
       </td>
       <th>图片格式</th>
       <td class="blue">