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

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/TaskModal/index.vue

@@ -24,7 +24,6 @@
             <el-option v-for="item in PRIORITY " :key="item.value" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
-        {{ form.taskType }}
         <el-form-item :label="form.taskType">
           <template #label>
             <el-select v-model="form.taskType" class="border resetSelect" style="width: 100px" @change="changeTaskType"

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/business/component/products.vue

@@ -20,8 +20,8 @@
                         }}</el-button>
                     </template>
                 </el-table-column>
-                <el-table-column prop="typeName" label="产品类型" width="130" />
-                <el-table-column prop="unitName" label="单位" width="130" />
+                <el-table-column prop="productType" label="产品类型" width="130" />
+                <el-table-column prop="unit" label="单位" width="130" />
                 <el-table-column prop="price" label="标准价格" width="130" />
                 <el-table-column prop="inventory" label="库存" width="130" />
                 <el-table-column prop="sellingPrice" label="售价" width="130" />

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

@@ -54,7 +54,7 @@
                 <el-button link type="primary" size="large" v-permission="['contactsEdit']" @click="editContacts(scope.row)">编辑</el-button>
                 <el-button link type="primary" size="large" v-permission="['tasksAdd']" @click="newTask(scope.row)">新建任务</el-button>
                 <el-button link type="danger" size="large" v-permission="['contactsDelete']"
-                  @click="contactsDeteleItem(scope.row.id, scope.row.customName)">删除</el-button>
+                  @click="contactsDeteleItem(scope.row.id, scope.row.name)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>

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

@@ -91,7 +91,7 @@ function getDetail() {
   post(URL_GETDETAIL, { id: values.value }).then((res) => {
     res.data.newCreateTime = formatDate(new Date(res.data.createTime)),
       information.value = res.data
-      detailCompinentsData.value = res.data.taskList || []
+      detailCompinentsData.value = res.data.tasks || []
   }).finally(() => {
     allLoading.customerDetailLoading = false
   })

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

@@ -30,9 +30,9 @@ export const defaultSearchForm = {
 };
 export const PRIORITY = [
   //优先级
-  { label: "低", value: 2 },
+  { label: "低", value: 0 },
   { label: "中", value: 1 },
-  { label: "高", value: 0 },
+  { label: "高", value: 2 },
 ];
 export const STATUS: StatusType[] = [
   //任务状态

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/thread/detail/components/information.vue

@@ -205,6 +205,9 @@ function transferBusiness() {
         if(!productTableListData || judgmentaAmounteEqual({ ...res }, productTableListData)) {
             return
         }
+        productTableListData.forEach((item: any) => {
+            delete item.id
+        })
         let newForm = {
             ...res,
             expectedTransactionDate: res.expectedTransactionDate ? formatDateTime(new Date(res.expectedTransactionDate)) : '',

fhKeeper/formulahousekeeper/customerBuler-crm/src/store/index.ts

@@ -51,7 +51,9 @@ export const useStore = defineStore<
       this.asyncRoutesMark = false;
     },
   },
-  persist: true, // 是否持久化
+  persist: {
+    storage: sessionStorage, // 存储在 sessionStorage 中
+  }, // 是否持久化
 });
 if (import.meta.hot) {
   import.meta.hot.accept(acceptHMRUpdate(useStore, import.meta.hot));

fhKeeper/formulahousekeeper/customerBuler-crm/src/utils/customInstructions.ts

@@ -7,7 +7,7 @@ const PermissionDirective: Directive = { // 数组， 权限 code 和 布尔值
     // mounted(el: HTMLElement, binding: { value: (string | boolean)[] }, vnode: any) {
     updated(el: HTMLElement, binding: { value: (string | boolean)[] }, vnode: any) {
         const routePath: string = vnode.ctx.appContext.config.globalProperties.$route.path;
-        const userInfo: { userInfo: { functionList: { code: string }[] } } | null = JSON.parse(localStorage.getItem('storeInfo') || '');
+        const userInfo: { userInfo: { functionList: { code: string }[] } } | null = JSON.parse(sessionStorage.getItem('storeInfo') || '');
         const authorityCodes: string[] = (userInfo?.userInfo?.functionList || []).map(({ code }) => code);
         const permissions: (string | boolean)[] = binding.value;
         const hasPermission: any[] = (binding.value || []).filter(item => typeof item !== 'boolean');

fhKeeper/formulahousekeeper/customerBuler-crm/src/utils/tools.ts

@@ -283,11 +283,11 @@ export function judgmentaAmounteEqual(mob: any, arr: any) {
     ElNotification.closeAll();
     ElNotification({
       title: '提示',
-      message: `商机金额${amounte > totalAmounte ? '大于' : '小于'}产品总金额，请修改`,
+      message: `商机金额${amounte > totalAmounte ? '大于' : '小于'}产品总金额，${amounte > totalAmounte ? '' : '请修改'}`,
       type: 'warning',
     });
     flag = true;
   }
 
-  return flag;
+  return (amounte > totalAmounte) ? false : flag;
 }