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

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

@@ -42,6 +42,7 @@ import CustomerForm from '@components/common/formForm/formView.vue'
 import FoldingPanel from '@components/common/foldingPanel.vue';
 import NewAndModifiedRelatedProducts from '@pages/pageComponents/product/newAndModifiedRelatedProducts.vue'
 import useRouterStore from "@store/useRouterStore.js";
+import commonUtil from "@utility/commonUtil"
 
 const router = useRouterStore()
 const props = defineProps({
@@ -81,7 +82,7 @@ function onSubmit() {
       businessItemProductList: newList ? JSON.stringify(newList) : []
     }
     toastLoading('保存中', 0)
-    requests.post(NEW_BUSINESS_OPPORTUNITY_EDITING, { ...newForm }).then(() => {
+    requests.post(NEW_BUSINESS_OPPORTUNITY_EDITING, { ...commonUtil.getFromValue({ ...newForm }) }).then(() => {
       toastSuccess('保存成功')
       setTimeout(() => {
         router.navigateBack({

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/contacts/addEditor.vue

@@ -19,6 +19,7 @@ import requests from "@common/requests";
 import useToast from "@hooks/useToast"
 import { CONTACT_PERSON_ADDITION_EDITOR, CUSTOMER_ADDED_EDITOR } from "@hooks/useApi"
 import useRouterStore from "@store/useRouterStore.js";
+import commonUtil from "@utility/commonUtil"
 const router = useRouterStore()
 
 const { toastText, toastSuccess, toastFail, toastLoading } = useToast()
@@ -38,7 +39,7 @@ function onSubmit() {
     }
     toastLoading('保存中', 0)
     const url = props.formValue.id ? '/contacts/updateContacts' : CONTACT_PERSON_ADDITION_EDITOR
-    requests.post(url, { ...props.formValue, ...res.data }).then(() => {
+    requests.post(url, { ...commonUtil.getFromValue({ ...props.formValue, ...res.data }) }).then(() => {
       toastSuccess('保存成功')
       setTimeout(() => {
         router.navigateBack({

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/contacts/contactsInfo.vue

@@ -21,14 +21,14 @@
     </div>
 
     <!-- 转移弹窗 -->
-    <van-dialog v-model:show="showDialog" :title="`转移线索`" show-cancel-button @confirm="confirmTransfer"
+    <van-dialog v-model:show="showDialog" :title="`转移联系人`" show-cancel-button @confirm="confirmTransfer"
       :before-close="dialogCloseBefo">
       <van-cell title="转移至" is-link @click="showSelect = true">
         <template #value>
           {{ dialogSelection.label }}
         </template>
       </van-cell>
-      <div class="themeTextColor text-size-small pl-4 pt-2 pb-2">转移后，将看不到此线索了</div>
+      <div class="themeTextColor text-size-small pl-4 pt-2 pb-2">转移后，将看不到此联系人了</div>
     </van-dialog>
 
     <!-- select 选择器 -->

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/contract/addEditor.vue

@@ -58,6 +58,7 @@ import { CONTRACT_ADDITION_EDITING, CONTRACT_EDITING, OBTAIN_THE_CONTRACT_REMITT
 import useRouterStore from "@store/useRouterStore.js";
 import FoldingPanel from '@components/common/foldingPanel.vue';
 import dayjs from 'dayjs';
+import commonUtil from "@utility/commonUtil"
 
 const router = useRouterStore()
 const { toastText, toastSuccess, toastFail, toastLoading } = useToast()
@@ -106,7 +107,7 @@ function onSubmit() {
     }
 
     toastLoading('保存中', 0)
-    requests.post(props.formValue?.id ? CONTRACT_EDITING : CONTRACT_ADDITION_EDITING, { ...props.formValue, ...res.data, paymentListStr: JSON.stringify(paymentPlanList.value) }).then(() => {
+    requests.post(props.formValue?.id ? CONTRACT_EDITING : CONTRACT_ADDITION_EDITING, { ...commonUtil.getFromValue({ ...props.formValue, ...res.data, paymentListStr: JSON.stringify(paymentPlanList.value) }) }).then(() => {
       toastSuccess('保存成功')
       setTimeout(() => {
         router.navigateBack({

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/contract/detail.vue

@@ -25,9 +25,10 @@
           {{ infoData.nextPaymentDate ? infoData.nextPaymentDate : '-' }}
         </template>
       </van-cell>
-      <van-cell title="下笔回款金额" :value="infoData.payment">
+      <van-cell title="下笔回款金额">
         <template #default>
-          <span class="text-[#FF8B32]" v-if="infoData.payment">¥ {{ infoData.payment.toFixed(2) }}</span>
+          <span class="text-[#FF8B32]" v-if="infoData.nextPaymentAmount">¥ {{ infoData.
+            nextPaymentAmount?.toFixed(2) }}</span>
         </template>
       </van-cell>
       <van-cell title="合同类型" :value="infoData.typeName" />

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

@@ -19,6 +19,7 @@ import requests from "@common/requests";
 import useToast from "@hooks/useToast"
 import { CUSTOMER_ADDED_EDITOR } from "@hooks/useApi"
 import useRouterStore from "@store/useRouterStore.js";
+import commonUtil from "@utility/commonUtil"
 
 const router = useRouterStore()
 const { toastText, toastSuccess, toastFail, toastLoading } = useToast()
@@ -37,7 +38,7 @@ function onSubmit() {
       return
     }
     toastLoading('保存中', 0)
-    requests.post(CUSTOMER_ADDED_EDITOR, { ...props.formValue, ...res.data }).then(() => {
+    requests.post(CUSTOMER_ADDED_EDITOR, { ...commonUtil.getFromValue({ ...props.formValue, ...res.data }) }).then(() => {
       toastSuccess('保存成功')
       setTimeout(() => {
         router.navigateBack({

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

@@ -25,14 +25,14 @@
     </div>
 
     <!-- 转移弹窗 -->
-    <van-dialog v-model:show="showDialog" :title="`转移线索`" show-cancel-button @confirm="confirmTransfer"
+    <van-dialog v-model:show="showDialog" :title="`转移客户`" show-cancel-button @confirm="confirmTransfer"
       :before-close="dialogCloseBefo">
       <van-cell title="转移至" is-link @click="showSelect = true">
         <template #value>
           {{ dialogSelection.label }}
         </template>
       </van-cell>
-      <div class="themeTextColor text-size-small pl-4 pt-2 pb-2">转移后，将看不到此线索了</div>
+      <div class="themeTextColor text-size-small pl-4 pt-2 pb-2">转移后，将看不到此客户了</div>
     </van-dialog>
 
     <!-- select 选择器 -->

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/order/addEditor.vue

@@ -47,6 +47,7 @@ import FoldingPanel from '@components/common/foldingPanel.vue';
 import CustomerForm from '@components/common/formForm/formView.vue'
 import NewAndModifiedRelatedProducts from '@pages/pageComponents/product/newAndModifiedRelatedProducts.vue'
 import useRouterStore from "@store/useRouterStore.js";
+import commonUtil from "@utility/commonUtil"
 
 const router = useRouterStore()
 
@@ -81,7 +82,7 @@ function onSubmit() {
       orderProductDetailString: JSON.stringify(newList),
     }
     toastLoading('保存中', 0)
-    requests.post(ORDER_ADDITION_EDITING, { ...formVal }).then(() => {
+    requests.post(ORDER_ADDITION_EDITING, { ...commonUtil.getFromValue({ ...formVal }) }).then(() => {
       toastSuccess('保存成功')
       setTimeout(() => {
         router.navigateBack({

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/order/detail.vue

@@ -11,7 +11,7 @@
         <RelatedProducts :infoList="relatedProductsList" />
       </van-tab>
       <van-tab title="回款" name="回款">
-        <PaymentCollection :info="infoData" />
+        <PaymentCollection :info="infoData" @changePaymentCollection="changePaymentCollection" />
       </van-tab> 
     </van-tabs>
   </div>
@@ -74,6 +74,10 @@ function getDetailedData(id) {
   })
 }
 
+function changePaymentCollection(id) {
+  getDetailedData(id)
+}
+
 function processingData(id) {
   clearTimeout(timeout.value);
   toastLoading('加载中...', 0)

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/order/orderInfo.vue

@@ -53,14 +53,14 @@
     </div>
 
     <!-- 转移弹窗 -->
-    <van-dialog v-model:show="showDialog" :title="`转移线索`" show-cancel-button
+    <van-dialog v-model:show="showDialog" :title="`转移销售订单`" show-cancel-button
       @confirm="confirmTransfer" :before-close="dialogCloseBefo">
       <van-cell title="转移至" is-link @click="showSelect = true">
         <template #value>
           {{ dialogSelection.label }}
         </template>
       </van-cell>
-      <div class="themeTextColor text-size-small pl-4 pt-2 pb-2">转移后，将看不到此线索了</div>
+      <div class="themeTextColor text-size-small pl-4 pt-2 pb-2">转移后，将看不到此销售订单了</div>
     </van-dialog>
 
     <!-- select 选择器 -->

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/order/paymentCollection.vue

@@ -48,6 +48,7 @@ import requests from "@common/requests";
 import useShowToast from '@hooks/useToast'
 
 const { toastSuccess, toastFail, toastText } = useShowToast()
+const emit = defineEmits()
 const props = defineProps({
   info: {
     type: Object,
@@ -72,6 +73,7 @@ function deletePaymentCollection(row) {
   }).then(() => {
     requests.post(DELETE_SALES_ORDER_PAYMENT_RECORDS, { paymentId: row.id }).then(() => {
       toastSuccess('操作成功')
+      emit('changePaymentCollection', props.info.id)
       processingData(props.info.id)
     }).catch((err) => {
       toastFail(err.msg ? err.msg : '删除失败')
@@ -93,12 +95,13 @@ function addEditReceipt() {
     [rowId ? 'paymentId' : 'orderId']: rowId ? rowId : props.info.id,
     money: val,
   }
-  if ((+totalMoney + val) > orderAmount) {
+  if ((+totalMoney + +val) > orderAmount) {
     toastText('回款金额不能大于订单金额')
     return
   }
   requests.post(url, formVal).then(() => {
     toastSuccess('操作成功')
+    emit('changePaymentCollection', props.info.id)
     processingData(props.info.id)
     showDialog.value = false
   })

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

@@ -19,6 +19,7 @@ import requests from "@common/requests";
 import useToast from "@hooks/useToast"
 import { PRODUCT_ADD_EDITOR } from "@hooks/useApi"
 import useRouterStore from "@store/useRouterStore.js";
+import commonUtil from "@utility/commonUtil"
 
 const router = useRouterStore()
 const { toastText, toastSuccess, toastFail, toastLoading } = useToast()
@@ -37,7 +38,7 @@ function onSubmit() {
       return
     }
     toastLoading('保存中', 0)
-    requests.post(PRODUCT_ADD_EDITOR, { ...props.formValue, ...res.data }).then(() => {
+    requests.post(PRODUCT_ADD_EDITOR, { ...commonUtil.getFromValue({ ...props.formValue, ...res.data }) }).then(() => {
       toastSuccess('保存成功')
       setTimeout(() => {
         router.navigateBack({

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/tasks/addEditor.vue

@@ -194,6 +194,7 @@ import PullDownSelector from '@components/common/pullDownSelector.vue'
 import CustomerForm from '@components/common/formForm/formView.vue'
 import TranslationComponent from '@components/common/translationComponent.vue';
 import useRouterStore from "@store/useRouterStore.js";
+import commonUtil from "@utility/commonUtil"
 
 const router = useRouterStore()
 const { toastText, toastSuccess, toastFail, toastLoading } = useToast()
@@ -258,7 +259,7 @@ function onSubmit() {
     console.log('formValue', formValue)
     toastLoading('保存中')
     const url = formValue.id ? MODIFY_TASK : TASK_ADD_EDIT
-    requests.post(url, { ...formValue }).then(() => {
+    requests.post(url, { ...commonUtil.getFromValue({ ...formValue }) }).then(() => {
       toastSuccess('保存成功')
       setTimeout(() => {
         router.navigateBack({

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

@@ -19,6 +19,7 @@ import requests from "@common/requests";
 import useToast from "@hooks/useToast"
 import { NEW_CLUE_EDITING } from "@hooks/useApi"
 import useRouterStore from "@store/useRouterStore.js";
+import commonUtil from "@utility/commonUtil"
 
 const router = useRouterStore()
 const { toastText, toastSuccess, toastFail, toastLoading } = useToast()
@@ -37,7 +38,7 @@ function onSubmit() {
       return
     }
     toastLoading('保存中', 0)
-    requests.post(NEW_CLUE_EDITING, { ...props.formValue, ...res.data }).then(() => {
+    requests.post(NEW_CLUE_EDITING, { ...commonUtil.getFromValue({ ...props.formValue, ...res.data }) }).then(() => {
       toastSuccess('保存成功')
       setTimeout(() => {
         router.navigateBack({

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

@@ -16,7 +16,7 @@
       <van-cell title="备注" :value="info.remark" />
     </div>
     <div class="bottomButton">
-      <van-button type="primary" class="w-full block" v-if="info.inchargerName"  @click="transformBusinessOpportunities()">线索转商机</van-button>
+      <van-button type="primary" class="w-full block" v-if="info.inchargerName && info.isBo != 1"  @click="transformBusinessOpportunities()">线索转商机</van-button>
       <van-button type="warning" class="w-full block" v-if="info.inchargerName"  @click="showDialogCli()">转移线索</van-button>
       <van-button type="primary" class="w-full block" v-if="!info.inchargerName" @click="claimAndClaim()">认领线索</van-button>
       <van-button type="default" class="w-full block" v-permission="[routingInformation.jurisdiction.edit]" @click="jumpEdit()">编辑线索</van-button>

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/component/dataSummary.vue

@@ -37,7 +37,7 @@
             <div class="text-size-small text-[#999]" style="width: 40%;">
               新增商机 <span class="ml-1 text-[#51C2FF]">
                 {{ dataSummary?.businessOpportunityDataSummary?.newNum || 0 }}
-              </span> 人
+              </span> 个
             </div>
             <div class="text-size-small text-[#999]" style="width: 60%;">
               商机赢单 <span class="ml-1 text-[#51C2FF]">
@@ -49,7 +49,7 @@
             <div class="text-size-small text-[#999]" style="width: 40%;">
               输单商机 <span class="ml-1 text-[#51C2FF]">
                 {{ dataSummary?.businessOpportunityDataSummary?.winning || 0 }}
-              </span> 人
+              </span> 个
             </div>
             <div class="text-size-small text-[#999]" style="width: 60%;">
               商机总金额 <span class="ml-1 text-[#51C2FF]">
@@ -68,12 +68,12 @@
             <div class="w-1/2 text-size-small text-[#999]">
               新增线索 <span class="ml-1 text-[#28C67E]">
                 {{ dataSummary?.clueDataSummary?.newNum || 0 }}
-              </span> 人
+              </span> 个
             </div>
             <div class="w-1/2 text-size-small text-[#999]">
               线索转商机 <span class="ml-1 text-[#28C67E]">
                 {{ dataSummary?.clueDataSummary?.changeNum || 0 }}
-              </span> 人
+              </span> 个
             </div>
           </div>
         </div>

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/utility/commonUtil.js

@@ -77,4 +77,47 @@ commonUtil.isJsonStr = (str) => {
     }
 };
 
+/**
+ * 判断值是否为空
+ * @param value 值
+ * @returns {boolean}
+ */
+commonUtil.isValueEmpty = (value) => {
+    if (value === null || value === undefined) {
+        return true;
+    }
+    if (typeof value === "string" && value.trim() === "") {
+        return true;
+    }
+    if (Array.isArray(value) && value.length === 0) {
+        return true;
+    }
+    if (
+        typeof value === "object" &&
+        !Array.isArray(value) &&
+        Object.keys(value).length === 0
+    ) {
+        return true;
+    }
+    if (typeof value === "symbol" && value.toString() === "Symbol()") {
+        return true;
+    }
+    return false;
+}
+
+/**
+ * 获取表单数据中有值的数据
+ * @param formData 表单数据
+ * @returns {T}
+ */
+commonUtil.getFromValue = (formData) => {
+    const result = {};
+    for (const key in formData) {
+        if (!commonUtil.isValueEmpty(formData[key])) {
+            result[key] = formData[key];
+        }
+    }
+    return result;
+}
+
 export default commonUtil;

fhKeeper/formulahousekeeper/timesheet/src/App.vue

@@ -49,11 +49,14 @@
             switchThemes(type) {
                 const colorType = { 
                     'default': '#409EFF',
-                    'dark': '#FF0000',
+                    'dark': '#075985',
                 }
                 setTimeout(() => {
                     this.colorChange(colorType[type])
                 }, 0)
+                if(type == 'dark') {
+                    document.title = '临床工时通'
+                }
                 window.document.documentElement.setAttribute( "data-theme", type );
             },
             colorChange(color) {
@@ -75,6 +78,9 @@
     .v-tour__target--highlighted {
         box-shadow: 0 0 0 99999px rgba(0,0,0,.4) !important;
     }
+    .el-tree-resetStyles .el-tree-node__content {
+        height: auto !important;
+    }
 </style>
 
 <style lang="scss">

fhKeeper/formulahousekeeper/timesheet/src/assets/scss/_themes.scss

@@ -7,9 +7,9 @@ $themes: (
   ),
 
   dark: (
-    background_color: red,
-    color: red,
-    color1: rgb(255, 126, 126),
-    border_color: red,
+    background_color: #075985,
+    color: #075985,
+    color1: #4f85a1,
+    border_color: #075985,
   ),
 );

fhKeeper/formulahousekeeper/timesheet/src/utils/commonMethod.js

@@ -7,7 +7,7 @@ export function getThemeColor() {
   console.log(type, '<=========== 看看')
   const colorType = {
     'default': '#409EFF',
-    'dark': '#FF0000',
+    'dark': '#075985',
   }
   return colorType[type]
 }

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -8,7 +8,8 @@
                 <img v-if="collapsed" class="headImg" src="../assets/image/head_logo.png" />
                 <div v-else class="logo-sys">
                     <img class="headImg" src="../assets/image/head_logo.png" />
-                    <span>{{$t('workingHoursHousekeeper')}}</span>
+                    <!-- <span>{{$t('workingHoursHousekeeper')}}</span> -->
+                    <span>{{ themesType == 'dark' ? '临床工时通' : '工时管家' }}</span>
                 </div>
             </el-col>
             <el-col :span="6">
@@ -285,6 +286,7 @@
         inject:['reloads'],
         data() {
             return {
+                themesType: 'default',
                 textLength: 16,
                 companyForm:{
                     name: '',
@@ -938,6 +940,7 @@
         },
         mounted() {
             var ua = navigator.userAgent.toLowerCase();
+            this.themesType = localStorage.getItem('themes') || 'default';
             if (ua.indexOf("wxwork") > 0) {
                 this.isCorpWX = true;
             } 

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -22,6 +22,7 @@
                 :draggable="adjustPosition"
                 :allow-drop="allowDrop"
                 @node-drop="nodeDrop"
+                class="el-tree-resetStyles"
                 style="padding-bottom:70px;"
                 :expand-on-click-node="false" accordion @node-click="handleNodeClick" :default-expanded-keys="jDarr" @node-expand="jieDian" @node-collapse="shutDown" @current-change="chufa">
                     <span class="custom-tree-node" style="position: relative;box-sizing: border-box;width: 10%;" slot-scope="{ node }" @mouseleave= mouseleave(data,$event) @mouseover= mouseover(data,$event)>

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -53,7 +53,7 @@
                                 </el-select>
                             </div>
                             <div>
-                                <el-tree :data="data" @node-click="handleNodeClick" @node-collapse="nodeChangeCollapse" @node-expand="nodeChangeExpand" ref="treeDataRef" :default-expanded-keys="nodeModelData" node-key="id" v-loading="dataLoading">
+                                <el-tree class="el-tree-resetStyles" :data="data" @node-click="handleNodeClick" @node-collapse="nodeChangeCollapse" @node-expand="nodeChangeExpand" ref="treeDataRef" :default-expanded-keys="nodeModelData" node-key="id" v-loading="dataLoading">
                                     <span class="custom-tree-node"  style="position: relative;box-sizing: border-box;width: 10%;" slot-scope="{ node, data}">
                                         <span style="padding-right: 50px;box-sizing: border-box;overflow:hidden;text-overflow:ellipsis;line-height: 36px; display: inline-block;">
                                             <TranslationOpenData :configurationItems="{ openType: node.data.children ? 'departmentName' : 'userName', openId: node.label, renderIndex: 0 }"/>