Merge remote-tracking branch 'origin/master'

client/.env.dev

@@ -5,8 +5,8 @@ VITE_DEV=false
 
 # 请求路径
 # VITE_BASE_URL='http://10.10.9.113:48080'
-VITE_BASE_URL='http://10.10.10.7:18080'
-# VITE_BASE_URL='https://oa.zjugis.com:28080'
+# VITE_BASE_URL='http://10.10.10.7:18080'
+VITE_BASE_URL='https://oa.zjugis.com:28080'
 
 # VITE_BASE_URL='http://10.10.9.168:48080'
 

client/src/views/OaSystem/projectCenter/projectBook/myProject.vue

@@ -177,8 +177,7 @@ const user = wsCache.get(CACHE_KEY.USER)
 const userId = user.user.id ? user.user.id : ''
 const tableRef: any = ref(null)
 const tableHeight: any = ref(0)
-const { queryParams, setSearchParams, exportHandleCommon } = useMixins()
-const lxsjObj = ref()
+const { queryParams, lxsjObj, setSearchParams, exportHandleCommon } = useMixins()
 
 const handleCurrentChange = (pageNo: number) => {
   queryParams.pageNo = pageNo

client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/ContractMilestone.vue

@@ -35,9 +35,9 @@ const addClickHandle = () => {
 <template>
   <div class="tableBox tableLineBox">
     <h4 class="td_title"><i class="icon"></i>合同里程碑</h4>
-    <div class="add_box">
+    <!-- <div class="add_box">
       <el-button type="primary" @click="addClickHandle">新增</el-button>
-    </div>
+    </div> -->
     <table>
       <thead>
         <tr>
@@ -48,7 +48,7 @@ const addClickHandle = () => {
           <th>已回款金额（元）</th>
           <th>预计到款时间</th>
           <th>说明</th>
-          <th>操作</th>
+          <!-- <th>操作</th> -->
         </tr>
       </thead>
       <tbody>
@@ -60,10 +60,10 @@ const addClickHandle = () => {
           <td>{{ item['actualReturnAmount'] }}</td>
           <td>{{ item['planReturnTime'] }}</td>
           <td>{{ item['description'] }}</td>
-          <td style="width: 120px">
+          <!-- <td style="width: 120px">
             <el-button type="primary" size="small">编辑</el-button>
             <el-button type="danger" size="small">删除</el-button>
-          </td>
+          </td> -->
         </tr>
       </tbody>
     </table>

client_h5/src/pages/myLogs/Receive/index.vue

@@ -1,5 +1,3 @@
-import { isHidden } from 'vant/lib/utils'; import { format } from 'path'; import
-{ spawn } from 'child_process';
 <template>
   <div class="my-receive-log-list">
     <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
@@ -20,13 +18,19 @@ import { isHidden } from 'vant/lib/utils'; import { format } from 'path'; import
               item.reportType == "weekly" ? "周报" : "日报"
             }}
           </div>
-          <div>
-            <span class="label">开始日期：</span
-            >{{ moment(item.reportStartDate).format("YYYY-MM-DD") }}
+          <div v-if="item.reportType == 'weekly'">
+            <div>
+              <span class="label">开始日期：</span
+              >{{ moment(item.reportStartDate).format("YYYY-MM-DD") }}
+            </div>
+            <div>
+              <span class="label">结束日期：</span
+              >{{ moment(item.reportEndDate).format("YYYY-MM-DD") }}
+            </div>
           </div>
-          <div>
-            <span class="label">结束日期：</span
-            >{{ moment(item.reportEndDate).format("YYYY-MM-DD") }}
+          <div v-else>
+            <span class="label">日志日期：</span
+            >{{ moment(item.reportStartDate).format("YYYY-MM-DD") }}
           </div>
           <div class="label">本周完成工作：</div>
           <div class="van-multi-ellipsis--l2">
@@ -47,8 +51,7 @@ import { isHidden } from 'vant/lib/utils'; import { format } from 'path'; import
 /**
  * @description 我收到的日志
  */
-import { ref, computed, toRefs } from "vue";
-import { List } from "vant";
+import { ref } from "vue";
 import { http } from "../http";
 import moment from "moment";
 
@@ -56,7 +59,7 @@ onMounted(async () => {
   await onLoad();
 });
 
-const list = ref([]);
+const list = ref<any>([]);
 const loading = ref(false);
 const finished = ref(false);
 const refreshing = ref(false);
@@ -77,7 +80,8 @@ const onLoad = async () => {
   if (!refreshing.value) {
     list.value.push(
       ...dataSource.filter(
-        (item) => !list.value.find((existing) => existing.id === item.id)
+        (item: any) =>
+          !list.value.find((existing: any) => existing.id === item.id)
       )
     );
   } else {
@@ -103,7 +107,7 @@ const onRefresh = async () => {
 
 // 查看详情
 const { push } = useRouter();
-const toDetail = (detail) => {
+const toDetail = (detail: any) => {
   push({
     path: "/logsDetail",
     query: {