Quellcode durchsuchen

提交相关代码

Lijy vor 6 Monaten
Ursprung
Commit
452a2efed6

+ 1 - 0
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/formForm/formItem.vue

@@ -163,6 +163,7 @@
     :style="{ height: '80%' }"
   >
     <PullDownSelector
+      :showElement="showSelect"
       :options="element.options.options"
       :multipleChoice="element.options.multiple"
       :doYouNeedTranslation="distinguishComponents"

+ 2 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/formForm/formView.vue

@@ -77,13 +77,14 @@ async function cascadeProcessing(relatedField) {
       const { data } = await requestData(list.value[i].options.remoteFunc, {
         ...formVal,
       });
-      list.value[i].options.options = data.map((item) => {
+      const newList = data.map((item) => {
         const { props: setProps } = list.value[i].options;
         return {
           label: item[setProps.label || "label"],
           value: item[setProps.value || "value"],
         };
       });
+      list.value[i].options.options = newList.length > 0 ? newList : [{ }];
     }
   }
 }

+ 1 - 0
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/contacts/contactsInfo.vue

@@ -135,6 +135,7 @@ function selectChange(value, label) {
 }
 
 function showDialogCli() {
+  dialogSelection.value = {}
   showDialog.value = true
 }
 

+ 1 - 0
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/customer/customerInfo.vue

@@ -156,6 +156,7 @@ function selectChange(value, label) {
 }
 
 function showDialogCli() {
+  dialogSelection.value = {}
   showDialog.value = true
 }
 

+ 1 - 0
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/order/orderInfo.vue

@@ -171,6 +171,7 @@ function selectChange(value, label) {
 }
 
 function showDialogCli() {
+  dialogSelection.value = {}
   showDialog.value = true
 }
 

+ 1 - 0
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/product/productInfo.vue

@@ -161,6 +161,7 @@ function selectChange(value, label) {
 }
 
 function showDialogCli() {
+  dialogSelection.value = {}
   showDialog.value = true
 }
 

+ 1 - 0
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/thread/threadInfo.vue

@@ -153,6 +153,7 @@ function selectChange(value, label) {
 }
 
 function showDialogCli() {
+  dialogSelection.value = {}
   showDialog.value = true
 }
 

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

@@ -189,6 +189,9 @@ const displayFrequentlyUsedContacts = ref(false)
 function calendarPanelChangeSet(data) {
   dateConditions.value = dayjs(data.date).format('YYYY-MM-DD')
   getVisitorPlan()
+  setTimeout(() => {
+    getPlanCalendarList()
+  }, 1)
 }
 
 function jumpToAdd(rows) {
@@ -350,10 +353,10 @@ function getAllData() {
   displayFrequentlyUsedContacts.value = useInfo.modularList.filter(item => item.path === '/contacts').length
   areYouRequesting.value = true
   Promise.all([
+    getPlanCalendarList(),
     getVisitorPlan(),
     getCommonlyUsedModules(),
     getFrequentlyUsedContacts(),
-    getPlanCalendarList()
   ]).finally(() => {
     areYouRequesting.value = false
   })

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

@@ -180,6 +180,7 @@
         :style="{ height: '80%' }"
       >
         <PullDownSelector
+          :showElement="visitShowPicker"
           :options="purposeOfVisitList"
           :doYouNeedTranslation="false"
           @change="visitSelectChange"
@@ -193,6 +194,7 @@
         :style="{ height: '80%' }"
       >
         <PullDownSelector
+          :showElement="remindShowPicker"
           :options="reminderTimeList"
           :doYouNeedTranslation="false"
           @change="remindSelectChange"
@@ -245,7 +247,11 @@ function onSubmit() {
     requests.post(PLAN_TO_ADD_EDITORS, { ...data }).then((res) => {
       toastSuccess("保存成功")
       setTimeout(() => {
-        history.back();
+        router.navigateBack({
+          success: () => {
+            router.emit('visitorDetailsParameter', { row: JSON.stringify({...addOrEditRow.value}) })
+          }
+        })
       }, 2000)
     }).catch(err => {
       toastFail(`保存失败:${err.msg}`)

+ 1 - 0
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/visitorProgram/visitorDetails.vue

@@ -242,6 +242,7 @@ function processingDataSource(data) {
 
 useLifecycle({
   load: () => {
+    console.log('开始执行')
     router.on("visitorDetailsParameter", (data) => {
       processingDataSource(data);
     });