Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/customer/api.ts

@@ -1,6 +1,9 @@
 export const MOD = '/customer'
+export const IMPORTMOD = 'Customer'
+export const PREFIX = '/custom'
 export const GETSYSFILED = '/sys-dict/getListByCode'
 export const GETPERSONNEL = '/user/getSimpleActiveUserList'
+export const URL_TABLELIST = `${PREFIX}/list`
 
 export const stageStatus = [
     { id: 1, name: "赢单", progress: "100%" },

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/customer/index.vue

@@ -99,7 +99,7 @@
 
 <script lang="ts" setup>
 import { ref, reactive, onMounted, inject } from "vue";
-import { MOD, GETSYSFILED, GETPERSONNEL } from './api.ts'
+import { MOD, GETSYSFILED, GETPERSONNEL, URL_TABLELIST } from './api.ts'
 import { getAllListByCode, getFromValue, resetFromValue, getFirstDayOfMonth, getLastDayOfMonth, formatDate } from '@/utils/tools'
 import { post, get } from "@/utils/request";
 import { useRouter, useRoute } from "vue-router";
@@ -151,6 +151,7 @@ const customerCriteriaForm = reactive<customerCriteriaFormType>({ // 筛选条
   pageIndex: 1,
   pageFrom: 10
 })
+const clueTableTotal = ref(0)
 const allLoading = reactive({
   clueTableLading: false,
 })
@@ -193,7 +194,13 @@ function toCustomerTableDetail(_row: any) {
 
 function getClueTable() {
   let valueForm = getFromValue(customerCriteriaForm)
-  console.log(valueForm, '<=== valueForm')
+  post(URL_TABLELIST, { ...valueForm}).then((res) => {
+    const { data, total } = res.data
+    clueTable.value = data
+    clueTableTotal.value = total
+  }).finally(() => {
+
+  })
 }
 
 async function getSystemField() {

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/system/customForm/index.vue

@@ -31,7 +31,7 @@
           <el-button type="primary" @click="updateJson()" v-loading="AllLoading.createFormLoading">
             保存
           </el-button>
-          <div @click="setData()">设置数据</div>
+          <!-- <div @click="setData()">设置数据</div> -->
         </div>
       </template>
     </el-dialog>
@@ -178,7 +178,8 @@ function setData() {
   // let data = JSON.parse(localStorage.getItem('threadDataJson') || '')
   // let data = JSON.parse(localStorage.getItem('business') || '')
   // let data = JSON.parse(localStorage.getItem('tasks') || '')
-  let data = JSON.parse(localStorage.getItem('product') || '')
+  // let data = JSON.parse(localStorage.getItem('product') || '')
+  let data = JSON.parse(localStorage.getItem('kehu') || '')
   data.list.forEach((element: any) => {
     element.allDisable = true
   });