功能优化

client/src/views/OaSystem/marketCenter/contractSubOut/applyIndex.vue

@@ -46,15 +46,6 @@
         </div>
       </div>
     </div>
-    <div class="infoBox">
-      <ul>
-        <li v-for="(item, index) in infoList" :key="index" class="mr-40px">
-          <img class="mr-8px" :src="getAssetURL(item.icon)" alt="" />
-          <p>{{ item.name }}：</p>
-          <h4 class="font-size-18px">{{ item.num }}</h4>
-        </li>
-      </ul>
-    </div>
     <div class="tableBox">
       <div class="table" ref="tableRef">
         <el-table
@@ -147,23 +138,6 @@ const queryParams = reactive<QueryParams>({
   pageSize: 10
 })
 
-const infoList: any = ref([
-  {
-    icon: 'xmzx/xmzcz',
-    name: '合同总额(元)',
-    num: '0'
-  },
-  {
-    icon: 'xmzx/xmzcb',
-    name: '已付(元)',
-    num: '0'
-  },
-  {
-    icon: 'xmzx/xmzlr',
-    name: '未付(元)',
-    num: '0'
-  }
-])
 /**
  * 分外包合同查询列表
  */

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

@@ -225,10 +225,12 @@
                   <span>0%</span>
                   技术开发
                 </td>
-                <td>0</td>
-                <td rowspan="5">
+                <td>
                   <el-input v-model="mContractDetail.taxHsjeJskf" :disabled="!editor" />
                 </td>
+                <td rowspan="5">
+                  <el-input v-model="mContractDetail.taxZhsl" :disabled="!editor" />
+                </td>
                 <td rowspan="5">
                   <el-input v-model="mContractDetail.taxBhsze" :disabled="!editor" />
                 </td>
@@ -242,7 +244,11 @@
                   服务
                 </td>
                 <td>
-                  <el-input v-model="mContractDetail.taxHsjeFw" :disabled="!editor" />
+                  <el-input
+                    v-model="mContractDetail.taxHsjeFw"
+                    :disabled="!editor"
+                    style="width: 100%"
+                  />
                 </td>
               </tr>
               <tr>

client/src/views/OaSystem/projectCenter/projectDetail/components/xmxx/ProjectMileStone.vue

@@ -129,6 +129,12 @@ const confirmHandle = (id: string, index: number) => {
           </template>
         </el-table-column>
 
+        <el-table-column label="项目进度" width="200">
+          <template #default="scope">
+            <span v-if="!scope.row.is_edit">{{ scope.row.process }}%</span>
+            <el-input v-else v-model="scope.row.process" />
+          </template>
+        </el-table-column>
         <el-table-column label="实际完成时间" prop="actualFinishTime" width="260">
           <template #default="scope">
             <span v-if="!scope.row.is_edit">{{ scope.row.actualFinishTime }}</span>
@@ -140,12 +146,6 @@ const confirmHandle = (id: string, index: number) => {
             />
           </template>
         </el-table-column>
-        <el-table-column label="项目进度" width="200">
-          <template #default="scope">
-            <span v-if="!scope.row.is_edit">{{ scope.row.process }}%</span>
-            <el-input v-else v-model="scope.row.process" />
-          </template>
-        </el-table-column>
         >
         <el-table-column label="操作" width="200">
           <template #default="scope">

client/src/views/OaSystem/projectCenter/projectDetail/components/xmxx/index.vue

@@ -261,7 +261,6 @@ const { data: originData, refetch } = useQuery(
         return a + b['contractAmount']
       }, 0)
       switchProjectInfo(currentProjectId.value, tData)
-      projectDetail.value['outputValue'] = tData['contractAmount'] - cContractAmount
     },
     enabled: (currentProjectId.value ?? '') !== ''
   }

client/src/views/OaSystem/projectCenter/projectDetail/projectDetail.vue

@@ -185,13 +185,21 @@ const addSubProject: () => void = () => {
  * 项目中止
  */
 const projectTerminateHandler = () => {
-  projectTerminate(id)
+  if (!projectId) {
+    console.error('项目ID不存在!')
+    return
+  }
+  projectTerminate(projectId as string)
 }
 /**
  * 项目恢复
  */
 const projectRecoverHandler = () => {
-  projectRecover(id)
+  if (!projectId) {
+    console.error('项目ID不存在!')
+    return
+  }
+  projectRecover(projectId as string)
 }
 /**
  * 发起项目验收或结项