Merge branch 'master' of http://codez.tuoz.net:3000/lsq/byhl-zt

.eslintrc-auto-import.json

@@ -74,6 +74,7 @@
     "watch": true,
     "watchEffect": true,
     "watchPostEffect": true,
-    "watchSyncEffect": true
+    "watchSyncEffect": true,
+    "toValue": true
   }
-}
+}

src/hooks/websocket.ts

@@ -19,7 +19,10 @@ const useAdminWebSocket = () => {
     const baseUri = import.meta.env.VITE_API_URL
     const host = window.location.host
     const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}`
+<<<<<<< HEAD
+=======
     console.log(wsUri, 'wsUri')
+>>>>>>> 5f87413450a7cc2d78ad58061d92f900031ae1f9
 
     //使用useWebSocket函数创建WebSocket连接，并配置自动重连和心跳机制
     useWebSocketReturn = useWebSocket(wsUri, {

src/views/customermanagement/customerList/customerListEditModal.vue

@@ -10,8 +10,9 @@
     @ok="handleSubmit"
     @cancel="handleClose"
   >
-    <a-empty v-if="clueStage.length === 0 && label.length === 0" />
+    <!-- <a-empty v-if="clueStage.length === 0 && label.length === 0" /> -->
-    <a-form v-else :model="formModel" :label-col="labelCol" :wrapper-col="wrapperCol">
+    <!-- v-else -->
+    <a-form :model="formModel" :label-col="labelCol" :wrapper-col="wrapperCol">
       <div class="modalTitle">线索阶段树</div>
       <a-form-item style="overflow-x: auto" class="stepsbox maxWidth">
         <a-steps v-if="clueStage.length > 0" v-model:current="current" :initial="-1">
@@ -55,13 +56,13 @@
         </a-checkbox-group>
         <a-empty v-else />
       </a-form-item>
+      <!-- v-bind="validateInfos.customInformation" -->
       <a-form-item
         ref="customInformation"
         label="客户资料"
-        :label-col="{ span: 4 }"
+        :label-col="{ span: 3 }"
         :wrapper-col="{ span: 19 }"
         name="customInformation"
-        v-bind="validateInfos.customInformation"
       >
         <a-textarea v-model:value="formModel.customInformation" class="customInformationInput" />
       </a-form-item>
@@ -197,21 +198,21 @@ const formModel = reactive<SysEdit>({
   customInformation: ''
 })
 // 表单的校验规则
-const formRule = reactive({
+// const formRule = reactive({
-  customInformation: [{ required: true, message: '请输入客户资料', trigger: ['blur', 'change'] }]
+//   customInformation: [{ required: true, message: '请输入客户资料', trigger: ['blur', 'change'] }]
-})
+// })
 
 // 表单的提交请求
 const formRequestMapping: FormRequestMapping<SysEdit> = {
   // [FormAction.CREATE]: createMenu,
   [FormAction.UPDATE]: updateResource
 }
-
+// validateInfos
-const { submitLoading, validateAndSubmit, resetFields, validateInfos } = useAdminForm(
+const { submitLoading, validateAndSubmit, resetFields } = useAdminForm(
   formAction,
   formRequestMapping,
-  formModel,
+  formModel
-  formRule
+  // formRule
 )
 
 //表单提交处理
@@ -402,13 +403,13 @@ defineExpose({
 }
 //客户资料textarea
 .customInformationInput {
-  // margin-left: 10px;
+  margin-left: 10px;
 }
 ::v-deep textarea.ant-input {
   min-height: 90px;
 }
 //客户资料label
-::v-deep .ant-form-item-required {
+::v-deep .ant-form-item-label > label {
   color: rgba(0, 0, 0, 0.85);
   font-weight: 500;
   font-size: 16px;

types/auto-imports.d.ts

@@ -1,6 +1,7 @@
 /* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
 export {}
 declare global {