From 71b9065f296e47191528ce7336e5cb21fcdef672 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 10 Jul 2024 16:56:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=E7=BB=86=E8=8A=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/SummaryDetail.vue |  2 +-
 src/views/plan/detail.vue                        |  2 +-
 src/views/project-demand/requirement/add.vue     |  4 ++++
 src/views/project-demand/summary/add.vue         | 16 ++++++++--------
 src/views/project-management/filing/index.vue    |  2 +-
 .../project-management/implementation/index.vue  |  2 +-
 .../project-management/initiation/index.vue      |  2 +-
 .../mobledetail/SummaryDetailMoblie.vue          |  2 +-
 8 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 99ba5bc..a992ff0 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -109,7 +109,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="经济概算(元)" prop="economicEstimate">
+          <el-form-item label="经济预算(元)" prop="economicEstimate">
             <span>{{ toThousands(localFormData.economicEstimate) }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index e7350d2..7596225 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -119,7 +119,7 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column prop="intellectualProperty" label="经济概算(元)" align="center">
+          <el-table-column prop="intellectualProperty" label="经济预算(元)" align="center">
             <template #default="scope">
               <span>{{ toThousands(scope.row.economicEstimate) }}</span>
             </template>
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 3e1cd64..7aae484 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -28,6 +28,7 @@
                   type="date"
                   placeholder="需求上报截止时间"
                   value-format="YYYY-MM-DD"
+                  :disabled-date="disabledDate"
               />
             </el-config-provider>
           </el-form-item>
@@ -217,6 +218,9 @@ const tableConfig = reactive({
     }
   ]
 })
