sc

src/views/Clue/Order/Comp/OrderRemark.vue

@@ -159,7 +159,18 @@ const total = ref(0)
 async function getList() {
   loading.value = true
   try {
-    const data = await getClueRemarkPage(removeNullField(searchForm.value))
+    let params = { ...removeNullField(searchForm.value) }
+    if (params.remarkDate && params.remarkDate.length === 2) {
+      params.remarkDateStart = params.remarkDate[0] + ' 00:00:00'
+      params.remarkDateEnd = params.remarkDate[1] + ' 23:59:59'
+      delete params.remarkDate
+    }
+    if (params.signDate && params.signDate.length === 2) {
+      params.signDateStart = params.signDate[0] + ' 00:00:00'
+      params.signDateEnd = params.signDate[1] + ' 23:59:59'
+      delete params.signDate
+    }
+    const data = await getClueRemarkPage(params)
     tableList.value = data.list
     total.value = data.total
   } finally {

src/views/Clue/Set/Comp/RemarkGroup.vue

@@ -59,7 +59,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="区域负责人" prop="areaUser">
-          <el-select v-model="formData.areaUser" placeholder="请选择" filterable>
+          <el-select v-model="formData.areaUser" placeholder="请选择" filterable multiple>
             <el-option
               v-for="item in userOptions"
               :key="item.id"
@@ -133,7 +133,7 @@ const dialogType = ref('create') // 弹窗的类型 create新增 update修改
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formData = ref({
   groupId: '',
-  areaUser: '',
+  areaUser: [],
   remark: ''
 })
 const formRules = reactive({
@@ -163,7 +163,7 @@ async function openForm(type, row) {
 function resetForm() {
   formData.value = {
     groupId: '',
-    areaUser: '',
+    areaUser: [],
     remark: ''
   }
   if (formRef.value) {