Merge pull request 'fix:样式修改' (#334) from fix/change_task into test

Reviewed-on: #334

src/views/final/content/ListContent.vue

@@ -46,6 +46,7 @@ const scrollContainer = ref(null)
 const tableData = ref<any>([])
 const finalStore = useFinal()
 const valuetwo=ref(false)
+const loadcheck=ref(false)
 let num = 1
 const pagination = reactive({
   page: 1,
@@ -61,11 +62,16 @@ const showActions = computed(() => {
 
 console.log(haeaderstore)
 function handleCheck(row: any, showcheck: any) {
+ let num=0
  if (showcheck == false) {
     console.log(tableData.value)
     tableData.value.forEach((item) => {
       if (item.length > 0) {
         item.forEach((itemx, index) => {
+          console.log(itemx)
+          if(itemx.states==2){
+            num=num+1
+          }
           if (row.id == itemx.id)
             itemx.showcheck = true
 
@@ -79,6 +85,9 @@ function handleCheck(row: any, showcheck: any) {
     tableData.value.forEach((item) => {
       if (item.length > 0) {
         item.forEach((itemx, index) => {
+           if(itemx.states==2){
+            num=num+1
+          }
           if (row.id == itemx.id)
             itemx.showcheck = false
 
@@ -88,6 +97,19 @@ function handleCheck(row: any, showcheck: any) {
     })
     selectionIds.value.pop(row)
   }
+
+if(selectionIds.value.length==num){
+valuetwo.value=true
+loadcheck.value=false
+}else if(selectionIds.value.length<num&&selectionIds.value.length!=0){
+  valuetwo.value=false
+loadcheck.value=true
+}else if(selectionIds.value.length==0){
+//alert(selectionIds.value.length)
+loadcheck.value=false
+valuetwo.value=false
+
+}
 }
 function switchBatch() {
   tableData.value.forEach((item) => {
@@ -337,12 +359,15 @@ function tishiok(){
           reload()
           selectionIds.value = []
           modal.getData()
+
         }
         else {
           message.error(res.message)
           selectionIds.value = []
+          
         }
       })
+       loadcheck.value=false
       valuetwo.value=false
 }
 // 单个审批通过
@@ -495,10 +520,15 @@ function notpass() {
   const modal = unref(headerref)! as any
   initData(1, 20, {}, props.taskvalue)
   valuetwo.value=false
+  loadcheck.value=false
   selectionIds.value = []
   modal.getData()
   // haeaderstore.setDataConfig(true)
 }
+function chekcall(){
+ 
+  valuetwo.value=true
+}
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
@@ -511,7 +541,7 @@ watch(
   () => valuetwo.value,
   (newVal, oldVal) => {
     let newlist=[]
-   
+   let newsels=[]
     if(valuetwo.value){
       tableData.value.map((item)=>{
       let ooo=[]
@@ -519,7 +549,7 @@ watch(
           console.log(item[i])
      item[i].showcheck=true
     if(item[i].states == 2){
-     selectionIds.value.push(item[i])
+     newsels.push(item[i])
     
     }
     ooo.push(item[i])
@@ -529,9 +559,10 @@ watch(
         item=ooo
       newlist.push(item)
       })
-  
+    selectionIds.value=newsels
     tableData.value=newlist
-   }else{
+     loadcheck.value=false
+   }else if(!valuetwo.value&&loadcheck.value==false){
        tableData.value.map((item)=>{
       let ooo=[]
       for (let i=0; i<item.length;i++){
@@ -545,6 +576,7 @@ watch(
       })
       selectionIds.value=[]
     tableData.value=newlist
+    loadcheck.value=false
     }
    
    
@@ -660,9 +692,12 @@ defineExpose({
           <span>提报人排序</span><SvgIcon style="margin-left: 6px" name="sort" size="13" />
         </div>
       </div>
-      <div class="checkall">  <n-checkbox v-model:checked="valuetwo">
+      <div class="checkall"   v-if="!loadcheck">  <n-checkbox v-model:checked="valuetwo">
       全选
     </n-checkbox></div>
+       <div class="checkall" style="right:45.5px" v-if="loadcheck" @click="chekcall">  
+      <div class="checking">—</div>全选
+   </div>
       <div style="width: 3vw">
         <!-- <SvgIcon name="magnifying-1" size="18" style="margin-right: 8px" />
         <SvgIcon
@@ -1107,6 +1142,7 @@ defineExpose({
       background-color: #1980ff;
     border-left: 0;
     border-top: 0;
+    border-radius: 0.1rem;
     }
   /* 定义滚动条的宽度及背景颜色 */
   ::-webkit-scrollbar {