Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

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>