Quellcode durchsuchen

回显、执行任务去掉分页

kyoyue vor 5 Monaten
Ursprung
Commit
51fce3f9a8

+ 54 - 45
src/views/wechat/batch_msg/components/userPhasesDrawer.vue

@@ -47,9 +47,16 @@
               name="labels"
               :rules="[{ required: true, message: '请选择' }]"
             >
-              <Checkbox v-model:checked="form.checked" @change="handleSelectAll('labels', 'checked')">
-                全选
-              </Checkbox>
+              <FormItem>
+                <Checkbox
+                :disabled="btnDisabled"
+                  v-model:checked="form.checked"
+                  @change="handleSelectAll('labels', 'checked')"
+                >
+                  全选
+                </Checkbox>
+              </FormItem>
+
               <Select
                 :disabled="btnDisabled || form.checked"
                 v-model:value="form.labels"
@@ -69,12 +76,15 @@
               name="groupLabels"
               :rules="[{ required: true, message: '请选择' }]"
             >
-              <Checkbox
-                v-model:checked="form.checked1"
-                @change="handleSelectAll('groupLabels', 'checked1')"
-              >
-                全选
-              </Checkbox>
+              <FormItem>
+                <Checkbox
+                :disabled="btnDisabled"
+                  v-model:checked="form.checked1"
+                  @change="handleSelectAll('groupLabels', 'checked1')"
+                >
+                  全选
+                </Checkbox>
+              </FormItem>
               <Select
                 :disabled="btnDisabled || form.checked1"
                 v-model:value="form.groupLabels"
@@ -202,8 +212,8 @@
     startTimeStr: '',
     labels: [],
     groupLabels: [],
-    checked:false,
-    checked1:false,
+    checked: false,
+    checked1: false,
   });
   const rules = {
     taskName: [{ required: true, message: '请输入任务名称', trigger: 'blur' }],
@@ -216,8 +226,8 @@
     startTimeStr: '',
     labels: [],
     groupLabels: [],
-    checked:false,
-    checked1:false,
+    checked: false,
+    checked1: false,
   });
   const taskForm = reactive({
     msg: [{ type: 1, content: '' }],
@@ -313,18 +323,18 @@
     }
   }
   // 监听 Select 选项变化,动态更新 Checkbox 状态
