提交代码

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/TaskModal/taskFunction.ts

@@ -11,7 +11,7 @@ export async function createTask(submitData: any, isClose: boolean) : Promise<Ta
             ...submitData,
             startDate: startDate && dayjs(startDate).format('YYYY-MM-DD'),
             endDate: endDate && dayjs(endDate).format('YYYY-MM-DD'),
-            repeatEndDate: repeatEndDate && dayjs(repeatEndDate).format('YYYY-MM-DD 23:59:59')
+            repeatEndDate: repeatEndDate && dayjs(repeatEndDate).format('YYYY-MM-DD')
         }
         if (executorId) {
             params = {

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

@@ -196,9 +196,9 @@ function submitForm(data: any, isClose: boolean) {
   const { executorId, startDate, endDate, repeatEndDate } = data;
   let params = {
     ...data,
-    startDate: startDate && dayjs(startDate).format('YYYY-MM-DD 00:00:00'),
-    endDate: endDate && dayjs(endDate).format('YYYY-MM-DD 23:59:59'),
-    repeatEndDate: repeatEndDate && dayjs(repeatEndDate).format('YYYY-MM-DD 23:59:59')
+    startDate: startDate && dayjs(startDate).format('YYYY-MM-DD'),
+    endDate: endDate && dayjs(endDate).format('YYYY-MM-DD'),
+    repeatEndDate: repeatEndDate && dayjs(repeatEndDate).format('YYYY-MM-DD')
   }
   if (executorId) {
     params = {

fhKeeper/formulahousekeeper/customerBuler-crm/vite.config.ts

@@ -4,8 +4,8 @@ import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 
 // const target = 'http://192.168.2.28:10010';
-const target = 'http://192.168.2.17:10010';
-// const target = "http://127.0.0.1:10010";
+// const target = 'http://192.168.2.17:10010';
+const target = "http://127.0.0.1:10010";
 // const target = "http://192.168.2.178:10010";
 // const target = 'http://47.101.180.183:10010';
 

fhKeeper/formulahousekeeper/timesheet/src/views/contract/components/customContract.vue

@@ -317,7 +317,7 @@
                 </el-table-column>
                 <el-table-column v-if="contractForm.isAmountFixed" prop="pendingAmounts" label="待付款金额（元）" width="210">
                   <template slot-scope="scope">
-                    {{ scope.row.pendingAmounts }}
+                    {{ scope.row.pendingAmounts | pendingPaymentAmount }}
                   </template>
                 </el-table-column>
                 <el-table-column width="80" fixed="right">
@@ -700,6 +700,12 @@ export default {
       tabsName: ''
     }
   },
+  filters: {
+    pendingPaymentAmount(value) {
+      if(!value) return 0
+      return value.toFixed(2)
+    }
+  },
   created() {
     let height = window.innerHeight;
     this.tableHeight = height - 180;