提交相关代码

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/pullDownSelector.vue

@@ -68,6 +68,10 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  showElement: {
+    type: Boolean,
+    default: () => false,
+  },
   value: {
     type: [String, Array],
     default: () => [],
@@ -106,7 +110,21 @@ watch(() => props.options, (newValue) => {
 })
 
 watch(() => props.value, (newValue) => {
-  selectChecked.value = newValue
+  if(!newValue) {
+    selectChecked.value = []
+  }
+  selectChecked.value = Array.isArray(newValue) ? newValue : [newValue]
+})
+
+watch(() => props.showElement, (newValue) => {
+  if(!newValue) {
+    setTimeout(() => {
+      searchForValue.value = ''
+      searchOptions('')
+      const val = (props.value && Array.isArray(props.value) && props.value.length > 0)
+      selectChecked.value = val ? selectChecked.value : []
+    }, 500)
+  }
 })
 
 function searchOptions(val) {
@@ -120,7 +138,7 @@ function searchOptions(val) {
       return;
     }
     const list = manualCopying(allOptions.value);
-    renderingOptions.value = list.filter((item) => item.label.indexOf(val) > -1);
+    renderingOptions.value = list.filter((item) => (item.label || '').indexOf(val) > -1);
     return
   }
 

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/moduleList/moduleList.vue

@@ -87,7 +87,7 @@
                           <div>
                             <div class="flex items-center flex-row">
                               <div class="flex-1 truncate mr-8 titles relative">{{ item.taskName }}</div>
-                              <div class="text-[#B9B9B9]">
+                              <div :style="`color: ${fixedFieldTaskStatus.find(subItem => subItem.value == item.status)?.color}`">
                                 {{ fixedFieldTaskStatus.find(subItem => subItem.value == item.status)?.label || '' }}
                               </div>
                             </div>
@@ -190,7 +190,12 @@
             </van-pull-refresh>
           </template>
           <template v-else>
-            <van-skeleton title :row="20" class="w-full h-full" />
+            <template v-if="!isLoading && listData?.records && !listData.records.length">
+              <van-empty description="暂无数据" />
+            </template>
+            <template v-else>
+              <van-skeleton title :row="20" class="w-full h-full" />
+            </template>
           </template>
         </div>
       </div>
@@ -215,7 +220,7 @@
 
       <!-- select 选择器 -->
       <van-popup v-model:show="showSelect" destroy-on-close position="bottom" :style="{ height: '80%' }">
-        <PullDownSelector @change="selectChange" />
+        <PullDownSelector :showElement="showSelect" @change="selectChange" />
       </van-popup>
     </template>
   </Page>
@@ -346,11 +351,12 @@ function claimAndClaim(item) {
 // 删除事件
 function deleteRow(row) {
   const { name = '', searchFiled = {}, deteleFiled = '' } = queryParameters.value
+  const foemVal = { [queryParameters.value.key == 'tasks' ? 'taskIds' : 'ids']: row.id }
   showConfirmDialog({
     title: `删除${name}`,
     message: `确定删除【${row[searchFiled?.search]}】${name}吗？`,
   }).then(() => {
-    requests.post(deteleFiled, { ids: row.id }).then((res) => {
+    requests.post(deteleFiled, { ...foemVal }).then((res) => {
       toastSuccess('删除成功')
       onRefresh(true)
     }).catch((err) => {

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/tasks/addEditor.vue

@@ -129,7 +129,7 @@
                     <div class="flex items-center justify-end">
                       <van-stepper v-model="item.value" :min="0" button-size="1.2rem" theme="round" integer
                         class="mr-2" />
-                      之后
+                      天后
                       <van-icon name="delete-o" class="ml-2 text-[red]" size="1.3rem"
                         @click="deleteCustomeDateItem(index)" />
                     </div>
@@ -167,11 +167,11 @@
     <div>
       <!-- 下拉框选择 -->
       <van-popup v-model:show="showSelectionFlag" destroy-on-close position="bottom" :style="{ height: '80%' }">
-        <PullDownSelector :options="showSelectionArray" :doYouNeedTranslation="false" @change="selectChange" />
+        <PullDownSelector :show-element="showSelectionFlag" :options="showSelectionArray" :doYouNeedTranslation="false" @change="selectChange" />
       </van-popup>
 
       <van-popup v-model:show="showSelectionToFlag" destroy-on-close position="bottom" :style="{ height: '80%' }">
-        <PullDownSelector :value="showSelectionToValue" @change="selectChange" :multiple-choice="true" />
+        <PullDownSelector :show-element="showSelectionToFlag" :value="showSelectionToValue" @change="selectChange" :multiple-choice="true" />
       </van-popup>
 
       <!-- 选择日期 -->
@@ -440,7 +440,7 @@ function initializeData() {
     businessOpportunityIdName: businessOpportunityName,
     priorityName: fixedFieldPriority.find(item => item.value == priority)?.label || '',
     taskTypeName: fixedFieldTaskType.find(item => item.value == taskType)?.label || '',
-    repeatTypenName: fixedFieldRepetitiveType.find(item => item.value == repeatType)?.label || ''
+    repeatTypeName: fixedFieldRepetitiveType.find(item => item.value == repeatType)?.label || ''
   }
 
   const list = repeatDesignDay && repeatDesignDay.split(',') || []

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/component/workbench.vue

@@ -316,7 +316,9 @@ function processForms() {
 }
 
 function getVisitorPlan() {
-  requests.post(GET_VISITOR_PLAN, { calenderDate: dateConditions.value }).then((res) => {
+  requests.post(GET_VISITOR_PLAN, { 
+    calenderDate: dayjs(dateConditions.value).format('YYYY-MM') 
+  }).then((res) => {
     visitorProgramList.value = res.data || []
   })
 }

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/visitorProgram/addEditorVisitor.vue

@@ -157,6 +157,7 @@
         :style="{ height: '80%' }"
       >
         <PullDownSelector
+          :showElement="customerShowPicker"
           :options="customerAllList"
           :doYouNeedTranslation="false"
           @change="customerSelectChange"
@@ -169,7 +170,7 @@
         position="bottom"
         :style="{ height: '80%' }"
       >
-        <PullDownSelector @change="personnelSelectChange" />
+        <PullDownSelector :showElement="personnelShowPicker" @change="personnelSelectChange" />
       </van-popup>
       <!-- 拜访目的 -->
       <van-popup

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/utility/defaultData.js

@@ -30,10 +30,10 @@ export const fixedFieldTaskType = [
 
 //任务状态
 export const fixedFieldTaskStatus = [
-  { label: "未开始", value: "0", type: "info" },
-  { label: "进行中", value: "1", type: "primary" },
-  { label: "已完成", value: "2", type: "success" },
-  { label: "已超时", value: "3", type: "danger" },
+  { label: "未开始", value: "0", type: "info", color: '#B9B9B9' },
+  { label: "进行中", value: "1", type: "primary", color: '#075985' },
+  { label: "已完成", value: "2", type: "success", color: '#07C160' },
+  { label: "已超时", value: "3", type: "danger", color: '#EE0A24' },
 ];
 
 // 合同状态

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/utility/generalVariables.js

@@ -28,7 +28,7 @@ export const routingInfos = {
     icon: 'icon-shangpin',
     // listUrl: GET_A_LIST_OF_CLUES,
     listUrl: TOP_DATA_OF_CLUE_LIST,
-    deteleUrl: DELETE_CLUES,
+    deteleFiled: DELETE_CLUES,
     transferInterface: TRANSFER_CLUES,
     addEditingInterface: NEW_CLUE_EDITING,
     topMountedInterface: TOP_OF_CLUES,