Merge pull request 'master' (#968) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/968

src/components/DetailComponent/ProjectApply.vue

@@ -10,20 +10,13 @@
             </el-input>
             </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="title==='apply'">
+        <el-col :span="6" v-if="title==='apply'&&detail">
           <!--          label-width="106"-->
           <el-form-item label="实际专项资金"  prop="specialFundAmount" label-width="121" >
             <el-input v-model="localFormData.specialFundAmount" placeholder="请输入实际专项资金">
             </el-input>
             </el-form-item>
         </el-col>
-<!--        <el-col :span="6" v-if="title==='apply'">-->
-<!--          &lt;!&ndash;          label-width="106"&ndash;&gt;-->
-<!--          <el-form-item label="实际专项资金"  prop="budget" label-width="120">-->
-<!--            <el-input v-model="localFormData.budget" placeholder="请输入实际专项资金">-->
-<!--            </el-input>-->
-<!--            </el-form-item>-->
-<!--        </el-col>-->
         </el-row>
         <el-row>
         <el-col :span="6" v-if="title==='apply'">
@@ -180,6 +173,7 @@ 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";
+import {getBaseInfoApi} from "@/components/steps/api";
 
 const router = useRouter()
 const route = useRoute()
@@ -267,6 +261,7 @@ const selectRows = ref([])
 const projectId = ref(route.query.projectId)
 const sessionParams = ref({})
 const optionalChargeLeadershipPickerRef = ref()
+const detail = ref(false)
 const optionalChargeLeadershipList = ref([])
 const filePreviewParam = ref({
   fileUrl: '',
@@ -274,7 +269,13 @@ const filePreviewParam = ref({
   fileType: 'pdf'
 })
 const filePreviewShow = ref(false)
+const getInfo=async ()=>{
 
+  const {code, data} = await getBaseInfoApi(route.query.projectId)
+  console.log('data',code,data)
+  detail.value=data.isSpecialFund
+}
+getInfo()
 const getTemplateName=(type)=>{
   switch (type) {
     case 'apply':

src/components/DetailComponent/ProjectAttachment.vue

@@ -241,7 +241,11 @@ const handleTabClick = (item) => {
     isEdit.value = false
   }
   if (item.props.name != 'plus') {
-    changeFileList(getTagName(item.props.name))
+    if(item.props.name == 'all'){
+      changeFileList('all')
+    }else{
+      changeFileList(getTagName(item.props.name))
+    }
     // if (item.props.name == 'all') {
     //   otherAttachmentList.value = allFiles.value
     // } else {
@@ -300,12 +304,21 @@ const clickToPreview = (row) => {
   })
 }
 const changeFileList=(tag)=>{
-  showAttachmentTable.value = false
-  let params = {
-    targetId: route.query.projectId,
-    targetState: "30",
-    tag:tag
+  let params = {}
+  if(tag=='all'){
+    params = {
+      targetId: route.query.projectId,
+      targetState: "30",
+    }
+  }else{
+    params = {
+      targetId: route.query.projectId,
+      targetState: "30",
+      tag:tag
+    }
   }
+  showAttachmentTable.value = false
+
   searchImplementationFileList(params).then(res => {
     if (res.code === 1000) {
       otherAttachmentList.value = res.data.fileList

src/components/SearchFilesByTag.vue

@@ -4,8 +4,8 @@
       <el-form-item label="名称" prop="fileName">
         <el-input v-model="attachment.fileName" placeholder="请输入文件名查询" clearable filterable style="width: 300px"/>
       </el-form-item>
-      <el-form-item label="类型" prop="targetState" v-if="allFile">
-        <el-select v-model="attachment.targetState" placeholder="请选择类型" clearable  filterable style="width: 300px">
+      <el-form-item label="项目阶段" prop="targetState" v-if="allFile">
+        <el-select v-model="attachment.targetState" placeholder="请选择项目阶段" clearable  filterable style="width: 300px">
           <el-option
               v-for="item in cacheStore.getDict('archive_file_type')"
               :key="item.value"
@@ -96,7 +96,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'tag',
-      label: '标签',
+      label:props.allFile?'项目阶段': '标签',
       align: 'center'
     },
     {

src/views/home/index.vue

@@ -137,7 +137,8 @@
                 <el-empty image-size="135" description="暂无通知公告~"/>
               </div>
               <div v-for="(item,index) in noticeList" class="notice" @click="handleGoToArticleDetail(item)">
-                <span>{{ index > 8 ? '' : 0 }}{{ index + 1 }}</span>{{ item.articleTitle }}
+                <span>{{ index > 8 ? '' : 0 }}{{ index + 1 }}</span>
+                {{ item.articleTitle }}
               </div>
             </div>
           </div>

src/views/project-demand/requirement/index.vue

@@ -48,7 +48,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'processNumber',
-      label: '编号',
+      label: '征集编号',
       align: 'center',
     },
     {

src/views/project-demand/summary/index.vue

@@ -220,7 +220,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'processNumber',
-      label: '编号',
+      label: '项目编号',
       align: 'center',
     },
     {

src/views/project-management/filing/index.vue

@@ -219,7 +219,7 @@ const tableConfig = reactive({
 
     {
       prop: 'processNumber',
-      label: '编号',
+      label: '项目编号',
       align: 'center',
     },
     {

src/views/project-management/implementation/index.vue

@@ -222,7 +222,7 @@ const tableConfig = reactive({
 
     {
       prop: 'processNumber',
-      label: '编号',
+      label: '项目编号',
       align: 'center',
     },
     {

src/views/project-management/initiation/index.vue

@@ -216,7 +216,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'processNumber',
-      label: '编号',
+      label: '项目编号',
       align: 'center',
     },
     {

vite.config.js

@@ -76,8 +76,8 @@ export default defineConfig({
             //   rewrite: (path) => path.replace(/^\/api/, '')
             // },
             // '/api/admin': {
-            //     // target: 'http://frp.feashow.cn:31800/',
-            //     target: 'http://clay.frp.feashow.cn/',
+            //     target: 'http://frp.feashow.cn:31800/',
+            //     // target: 'http://clay.frp.feashow.cn/',
             //     // target: 'http://192.168.31.175:8000',
             //     changeOrigin: true,
             //     rewrite: (path) => path.replace(/^\/api/, '')