项目跟踪状态字典、添加是否进场、中标金额字段

client/src/components/TreeSelectV2/index.vue

@@ -153,6 +153,8 @@ watchEffect(() => {
       return
     }
     labelName.value = item['label'] as string
+  } else {
+    labelName.value = ''
   }
   //默认全部展开
   if ($props.data && $props.expend) {

client/src/utils/dict.ts

@@ -158,5 +158,6 @@ export enum DICT_TYPE {
   POLITY_TYPES = 'polity_type', //政治面貌
   STAFF_STATE_TYPES = 'staff_state_type',
   SEX_TYPES = 'sex_type',
-  PROJECT_REPORT_STATUS = 'project_report_status'
+  PROJECT_REPORT_STATUS = 'project_report_status',
+  TRACKING_PROJECT_STATE = 'tracking_project_state'
 }

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

@@ -19,7 +19,7 @@
       </div>
       <div class="form">
         <span class="formSpan">责任部门：</span>
-        <DeptTree v-model="queryParams['zrbmId']" placeholder="请选择责任部门" />
+        <DeptTree v-model="queryParams['deptId']" placeholder="请选择责任部门" />
       </div>
       <div class="form">
         <span class="formSpan">申请人：</span>
@@ -222,12 +222,14 @@ const tableHeight: any = ref(0)
 interface QueryParams extends PageParam {
   projectName: string
   projectNumber: string
+  deptId: string
   applyType: number
   userId?: string
 }
 const queryParams = reactive<QueryParams>({
   projectName: '',
   projectNumber: '',
+  deptId: '',
   applyType: -1,
   pageNo: 1,
   pageSize: 15,

client/src/views/OaSystem/projectCenter/projectTrack/common.ts

@@ -18,7 +18,9 @@ export interface IFormType {
   gzryId: string
   gzry: string
   jf: string
+  sfjc: number
   ygje: number
+  zbje: number
   jfdjr: string
   xmbmId: string
   xmbm: string
@@ -43,7 +45,9 @@ export const useMixins = () => {
     gzryId: '',
     gzry: '',
     jf: '',
+    sfjc: 0,
     ygje: 0,
+    zbje: 0,
     jfdjr: '',
     xmbmId: '',
     xmbm: '',
@@ -62,7 +66,9 @@ export const useMixins = () => {
         gzryId: user.user.id,
         gzry: user.user.nickname,
         jf: '',
+        sfjc: 0,
         ygje: 0,
+        zbje: '',
         jfdjr: '',
         xmbmId: '',
         xmbm: '',

client/src/views/OaSystem/projectCenter/projectTrack/index.vue

@@ -57,6 +57,11 @@
             label="项目名称"
             :min-width="220"
           />
+          <el-table-column prop="sfjc" label="是否进场" width="140">
+            <template #default="scope">
+              {{ scope.row.sfjc == '0' ? '是' : '否' }}
+            </template>
+          </el-table-column>
           <el-table-column prop="gzry" label="跟踪人员" width="140" />
           <el-table-column
             prop="ygje"
@@ -64,16 +69,22 @@
             :show-overflow-tooltip="true"
             width="200"
           />
+          <el-table-column
+            prop="zbje"
+            label="中标金额（万元）"
+            :show-overflow-tooltip="true"
+            width="200"
+          />
           <el-table-column prop="jf" label="甲方" width="120" />
           <el-table-column prop="jfdjr" label="甲方对接人" width="120" />
           <el-table-column prop="xmbm" label="项目归属部门" width="120" />
-          <el-table-column prop="xzqmc" label="行政区" width="120" />
+          <el-table-column prop="xzqmc" label="行政区" width="180" />
           <el-table-column prop="zt" label="状态" width="120">
             <template #default="scope">
-              {{ ztMap[scope.row.zt] }}
+              {{ getDictLabel(DICT_TYPE.TRACKING_PROJECT_STATE, scope.row.zt) }}
             </template>
           </el-table-column>
-          <el-table-column prop="latestModifyTime" label="更新时间" width="120">
+          <el-table-column prop="latestModifyTime" label="更新时间" width="180">
             <template #default="scope">
               {{ formatDate(scope.row.latestModifyTime) }}
             </template>
@@ -140,6 +151,21 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="甲方对接人" prop="name">
+              <el-input v-model="formData.jfdjr" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否进场" prop="region">
+              <el-select v-model="formData.sfjc" style="width: 100%">
+                <el-option label="是" :value="0" />
+                <el-option label="否" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="预估金额（万元）" prop="name">
@@ -147,8 +173,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="甲方对接人" prop="name">
-              <el-input v-model="formData.jfdjr" />
+            <el-form-item label="中标金额（万元）" prop="name">
+              <el-input v-model="formData.zbje" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -166,6 +192,7 @@
             <el-form-item label="行政区" prop="region">
               <DistrictTree
                 class="form-item-disable-style"
+                placeholder="请选择行政区"
                 v-model="formData.xzqdm"
                 @node-click="(item, labels) => treeNodeClick(labels, 'xzqmc')"
                 style="width: 100%"
@@ -177,9 +204,12 @@
           <el-col :span="12">
             <el-form-item label="状态" prop="region">
               <el-select v-model="formData.zt" placeholder="请选择状态" style="width: 100%">
-                <el-option label="谋划" value="0" />
-                <el-option label="待上会" value="1" />
-                <el-option label="待招标" value="2" />
+                <el-option
+                  v-for="(item, index) in getDictOptions(DICT_TYPE.TRACKING_PROJECT_STATE)"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -203,7 +233,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { DICT_TYPE, getDictLabel } from '@/utils/dict'
+import { DICT_TYPE, getDictLabel, getDictOptions } from '@/utils/dict'
 import { IFormType, useMixins, infoList, user } from './common'
 import request from '@/config/axios'
 import { formatDate } from '@/utils/formatTime'
@@ -214,11 +244,6 @@ import DistrictTree from '@/views/OaSystem/components/DistrictTree/index.vue'
 
 defineOptions({ name: 'ProjectTrack' })
 
-const ztMap = {
-  '0': '谋划',
-  '1': '待上会',
-  '2': '待招标'
-}
 const visibleUserIds = ref<string[]>([])
 const tableRef: any = ref(null)
 const tableHeight: any = ref(0)