-function handleSelectChange(type, selectedValues, checkedKey) {
-  // 获取所有选项的数量
-  const allOptions = type === 'labels' ? actionLabel.value : actionLabelGroup.value;
-  const allSelected = selectedValues.length === allOptions.length;
+  function handleSelectChange(type, selectedValues, checkedKey) {
+    // 获取所有选项的数量
+    const allOptions = type === 'labels' ? actionLabel.value : actionLabelGroup.value;
+    const allSelected = selectedValues.length === allOptions.length;
 
-  // 根据选择情况更新 Checkbox 状态
-  if (checkedKey === 'checked') {
-    form.checked = allSelected; // 当所有选中时,设置全选
-  } else if (checkedKey === 'checked1') {
-    form.checked1 = allSelected; // 当所有选中时,设置全选
+    // 根据选择情况更新 Checkbox 状态
+    if (checkedKey === 'checked') {
+      form.checked = allSelected; // 当所有选中时,设置全选
+    } else if (checkedKey === 'checked1') {
+      form.checked1 = allSelected; // 当所有选中时,设置全选
+    }
   }
-}
   function nextStep() {
     if (currentStep.value === 0) {
       formRef.value
@@ -357,26 +367,25 @@ function handleSelectChange(type, selectedValues, checkedKey) {
       let data = await getBatchMsgById({ id, type: 1 });
       let labels;
       let checked;
-      let labelsGroups;
+      let groupLabels;
       let checked1;
-      if(data.data?.labels  === [0]){
+      if (data.data?.labels === [0]) {
         checked = true;
         labels = actionLabel.value;
-      }else{
+      } else {
         checked = false;
-        labels = (data.data?.labels ?? '').split(',') || [];
+        // labels = (data.data?.labels ?? '').split(',') || [];
+        labels = data.data?.labels || [];
       }
-      if(data.data?.labelsGroups  === [0]){
+      if (data.data?.groupLabels === [0]) {
         checked1 = true;
-        labelsGroups = actionLabelGroup.value;
-      }else{
+        groupLabels = actionLabelGroup.value;
+      } else {
         checked1 = false;
-        labelsGroups = (data.data?.groupLabels ?? '').split(',') || [];
+        groupLabels = data.data?.groupLabels || [];
       }
       // let labels = data.data.tag.split(',') || [];
-      // let labels = (data.data?.labels ?? '').split(',') || [];
-      // let labelsGroups = (data.data?.labelsGroups ?? '').split(',') || [];
-      console.log(data.data,'======');
+      console.log(data.data, '======');
       let parsedDate = dayjs(data.data.startTimeStr, 'YYYY-MM-DD HH:mm');
       Object.assign(form, {
         taskName: data.data.taskName,
@@ -384,7 +393,7 @@ function handleSelectChange(type, selectedValues, checkedKey) {
         conditionOperator: data.data.sendTime !== null ? '2' : '1',
         labels,
         checked: data.data?.labels === [0] ? true : false,
-        checked1: data.data?.labelsGroups === [0] ? true : false,
+        checked1: data.data?.groupLabels === [0] ? true : false,
         groupLabels,
         // startTimeStr:dayjs(data.data.startTimeStr).format("YYYY-MM-DD HH:mm") || '',
         startTimeStr: parsedDate.isValid() ? parsedDate : dayjs(),
@@ -421,14 +430,14 @@ function handleSelectChange(type, selectedValues, checkedKey) {
       let labels;
       let groupLabels;
       // let startTimeStr = dayjs(form.startTimeStr).format('YYYY-MM-DD HH:mm:ss');
-      if(checked){
+      if (checked) {
         labels = [0];
-      }else{
+      } else {
         labels = form.labels;
       }
-      if(checked1){
+      if (checked1) {
         groupLabels = [0];
-      }else{
+      } else {
         groupLabels = form.groupLabels;
       }
       const { msg } = taskForm;
@@ -440,8 +449,8 @@ function handleSelectChange(type, selectedValues, checkedKey) {
           fromwxid: wxid,
           startTimeStr: form.startTimeStr,
           msg: JSON.stringify(msg),
-          labels:labels,
-          groupLabels:groupLabels,
+          labels: labels,
+          groupLabels: groupLabels,
           type: 1,
         };
       } else {
@@ -449,19 +458,19 @@ function handleSelectChange(type, selectedValues, checkedKey) {
           taskName,
           fromwxid: wxid,
           msg: JSON.stringify(msg),
-          labels:labels,
-          groupLabels:groupLabels,
+          labels: labels,
+          groupLabels: groupLabels,
           type: 1,
         };
       }
-      console.log(groupLabels,labels, 'labels');
+      console.log(groupLabels, labels, 'labels');
       const allData = msg.every((item) => item.content.trim() !== '');
       if (!allData) {
         return;
       }
       loading.value = true;
       let response = await createBatchMsg({ ...requestData });
-      
+
       if (response && response.code === 0 && response.msg != 'target does not exist') {
         console.log('新增成功', response);
         loading.value = false;

+ 2 - 2
src/views/wechat/sop_task/perform_tasks/index.vue

@@ -4,7 +4,7 @@
       :columns="columns"
       :loading="loading.spinning"
       :dataSource="data"
-      :pagination="pagination"
+      :pagination="false" 
       class="table-style"
     >
       <!-- 自定义操作列 -->
@@ -60,7 +60,7 @@
 
       const pagination = reactive({
         total: 0,
-        pageSize: 10,
+        pageSize: Infinity,
         current: 1,
         showTotal: (total) => `共 ${total} 条`,
       });