字段调整

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

@@ -119,7 +119,9 @@
           <el-table-column prop="xmjl" label="项目经理" width="120" />
           <el-table-column prop="lxsj" label="立项时间" width="120" />
           <el-table-column prop="yssj" label="验收时间" width="120" />
-          <el-table-column prop="contractAmount" label="合同额" width="120" />
+          <el-table-column prop="contractAmount" align="center" label="合同额" width="120">
+            <template #default="scope">{{ scope.contractAmount ?? 0 }}</template>
+          </el-table-column>
           <el-table-column prop="xmzt" label="项目状态" width="120">
             <template #default="scope">
               {{ getDictLabel(DICT_TYPE.PROJECT_STATUS, scope.row.xmzt) }}

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

@@ -119,7 +119,9 @@
           <el-table-column prop="xmjl" label="项目经理" width="120" />
           <el-table-column prop="lxsj" label="立项时间" width="120" />
           <el-table-column prop="yssj" label="验收时间" width="120" />
-          <el-table-column prop="contractAmount" label="合同额" width="120" />
+          <el-table-column prop="contractAmount" align="center" label="合同额" width="120">
+            <template #default="scope">{{ scope.contractAmount ?? 0 }}</template>
+          </el-table-column>
           <el-table-column prop="xmzt" label="项目状态" width="120">
             <template #default="scope">
               {{ getDictLabel(DICT_TYPE.PROJECT_STATUS, scope.row.xmzt) }}

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

@@ -77,10 +77,18 @@
           <el-table-column :show-overflow-tooltip="true" prop="xmmc" label="项目名称" />
           <el-table-column prop="zrbm" label="责任部门" width="200" />
           <el-table-column prop="xmjl" label="项目经理" width="120" />
-          <el-table-column prop="contractAmount" label="合同额" width="120" />
-          <el-table-column prop="receivableAmount" label="应收款" width="120" />
-          <el-table-column prop="contractBalance" label="合同余额" width="120" />
-          <el-table-column prop="projectCost" label="项目总成本" width="120" />
+          <el-table-column prop="contractAmount" align="center" label="合同额" width="120">
+            <template #default="scope">{{ scope.contractAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="receivableAmount" align="center" label="应收款" width="120">
+            <template #default="scope">{{ scope.receivableAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="contractBalance" align="center" label="合同余额" width="120">
+            <template #default="scope">{{ scope.contractBalance ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="projectCost" align="center" label="项目总成本" width="120">
+            <template #default="scope">{{ scope.projectCost ?? 0 }}</template>
+          </el-table-column>
           <el-table-column prop="xmzt" label="项目状态" width="120">
             <template #default="scope">
               {{ getDictLabel(DICT_TYPE.PROJECT_STATUS, scope.row.xmzt) }}

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

@@ -85,7 +85,7 @@
                     v-for="item in mainTypeList"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value"
+                    :value="Number(item.value)"
                   />
                 </el-select>
               </td>
@@ -112,7 +112,7 @@
                     v-for="item in secondTypeList"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value"
+                    :value="Number(item.value)"
                   />
                 </el-select>
               </td>
@@ -180,7 +180,7 @@
                     v-for="item in signWayList"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value"
+                    :value="Number(item.value)"
                   />
                 </el-select>
               </td>
@@ -516,6 +516,7 @@
 </template>
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 import { openFlow } from '@/utils/flow'
 import { filterNodeMethod } from '@/utils/tree'
 import TreeSelectV2 from '@/components/TreeSelectV2/index.vue'
@@ -533,9 +534,14 @@ import {
 } from '@/service/contract'
 import { useQuery, useMutation } from '@tanstack/vue-query'
 import { Contract } from '@/interface/contract'
-import { contractTypeFilter, mainTypeList, secondTypeList } from './common'
+import { contractTypeFilter } from './common'
 
 defineOptions({ name: 'XmhtComp' })