+const disabledDate = (time) => {
+  return time.getTime() < Date.now() - 8.64e7//不能选择之后的数据
+}
 const handleExpend = () => {
   showMoreCompany.value = !showMoreCompany.value;
   showExpendClass(showMoreCompany.value)
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 0e29d7d..aeeefe2 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -185,32 +185,32 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="发明专利(项)" prop="inventionPatent" label-width="125">
-            <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利" :controls="false"/>
+            <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="实用性新型专利(项)" prop="newPatent" label-width="145">
-            <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利" :controls="false"/>
+            <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="软件著作权(项)" prop="softwareCopyright" label-width="135">
-            <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权" :controls="false"/>
+            <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="著作权(项)" prop="copyright" label-width="125">
-            <el-input-number v-model="formData.copyright" placeholder="请输入著作权" :controls="false"/>
+            <el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="其他(项)" prop="other" label-width="145">
-            <el-input-number v-model="formData.other" placeholder="请输入其他" :controls="false"/>
+            <el-input-number v-model="formData.other" placeholder="请输入其他数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="经济概算(元)" prop="economicEstimate" label-width="135">
-            <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济概算" :controls="false"/>
+          <el-form-item label="经济预算(元)" prop="economicEstimate" label-width="135">
+            <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济预算数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="16" v-if="formData.isSpecialFund">
@@ -312,7 +312,7 @@ const rules = reactive({
   softwareCopyright: [{required: true, message: '请输入软件著作权', trigger: 'blur'}],
   copyright: [{required: true, message: '请输入著作权', trigger: 'blur'}],
   other: [{required: true, message: '请输入其他', trigger: 'blur'}],
-  economicEstimate: [{required: true, message: '请输入经济概算', trigger: 'blur'}],
+  economicEstimate: [{required: true, message: '请输入经济预算', trigger: 'blur'}],
   specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
   serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
   contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index fad0044..31ff380 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -193,7 +193,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算(元)',
+      label: '经济预算(元)',
       align: 'center',
       currentRender:({row})=>{
         return <span>{toThousands(row.economicEstimate)}</span>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 3798475..6cd8b94 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -209,7 +209,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算(元)',
+      label: '经济预算(元)',
       align: 'center',
       currentRender:({row})=>{
         return <span>{toThousands(row.economicEstimate)}</span>
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index d238277..74e4031 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -190,7 +190,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算(元)',
+      label: '经济预算(元)',
       align: 'center',
       currentRender:({row})=>{
         return <span>{toThousands(row.economicEstimate)}</span>
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index dda0c4e..4992e20 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -106,7 +106,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="经济概算(元)" prop="economicEstimate">
+          <el-form-item label="经济预算(元)" prop="economicEstimate">
             <span>{{ toThousands(localFormData.economicEstimate) }}</span>
           </el-form-item>
         </el-col>

From 42fd8d97401e4ebfc6eea97dbf5670ff561d60fa Mon Sep 17 00:00:00 2001
From: zhangkaihuai <1942223609@qq.com>
Date: Wed, 10 Jul 2024 18:08:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=92=8C=E6=88=90=E5=91=98=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在项目申请详情中，新增了项目负责人和成员的选择功能，使用user-picker组件实现。
同时，对前置流程的展示进行了调整，并完善了审批记录和流程图的相关逻辑。
---
 .../DetailComponent/ApprovalDetail.vue        | 38 ++++++++-
 .../DetailComponent/ProjectApply.vue          | 81 +++++++++++++++++--
 src/views/tool/dict/index.vue                 |  6 +-
 3 files changed, 112 insertions(+), 13 deletions(-)

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 6163c3e..becd16b 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading">
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
-    <el-form :model="formData" label-width="auto"  style="margin-top: -15px">
+    <el-form :model="formData" label-width="auto" style="margin-top: -15px">
       <file-component :title="getTagName(type)+'附件'" :tag="getTagName(type)"
                       v-model:value="formData.fileList" :processViewer="processViewer"
                       :file-list-show="fileListShow"/>
@@ -18,8 +18,8 @@
       </el-form-item>
     </div>
     <div class="approval-record">
-      <div class="approval-title"  style="margin-top: -15px">
-        <baseTitle title="审批记录" ></baseTitle>
+      <div class="approval-title" style="margin-top: -15px">
+        <baseTitle title="审批记录"></baseTitle>
         <div class="diagram">
           <div class="base-title">流程图</div>
           <el-switch
@@ -89,6 +89,38 @@ const schema = computed(() => {
   let arr
   if (props.type == 'approval') {
     arr = [
+      {
+        label: '项目负责人',
+        prop: 'projectChargePerson',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.projectChargePerson ?
+                    <span>{props.formData.projectChargePerson.name} </span>
+                    : <span>{'--'}</span>
+              }
+            </div>
+        )
+      },
+      {
+        label: '项目成员',
+        prop: 'projectPersonList',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.projectPersonList ? props.formData.projectPersonList.map(item => {
+                  return <span>{item.name} </span>
+                }) : <span>{'--'}</span>
+              }
+            </div>
+        )
+      },
       {
         label: '前置流程',
         prop: 'preProcess',
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 1e912d3..6681d3c 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -2,8 +2,34 @@
   <div class="apply-block">
     <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="前置流程" :required="preProcessRequired" prop="requestName" label-width="125">
+        <el-col :span="24">
+          <el-form-item label="项目负责人" :required="true" prop="projectChargePerson"
+                        label-width="125">
+            <div v-for="item in projectChargePersonUserList" :key="item.id" style="margin-right: 5px">
+              {{ item.name }}
+            </div>
+            <el-button color="#DED0B2" @click="handleShowProjectChargePersonTable">
+              {{ localFormData.projectChargePerson ? '更改' : '请选择' }}
+            </el-button>
+            <user-picker :multiple="false" ref="projectChargePersonUserPicker" title="请选择项目负责人"
+                         v-model:value="projectChargePersonUserList" @ok="projectChargePersonUserPickerOk"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="项目成员" :required="true" prop="projectPerson"
+                        label-width="125">
+            <div v-for="item in projectPersonUserList" :key="item.id" style="margin-right: 5px">
+              {{ item.name }}
+            </div>
+            <el-button color="#DED0B2" @click="handleShowProjectPersonTable">
+              {{ localFormData.projectPersonIds ? '更改' : '请选择' }}
+            </el-button>
+            <user-picker :multiple="true" ref="projectPersonUserPicker" title="请选择项目成员"
+                         v-model:value="projectPersonUserList" @ok="projectPersonUserPickerOk"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
             <div v-for="item in localFormData.preProcess" :key="item.requestId">
               <a :href="item.baseUrl" target="_blank"
                  style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ item.requestName }}</a>
@@ -26,7 +52,7 @@
           <baseTitle title="审批记录" v-if="mode === 'resubmit'"></baseTitle>
           <div v-else></div>
           <div class="diagram">
-            <div class="base-title" >流程图</div>
+            <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
                 style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
@@ -102,12 +128,17 @@ import {
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
 import Paging from "@/components/pagination/index.vue";
+import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 
 const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
 const preProcessTable = ref()
 const showSingleTable = ref(false)
+const projectChargePersonUserList = ref()
+const projectChargePersonUserPicker = ref()
+const projectPersonUserList = ref([])
+const projectPersonUserPicker = ref()
 const singleList = ref([])
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
@@ -149,12 +180,16 @@ const pageInfo = reactive({
   pageSize: 10,
 })
 const rules = reactive({
-  requestName: [{required: true, message: '请选择前置流程', trigger: 'blur'}],
+  preProcess: [{required: true, message: '请选择前置流程', trigger: 'blur'}],
+  projectChargePerson: [{required: true, message: '请选择项目负责人', trigger: 'blur'}],
+  projectPerson: [{required: true, message: '请选择项目成员', trigger: 'blur'}],
 })
 const tagsViewStore = useTagsView()
 const processStore = useProcessStore()
 const otherFileList = ref([])
 const localFormData = ref({
+  projectPersonIds: [],
+  projectChargePerson: null,
   preProcess: [
     // {
     //   requestId: null,
@@ -201,6 +236,26 @@ const handleShowPreTable = () => {
   showPreTable.value = true
   getPreProcessList()
 }
+const handleShowProjectChargePersonTable = () => {
+  projectChargePersonUserPicker.value.showUserPicker()
+}
+
+const projectChargePersonUserPickerOk = (userList) => {
+  projectChargePersonUserList.value = userList
+  localFormData.value.projectChargePerson = userList[0].id
+}
+const handleShowProjectPersonTable = () => {
+  projectPersonUserPicker.value.showUserPicker()
+}
+
+const projectPersonUserPickerOk = (userList) => {
+  projectPersonUserList.value = userList
+  let userIds = []
+  for (const user of userList) {
+    userIds.push(user.id)
+  }
+  localFormData.value.projectPersonIds = userIds
+}
 const getPreProcessList = () => {
   loading.value = true
   getPreProcess().then(res => {
@@ -278,9 +333,9 @@ const compositeParam = (item) => {
 }
 const getAttachment = (val) => {
   // console.log('上传文件getAttachment', val)
-  showSingleTable.value=false
+  showSingleTable.value = false
   localFormData.value.singleFile = compositeParam(val)
-  singleList.value.push( compositeParam(val))
+  singleList.value.push(compositeParam(val))
   nextTick(() => {
     showSingleTable.value = true
   })
@@ -349,6 +404,8 @@ const handleSubmit = async () => {
     fileList: files,
     singleFile: attachment.value.singleFile,
     projectId: projectId.value,
+    projectChargePerson: localFormData.value.projectChargePerson,
+    projectPersonIds: localFormData.value.projectPersonIds,
     preProcess: JSON.stringify(localFormData.value.preProcess)
   }
   // console.log('params', params)
@@ -430,7 +487,17 @@ const init = async () => {
 }
 
 watchEffect(() => {
-  return Object.keys(props.formData).length && (localFormData.value = props.formData)
+  projectChargePersonUserList.value = [props.formData.projectChargePerson]
+  projectPersonUserList.value = props.formData.projectPersonList
+  let flag = Object.keys(props.formData).length && (localFormData.value = props.formData)
+  localFormData.value.projectChargePerson = props.formData.projectChargePerson.id
+  localFormData.value.projectPersonIds = []
+  if (projectPersonUserList.value){
+    projectPersonUserList.value.forEach(item => {
+      localFormData.value.projectPersonIds.push(item.id)
+    })
+  }
+  return flag
 })
 onMounted(async () => {
   await init()
diff --git a/src/views/tool/dict/index.vue b/src/views/tool/dict/index.vue
index 410a0da..16562a9 100644
--- a/src/views/tool/dict/index.vue
+++ b/src/views/tool/dict/index.vue
@@ -14,8 +14,8 @@
           </el-button>
         </div>
         <el-form :model="queryType">
-          <el-form-item prop="dictType">
-            <el-input v-model="queryType.dictType" placeholder="请输入字典类型" :suffix-icon="Search"
+          <el-form-item prop="dictName">
+            <el-input v-model="queryType.dictName" placeholder="请输入字典类型" :suffix-icon="Search"
                       clearable @clear="getTreeList" @input="getTreeList"></el-input>
           </el-form-item>
         </el-form>
@@ -230,7 +230,7 @@ const cacheStore = useCacheStore();
 cacheStore.setCacheKey(["normal_disable"]);
 //查询参数
 const queryType = reactive({
-  dictType: ""
+  dictName: ""
 });
 //查询参数
 const queryData = reactive({