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

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

src/components/SearchFilesByTag.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="_value">
-    <el-form :model="attachment" inline style="margin-left: 15px">
+    <el-form :model="attachment" inline style="margin-left: 15px" @submit.prevent="handleSearch">
       <el-form-item label="名称" prop="fileName">
         <el-input v-model="attachment.fileName" placeholder="请输入文件名查询" clearable filterable style="width: 300px"/>
       </el-form-item>
@@ -17,7 +17,7 @@
       <el-form-item>
         <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
         <el-button @click="handleReset">重置</el-button>
-        <el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
+        <el-button v-if="uploadState&&!allFile" color="#DED0B2" @click="handleUpload">上传附件</el-button>
       </el-form-item>
     </el-form>
     <el-card style="width: 100%;overflow-y: hidden">
@@ -59,6 +59,10 @@ const props = defineProps({
   loading: {
     type: Boolean,
     default: true
+  },
+  allFile: {
+    type: Boolean,
+    default: false
   }
 })
 const tagsOption = ref([])
@@ -150,6 +154,7 @@ const getTagsOption = () => {
   })
 }
 const handleSearch = () => {
+  console.info("🚀 ~method:'attachment' -----", attachment)
   emit('search', attachment)
 }
 const handleReset=()=>{

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

@@ -6,12 +6,12 @@
       <el-row gutter="30">
         <el-col :span="6">
           <el-form-item label="征集名称" prop="requirementName">
-            <el-input v-model="formData.requirementName" placeholder="请输入征集名称" clearable></el-input>
+            <el-input v-model="formData.requirementName" placeholder="请输入征集名称" clearable @change="changeRequirementData"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6" style="margin-left: -40px">
           <el-form-item label="征集类型" prop="collectType">
-            <el-select v-model="formData.collectType" placeholder="请选择征集类型" clearable filterable>
+            <el-select v-model="formData.collectType" placeholder="请选择征集类型" clearable filterable @change="changeRequirementData">
               <el-option
                   v-for="item in cacheStore.getDict('collect_type')"
                   :key="item.value"
@@ -30,14 +30,14 @@
                   type="date"
                   placeholder="请选择需求上报截止时间"
                   value-format="YYYY-MM-DD"
-                  :disabled-date="disabledDate"
+                  :disabled-date="disabledDate" @change="changeRequirementData"
               />
             </el-config-provider>
           </el-form-item>
         </el-col>
         <el-col :span="6" style="margin-left: -20px">
           <el-form-item label="是否专项资金" prop="isSpecialFund">
-            <el-select v-model="formData.isSpecialFund" placeholder="请选择是否专项资金" clearable filterable>
+            <el-select v-model="formData.isSpecialFund" placeholder="请选择是否专项资金" clearable filterable @change="changeRequirementData">
               <el-option :value="true" label="是"></el-option>
               <el-option :value="false" label="否"></el-option>
             </el-select>
@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="专项资金名称" prop="specialFundId" v-if="formData.isSpecialFund">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable @change="changeRequirementData">
               <el-option
                   v-for="item in specialFundOption"
                   :key="item.value"
@@ -80,7 +80,7 @@
                 style="width:100%;margin-right: 50px"
                 :rows="5"
                 type="textarea"
-                placeholder="请输入征集说明"
+                placeholder="请输入征集说明" @change="changeRequirementData"
             />
           </el-form-item>
         </el-col>
@@ -248,8 +248,19 @@ const tableConfig = reactive({
     }
   ]
 })
-localStorage.removeItem('originallyCompanySelectedList')
 
+if(localStorage.getItem('requirementData')){
+  let demandDate=JSON.parse(localStorage.getItem('requirementData'))
+  formData.value=demandDate
+}
+if(localStorage.getItem('originallyCompanySelectedList')){
+  let companyDate=JSON.parse(localStorage.getItem('originallyCompanySelectedList'))
+  selectedCompanyList.value=companyDate
+}
+
+const changeRequirementData=()=>{
+  localStorage.setItem('requirementData', JSON.stringify(formData.value))
+}
 const addSpecialFund=()=>{
   router.push({
     name: 'Fund/add',
@@ -297,7 +308,6 @@ const showCompany = () => {
   companyRef.value.show()
 }
 const cancelSelectedCompany=(select)=>{
-  console.info("🚀 ~ file:add method:cancelSelectedCompany line:287 -----", select)
   formData.value.companyIds = []
   if(select.length>0){
     for (let val of select) {
@@ -312,6 +322,7 @@ const sureSelectedCompany = (select) => {
     formData.value.companyIds.push(val.value)
   }
   selectedCompanyList.value = select
+  changeRequirementData()
 }
 const checkFormPrem = (formKey) => {
   if (formPermMap.value.hasOwnProperty(formKey)) {
@@ -366,6 +377,7 @@ const getFile = (val) => {
   showTable.value = false
   let fileObj = compositeParam(val)
   formData.value.fileList.push(fileObj)
+  changeRequirementData()
   nextTick(() => {
     showTable.value = true
   })
@@ -435,7 +447,7 @@ const handleSubmit = async (instance) => {
       })
       return;
     }
-    if (formData.value.companyIds.length === 0) {
+    if (formData.value.companyIds?.length === 0) {
       ElNotification({
         title: '提示',
         message: '请选择征集公司',
@@ -454,6 +466,8 @@ const handleSubmit = async (instance) => {
       await router.push({
         name: 'Requirement'
       })
+      localStorage.removeItem('originallyCompanySelectedList')
+      localStorage.removeItem('requirementData')
     }
   })
 }
@@ -487,6 +501,8 @@ const handleResubmit = (instance) => {
         router.push({
           name: 'Requirement'
         })
+        localStorage.removeItem('originallyCompanySelectedList')
+        localStorage.removeItem('requirementData')
       }
     })
   })

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

@@ -4,7 +4,7 @@
    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
      <el-tab-pane v-for="item in paneList" :label="item.label" :name="item.name">
-       <search-files-by-tag @search="search" @upload="upload" :type="item.name==='30'?'30':''"
+       <search-files-by-tag @search="search" @upload="upload" :type="item.name==='30'?'30':''" :allFile="item.name=='all'?true:false"
                             :fileList="fileList" :uploadState="uploadState" v-model:loading="loading"/>
      </el-tab-pane>
    </el-tabs>
@@ -327,8 +327,12 @@ const handleClick = (tab) => {
 
 const search = async (param) => {
   if( activeName.value=='all'){
-    param.targetId = projectId.value
-    searchAllFileList(param).then(res => {
+    let params={
+      targetId:projectId.value,
+      fileName:param.fileName
+    }
+    // param.targetId = projectId.value
+    searchAllFileList(params).then(res => {
       loading.value = false
       changeFileList(res)
     })