提交代码

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

@@ -1,8 +1,8 @@
 <template>
   <div class="w-full h-full flex flex-col">
-    <div class="w-full pt-2">
+    <div class="w-full pt-2 searchKeywords">
       <van-search v-model.trim="searchForValue" shape="round" placeholder="请输入搜索关键词"
-        @update:model-value="debouncedSearchOptions" />
+        @update:model-value="debouncedSearchOptions" input-align="left" />
     </div>
     <div class="flex-1 my-2 overflow-y-auto">
       <template v-if="renderingOptions.length == 1 && renderingOptions[0] && !renderingOptions[0].label">
@@ -187,3 +187,6 @@ onMounted(() => {
   }
 });
 </script>
+
+<style lang="scss" scoped>
+</style>

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/business/businessInfo.vue

@@ -60,6 +60,7 @@
 
 <script setup>
 import { ref } from 'vue';
+import { showConfirmDialog } from 'vant';
 import { useLifecycle } from '@hooks/useCommon.js';
 import { BUSINESS_OPPORTUNITY_TRANSFER, GET_CONTACTS_WITH_MORE_I_DS, CONTACT_PERSON_ASSOCIATED_WITH_BUSINESS_OPPORTUNITY } from '@hooks/useApi'
 import requests from "@common/requests";

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

@@ -44,6 +44,7 @@
 import { ref } from 'vue';
 import { useLifecycle } from '@hooks/useCommon.js';
 import { TRANSFER_CUSTOMERS } from '@hooks/useApi'
+import { showConfirmDialog } from 'vant';
 import requests from "@common/requests";
 import useShowToast from '@hooks/useToast'
 import useInfoStore from '@store/useInfoStore'
@@ -81,12 +82,12 @@ function confirmTransfer() {
 function claimAndClaim() {
   showConfirmDialog({
     title: '认领客户',
-    message: `确定认领【${props.info.name}】客户吗？`,
+    message: `确定认领【${props.info.customName}】客户吗？`,
   }).then(() => {
     requests.post(TRANSFER_CUSTOMERS, { ids: props.info.id, inchargerId: userInfo.userInfo.id }).then((res) => {
       toastSuccess('认领成功')
       listReloadData()
-      props.info.inchargerName = userInfo.userInfo.name
+      props.info.inchargerName = userInfo.userInfo.customName
       showDialog.value = false
     })
   })

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/product/newAndModifiedRelatedProducts.vue

@@ -11,7 +11,6 @@
       v-model="form.productId"
       is-link
       readonly
-      required
       name="productId"
       label="产品名称"
       placeholder="请选择"
@@ -26,7 +25,7 @@
       readonly
       name="productType"
       label="产品类型"
-      placeholder="请先选择产品"
+      :placeholder="!form.productId ? '请先选择产品' : '该产品未设置类型'"
     ></van-field>
     <van-field
       class="resetStyles"
@@ -34,7 +33,7 @@
       readonly
       name="unit"
       label="单位"
-      placeholder="请先选择产品"
+      :placeholder="!form.productId ? '请先选择产品' : '该产品未设置单位'"
     ></van-field>
     <van-field
       class="resetStyles"
@@ -43,7 +42,7 @@
       readonly
       name="price"
       label="标准价格"
-      placeholder="请先选择产品"
+      :placeholder="!form.productId ? '请先选择产品' : '该产品未设置标准价格'"
     ></van-field>
     <van-field
       class="resetStyles"
@@ -52,7 +51,7 @@
       readonly
       name="inventory"
       label="库存"
-      placeholder="请先选择产品"
+      :placeholder="!form.productId ? '请先选择产品' : '该产品未设置标准库存'"
     ></van-field>
     <van-field
       class="resetStyles"

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

@@ -40,6 +40,7 @@
 
 <script setup>
 import { ref } from 'vue';
+import { showConfirmDialog } from 'vant';
 import { useLifecycle } from '@hooks/useCommon.js';
 import { TRANSFER_CLUES } from '@hooks/useApi'
 import requests from "@common/requests";
@@ -86,12 +87,12 @@ function confirmTransfer() {
 function claimAndClaim() {
   showConfirmDialog({
     title: '认领线索',
-    message: `确定认领【${props.info.name}】线索吗？`,
+    message: `确定认领【${props.info.clueName}】线索吗？`,
   }).then(() => {
     requests.post(TRANSFER_CLUES, { ids: props.info.id, inchargerId: userInfo.userInfo.id }).then((res) => {
       toastSuccess('认领成功')
       listReloadData()
-      props.info.inchargerName = userInfo.userInfo.name
+      props.info.inchargerName = userInfo.userInfo.clueName
       showDialog.value = false
     })
   })