首页 发现 帮助
注册 登录
wutt
/
manHourHousekeeper
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

提交代码

Lijy 4 月之前
父节点
7b0b70bf90
当前提交
a2159d6c7c
共有 7 个文件被更改，包括 29 次插入 和 21 次删除
合并视图 显示文件统计
  1. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/index.html
  2. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/formForm/formItem.vue
  3. 3 3
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/translationComponent.vue
  4. 15 10
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/moduleList/moduleList.vue
  5. 5 2
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/visitorProgram/addEditorVisitor.vue
  6. 2 2
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/vite.config.js
  7. 2 2
      fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/system/dictionary/index.vue

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/index.html
查看文件 

@@ -7,7 +7,7 @@
 
     <title>客户管家</title>
 
     <title>客户管家</title>
 
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js" referrerpolicy="origin"></script>
 
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js" referrerpolicy="origin"></script>
 
     <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js" referrerpolicy="origin"></script>
 
     <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js" referrerpolicy="origin"></script>
 
-    <!-- <script src="https://s.url.cn/qqun/qun/qqweb/m/qun/confession/js/vconsole.min.js "></script> -->
 
+    <script src="https://s.url.cn/qqun/qun/qqweb/m/qun/confession/js/vconsole.min.js "></script>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/formForm/formItem.vue
查看文件 

@@ -285,7 +285,7 @@ function requestData(str = "") {
 
         value: item[setProps.value || "value"],
 
         value: item[setProps.value || "value"],
 
       };
 
       };
 
     });
 
     });
 
-    props.element.options.options = newData
 