+
+const mainTypeList = getDictOptions(DICT_TYPE.CONTRACT_MAIN_TYPE)
+const signWayList = getDictOptions(DICT_TYPE.CONTRACT_SIGN_WAY)
+const secondTypeList = getDictOptions(DICT_TYPE.CONTRACT_SECOND_TYPE)
+
 const { query } = useRoute()
 const { id: _currentProjectId = '', contractId = '' } = query as {
   id: string
@@ -546,20 +552,6 @@ const mContractDetail = ref<Contract>({} as Contract)
 const cContractDetail = ref<any>()
 const mContractDetails = ref<any[]>([])
 const childrenContracts = ref<any[]>([])
-const signWayList = reactive<any[]>([
-  {
-    label: '跟单',
-    value: 1
-  },
-  {
-    label: '半开拓',
-    value: 2
-  },
-  {
-    label: '开拓',
-    value: 3
-  }
-])
 /***
  * 查询主合同和子合同详情数据: 存在多个主合同（兼容之前项目合同），一般来说子合同只存在最新主合同
  * **/

client/src/views/OaSystem/projectCenter/purchaseContract/deptContract.vue

@@ -154,10 +154,18 @@
               {{ getDictLabel(DICT_TYPE.CONTRACT_COST_STATUS, scope.row.amountStatus) }}
             </template>
           </el-table-column>
-          <el-table-column prop="contractAmount" label="合同金额" width="100" />
-          <el-table-column prop="contractAmount" label="已回款金额" width="200" />
-          <el-table-column prop="receivableAmount" label="应收账款" width="100" />
-          <el-table-column prop="contractBalance" label="合同余额" width="100" />
+          <el-table-column prop="contractAmount" label="合同金额" width="100" align="center">
+            <template #default="scope">{{ scope.contractAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="receivedAmount" label="已回款金额" width="200" align="center">
+            <template #default="scope">{{ scope.receivedAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="receivableAmount" label="应收账款" width="100" align="center">
+            <template #default="scope">{{ scope.receivableAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="contractBalance" label="合同余额" width="100" align="center">
+            <template #default="scope">{{ scope.contractBalance ?? 0 }}</template>
+          </el-table-column>
           <el-table-column prop="contractOn" label="拿出日期" width="120" />
           <el-table-column prop="contractOff" label="拿回日期" width="120" />
           <el-table-column label="操作" fixed="right" width="80">

client/src/views/OaSystem/projectCenter/purchaseContract/myContract.vue

@@ -142,10 +142,18 @@
               {{ getDictLabel(DICT_TYPE.CONTRACT_COST_STATUS, scope.row.amountStatus) }}
             </template>
           </el-table-column>
-          <el-table-column prop="contractAmount" label="合同金额" width="100" />
-          <el-table-column prop="contractAmount" label="已回款金额" width="200" />
-          <el-table-column prop="receivableAmount" label="应收账款" width="100" />
-          <el-table-column prop="contractBalance" label="合同余额" width="100" />
+          <el-table-column prop="contractAmount" label="合同金额" width="100" align="center">
+            <template #default="scope">{{ scope.contractAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="receivedAmount" label="已回款金额" width="200" align="center">
+            <template #default="scope">{{ scope.receivedAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="receivableAmount" label="应收账款" width="100" align="center">
+            <template #default="scope">{{ scope.receivableAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="contractBalance" label="合同余额" width="100" align="center">
+            <template #default="scope">{{ scope.contractBalance ?? 0 }}</template>
+          </el-table-column>
           <el-table-column prop="contractOn" label="拿出日期" width="120" />
           <el-table-column prop="contractOff" label="拿回日期" width="120" />
           <el-table-column fixed="right" label="操作" width="80">

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

@@ -135,10 +135,18 @@
               {{ getDictLabel(DICT_TYPE.CONTRACT_COST_STATUS, scope.row.amountStatus) }}
             </template>
           </el-table-column>
-          <el-table-column prop="contractAmount" label="合同金额" width="100" />
-          <el-table-column prop="contractAmount" label="已回款金额" width="200" />
-          <el-table-column prop="receivableAmount" label="应收账款" width="100" />
-          <el-table-column prop="contractBalance" label="合同余额" width="100" />
+          <el-table-column prop="contractAmount" label="合同金额" width="100" align="center">
+            <template #default="scope">{{ scope.contractAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="receivedAmount" label="已回款金额" width="200" align="center">
+            <template #default="scope">{{ scope.receivedAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="receivableAmount" label="应收账款" width="100" align="center">
+            <template #default="scope">{{ scope.receivableAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="contractBalance" label="合同余额" width="100" align="center">
+            <template #default="scope">{{ scope.contractBalance ?? 0 }}</template>
+          </el-table-column>
           <el-table-column prop="contractOn" label="拿出日期" width="120" />
           <el-table-column prop="contractOff" label="拿回日期" width="120" />
           <el-table-column label="操作" fixed="right" width="80">