+    props.element.options.options = newData.length > 0 ? newData : [{}]
 
     if(distinguishComponents.value && fixedData.allUserData.length == 0) {
 
     if(distinguishComponents.value && fixedData.allUserData.length == 0) {
 
       fixedData.updateState({
 
       fixedData.updateState({
 
         allUserData: [ ...newData ]
 
         allUserData: [ ...newData ]

+ 3 - 3
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/components/common/translationComponent.vue
查看文件 

@@ -1,5 +1,5 @@
 
 <template>
 
 <template>
 
-  <!-- <template v-if="userInfo.userInfo.userNameNeedTranslate == 1">
 
+  <template v-if="userInfo.userInfo.userNameNeedTranslate == 1">
 
     <template v-if="Array.isArray(openId)">
 
     <template v-if="Array.isArray(openId)">
 
       <template v-for="(item, index) in openId">
 
       <template v-for="(item, index) in openId">
 
         <ww-open-data :type='type' :openid='item'></ww-open-data>
 
         <ww-open-data :type='type' :openid='item'></ww-open-data>
 
@@ -8,9 +8,9 @@
 
     </template>
 
     </template>
 
     <ww-open-data :type='type' :openid='openId' v-else></ww-open-data>
 
     <ww-open-data :type='type' :openid='openId' v-else></ww-open-data>
 
   </template>
 
   </template>
 
-  <template v-else> -->
 
+  <template v-else>
 
     {{ Array.isArray(openId) ? openId.join(',') : openId }}
 
     {{ Array.isArray(openId) ? openId.join(',') : openId }}
 
-  <!-- </template> -->
 
+  </template>
 
 </template>
 
 </template>
 
 
 
 <script setup>
 
 <script setup>

+ 15 - 10
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/moduleList/moduleList.vue
查看文件 

@@ -34,8 +34,9 @@
 
                             <div class="flex items-center flex-row mt-1">
 
                             <div class="flex items-center flex-row mt-1">
 
                               <van-text-ellipsis :content="item.customerName"
 
                               <van-text-ellipsis :content="item.customerName"
 
                                 class="flex-1 text-[#B9B9B9] text-size-small" />
 
                                 class="flex-1 text-[#B9B9B9] text-size-small" />
 
-                              <div class="text-[#B9B9B9] text-size-small" v-if="item.inchargerName">负责人：{{
 
-                                item.inchargerName }}</div>
 
+                              <div class="text-[#B9B9B9] text-size-small" v-if="item.inchargerName">负责人：
 
+                                <TranslationComponent :openId="item.inchargerName" />
 
+                              </div>
 
                             </div>
 
                             </div>
 
                           </div>
 
                           </div>
 
                         </template>
 
                         </template>
 
@@ -47,8 +48,9 @@
 
                               <div class="text-[#B9B9B9]">{{ item.customerLevelValue }}</div>
 
                               <div class="text-[#B9B9B9]">{{ item.customerLevelValue }}</div>
 
                             </div>
 
                             </div>
 
                             <div class="flex items-center flex-row mt-1">
 
                             <div class="flex items-center flex-row mt-1">
 
-                              <div class="text-[#B9B9B9] text-size-small" v-if="item.inchargerName">负责人：{{
 
-                                item.inchargerName }}</div>
 
+                              <div class="text-[#B9B9B9] text-size-small" v-if="item.inchargerName">负责人：
 
+                                <TranslationComponent :openId="item.inchargerName" />
 
+                              </div>
 
                               <div></div>
 
                               <div></div>
 
                             </div>
 
                             </div>
 
                           </div>
 
                           </div>
 
@@ -61,8 +63,9 @@
 
                               <div class="text-[#B9B9B9]">{{ item.customerLevelValue }}</div>
 
                               <div class="text-[#B9B9B9]">{{ item.customerLevelValue }}</div>
 
                             </div>
 
                             </div>
 
                             <div class="flex items-center flex-row mt-1">
 
                             <div class="flex items-center flex-row mt-1">
 
-                              <div class="text-[#B9B9B9] text-size-small" v-if="item.inchargerName">负责人：{{
 
-                                item.inchargerName }}</div>
 
+                              <div class="text-[#B9B9B9] text-size-small" v-if="item.inchargerName">负责人：
 
+                                <TranslationComponent :openId="item.inchargerName" />
 
+                              </div>
 
                               <div></div>
 
                               <div></div>
 
                             </div>
 
                             </div>
 
                           </div>
 
                           </div>
 
@@ -77,8 +80,9 @@
 
                             <div class="flex items-center justify-between flex-row mt-1">
 
                             <div class="flex items-center justify-between flex-row mt-1">
 
                               <div class="text-[#B9B9B9] text-size-small w-2/5 truncate" v-if="item.ownerName">客户：{{
 
                               <div class="text-[#B9B9B9] text-size-small w-2/5 truncate" v-if="item.ownerName">客户：{{
 
                                 item.customName }}</div>
 
                                 item.customName }}</div>
 
-                              <div class="text-[#B9B9B9] text-size-small w-2/5 truncate text-right" v-if="item.ownerName">负责人：{{
 
-                                item.ownerName }}</div>
 
+                              <div class="text-[#B9B9B9] text-size-small w-2/5 truncate text-right" v-if="item.ownerName">负责人：  
+                                <TranslationComponent :openId="item.inchargerName" />
 
+                              </div>
 
                             </div>
 
                             </div>
 
                           </div>
 
                           </div>
 
                         </template>
 
                         </template>
 
@@ -109,8 +113,9 @@
 
                               <div class="text-[#B9B9B9]">{{ item.status ? '上架' : '下架' }}</div>
 
                               <div class="text-[#B9B9B9]">{{ item.status ? '上架' : '下架' }}</div>
 
                             </div>
 
                             </div>
 
                             <div class="flex items-center justify-between flex-row mt-1">
 
                             <div class="flex items-center justify-between flex-row mt-1">
 
-                              <div class="text-[#B9B9B9] text-size-small w-2/5 truncate">负责人：{{
 
-                                item.inchargerName }}</div>
 
+                              <div class="text-[#B9B9B9] text-size-small w-2/5 truncate">负责人：
 
+                                <TranslationComponent :openId="item.inchargerName" />
 
+                              </div>
 
                               <div class="text-[#B9B9B9] text-size-small w-2/5 truncate text-right">库存：{{
 
                               <div class="text-[#B9B9B9] text-size-small w-2/5 truncate text-right">库存：{{
 
                                 item.unit || 0 }}</div>
 
                                 item.unit || 0 }}</div>
 
                             </div>
 
                             </div>

+ 5 - 2
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/visitorProgram/addEditorVisitor.vue
查看文件 

@@ -323,23 +323,26 @@ function processingDataSource(data) {
 
 
 
 function getAllCustomers() {
 
 function getAllCustomers() {
 
   requests.post(GET_ALL_CUSTOMERS, {}).then((res) => {
 
   requests.post(GET_ALL_CUSTOMERS, {}).then((res) => {
 
-    customerAllList.value = res.data.map((item) => {
 
+    const list = res.data.map((item) => {
 
       return {
 
       return {
 
         label: item.customName,
 
         label: item.customName,
 
         value: item.id,
 
         value: item.id,
 
       };
 
       };
 
     });
 
     });
 
+    customerAllList.value = list.length > 0 ? list : [{}];
 
   });
 
   });
 
 }
 
 }
 
 
 
 function obtainThePurposeOfTheVisit() {
 
 function obtainThePurposeOfTheVisit() {
 
   requests.get(`${RETRIEVE_DICTIONARY_ENTRIES}?code=VisitGoal`).then((res) => {
 
   requests.get(`${RETRIEVE_DICTIONARY_ENTRIES}?code=VisitGoal`).then((res) => {
 
-    purposeOfVisitList.value = res.data.map((item) => {
 
+    const list = res.data.map((item) => {
 
       return {
 
       return {
 
         label: item.name,
 
         label: item.name,
 
         value: item.id,
 
         value: item.id,
 
       };
 
       };
 
     });
 
     });
 
+
 
+    purposeOfVisitList.value = list.length > 0 ? list : [{}];
 
   });
 
   });
 
 }
 
 }

+ 2 - 2
fhKeeper/formulahousekeeper/customerBuler-crm-h5/vite.config.js
查看文件 

@@ -7,8 +7,8 @@ import { postcssConfig } from "./postcss.config.js";
 
 
 
 // const target = 'http://192.168.2.7:10010';
 
 // const target = 'http://192.168.2.7:10010';
 
 // const target = 'http://192.168.2.3:10010';
 
 // const target = 'http://192.168.2.3:10010';
 
-const target = 'http://192.168.2.17:10010';
 
-// const target = 'http://47.101.180.183:10014';
 
+// const target = 'http://192.168.2.17:10010';
 
+const target = 'http://47.101.180.183:10014';
 
 
 
 export default defineConfig({
 
 export default defineConfig({
 
   define: {
 
   define: {

+ 2 - 2
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/system/dictionary/index.vue
查看文件 

@@ -12,7 +12,7 @@
 
       <div class="bg-white w-full h-full shadow-md rounded-md flex flex-col">
 
       <div class="bg-white w-full h-full shadow-md rounded-md flex flex-col">
 
         <div class="tableHeader">
 
         <div class="tableHeader">
 
           <div>字典编码-{{ currentRow?.name }}</div>
 
           <div>字典编码-{{ currentRow?.name }}</div>
 
-          <el-button type="primary" @click="showDialogFormVisible()" :disabled="!currentRow.id">新增参数</el-button>
 
+          <el-button type="primary" @click="showDialogFormVisible()" :disabled="!currentRow.id" v-if="currentRow?.name != '提醒类型'">新增参数</el-button>
 
         </div>
 
         </div>
 
         <div class="flex-1 p-3">
 
         <div class="flex-1 p-3">
 
           <el-table ref="dictionaryTableRef" :data="tableData" v-loading="AllLoading.tableDataLoading" border
 
           <el-table ref="dictionaryTableRef" :data="tableData" v-loading="AllLoading.tableDataLoading" border
 
@@ -20,7 +20,7 @@
 
             <el-table-column type="selection" width="55" />
 
             <el-table-column type="selection" width="55" />
 
             <el-table-column prop="name" label="字典名称" align="center" />
 
             <el-table-column prop="name" label="字典名称" align="center" />
 
             <el-table-column prop="seq" label="排序" align="center" />
 
             <el-table-column prop="seq" label="排序" align="center" />
 
-            <el-table-column label="操作" width="100px">
 
+            <el-table-column label="操作" width="100px" v-if="currentRow?.name != '提醒类型'">
 
               <template #default="{ row, $index }">
 
               <template #default="{ row, $index }">
 
                 <dv class="operation">
 
                 <dv class="operation">
 
                   <el-icon @click="deteleItem(row)">
 
                   <el-icon @click="deteleItem(row)">