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

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

src/views/expense-management/cost-detail/index.vue

@@ -38,20 +38,8 @@ const searchConfig = ref([
       remoteMethod:async (val)=>{
         console.log('val',val)
         if(val){
-          const res=await getExpenseMasterProjectNameOption(val)
+          await getMasterProjectName( val)
-          if(res.code==1000){
+
-            let optionObj={}
-            let optionsMap = new Map();
-            res.data.forEach(item=>{
-              optionObj={
-                value:item.label,
-                label:item.label
-              }
-              optionsMap.set(optionObj.value, optionObj);
-            })
-            // 将 Map 转换为数组
-            searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
-          }
         }
       }
     },
@@ -68,20 +56,7 @@ const searchConfig = ref([
       remote: true,
       remoteMethod:async (val)=>{
         if(val){
-          const res=await getExpenseSubprojectNameOption(val)
+         await getSubprojectName(val)
-          if(res.code==1000){
-            let optionObj={}
-            let optionsMap = new Map();
-            res.data.forEach(item=>{
-                optionObj={
-                  value:item.label,
-                  label:item.label
-                }
-                optionsMap.set(optionObj.value, optionObj);
-            })
-            // 将 Map 转换为数组
-            searchConfig.value.find(item => item.prop == 'subProjectName').props.options = Array.from(optionsMap.values())
-          }
         }
       }
     },
@@ -247,6 +222,42 @@ const tableConfig = reactive({
     fileName:`研发费用明细表`
   }
 })
+
+const getMasterProjectName =async (val) => {
+  const res=await getExpenseMasterProjectNameOption(val)
+  if(res.code==1000){
+    let optionObj={}
+    let optionsMap = new Map();
+    res.data.forEach(item=>{
+      optionObj={
+        value:item.label,
+        label:item.label
+      }
+      optionsMap.set(optionObj.value, optionObj);
+    })
+    // 将 Map 转换为数组
+    searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
+  }
+}
+const getSubprojectName =async (val) => {
+  const res=await getExpenseSubprojectNameOption(val)
+  if(res.code==1000){
+    let optionObj={}
+    let optionsMap = new Map();
+    res.data.forEach(item=>{
+      optionObj={
+        value:item.label,
+        label:item.label
+      }
+      optionsMap.set(optionObj.value, optionObj);
+    })
+    // 将 Map 转换为数组
+    searchConfig.value.find(item => item.prop == 'subProjectName').props.options = Array.from(optionsMap.values())
+  }
+}
+getMasterProjectName()
+getSubprojectName()
+
 const search = (val) => {
   tableConfig.params = {...val}
   tableIns.value.refresh()

src/views/expense-management/expend-detail/index.vue

@@ -34,20 +34,7 @@ const searchConfig = ref(
       remoteMethod:async (val)=>{
         console.log('val',val)
         if(val){
-          const res=await getMasterProjectNameOption(val)
+         await getMasterProjectName( val)
-          if(res.code==1000){
-            let optionObj={}
-            let optionsMap = new Map();
-            res.data.forEach(item=>{
-              optionObj={
-                value:item.label,
-                label:item.label
-              }
-              optionsMap.set(optionObj.value, optionObj);
-            })
-            // 将 Map 转换为数组
-            searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
-          }
         }
       }
     },
@@ -64,20 +51,7 @@ const searchConfig = ref(
       remote: true,
       remoteMethod:async (val)=>{
         if(val){
-          const res=await getSubprojectNameOption(val)
+         await getSubprojectName(val)
-          if(res.code==1000){
-            let optionObj={}
-            let optionsMap = new Map();
-            res.data.forEach(item=>{
-                optionObj={
-                  value:item.label,
-                  label:item.label
-                }
-                optionsMap.set(optionObj.value, optionObj);
-            })
-            // 将 Map 转换为数组
-            searchConfig.value.find(item => item.prop == 'subProjectName').props.options = Array.from(optionsMap.values())
-          }
         }
       }
     },
@@ -242,6 +216,41 @@ const tableConfig = reactive({
     fileName:`科研项日现金支出明细表`
   }
 })
+
+const getMasterProjectName =async (val) => {
+  const res=await getMasterProjectNameOption(val)
+  if(res.code==1000){
+    let optionObj={}
+    let optionsMap = new Map();
+    res.data.forEach(item=>{
+      optionObj={
+        value:item.label,
+        label:item.label
+      }
+      optionsMap.set(optionObj.value, optionObj);
+    })
+    // 将 Map 转换为数组
+    searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
+  }
+}
+const getSubprojectName =async (val) => {
+  const res=await getSubprojectNameOption(val)
+  if(res.code==1000){
+    let optionObj={}
+    let optionsMap = new Map();
+    res.data.forEach(item=>{
+      optionObj={
+        value:item.label,
+        label:item.label
+      }
+      optionsMap.set(optionObj.value, optionObj);
+    })
+    // 将 Map 转换为数组
+    searchConfig.value.find(item => item.prop == 'subProjectName').props.options = Array.from(optionsMap.values())
+  }
+}
+getMasterProjectName()
+getSubprojectName()
 const search = (val) => {
   tableConfig.params = {...val}
   tableIns.value.refresh()

src/views/expense-management/share-detail/index.vue

@@ -38,20 +38,8 @@ const searchConfig = ref([
       remoteMethod:async (val)=>{
         console.log('val',val)
         if(val){
-          const res=await getCostMasterProjectNameOption(val)
+
-          if(res.code==1000){
+          await getMasterProjectName( val)
-            let optionObj={}
-            let optionsMap = new Map();
-            res.data.forEach(item=>{
-              optionObj={
-                value:item.label,
-                label:item.label
-              }
-              optionsMap.set(optionObj.value, optionObj);
-            })
-            // 将 Map 转换为数组
-            searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
-          }
         }
       }
     },
@@ -68,20 +56,8 @@ const searchConfig = ref([
       remote: true,
       remoteMethod:async (val)=>{
         if(val){
-          const res=await getCostSubprojectNameOption(val)
+          await getSubprojectName(val)
-          if(res.code==1000){
+
-            let optionObj={}
-            let optionsMap = new Map();
-            res.data.forEach(item=>{
-                optionObj={
-                  value:item.label,
-                  label:item.label
-                }
-                optionsMap.set(optionObj.value, optionObj);
-            })
-            // 将 Map 转换为数组
-            searchConfig.value.find(item => item.prop == 'subProjectName').props.options = Array.from(optionsMap.values())
-          }
         }
       }
     },
@@ -202,7 +178,40 @@ const tableConfig = reactive({
     open :false,
   }
 })
-
+const getMasterProjectName =async (val) => {
+  const res=await getCostMasterProjectNameOption(val)
+  if(res.code==1000){
+    let optionObj={}
+    let optionsMap = new Map();
+    res.data.forEach(item=>{
+      optionObj={
+        value:item.label,
+        label:item.label
+      }
+      optionsMap.set(optionObj.value, optionObj);
+    })
+    // 将 Map 转换为数组
+    searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
+  }
+}
+const getSubprojectName =async (val) => {
+  const res=await getCostSubprojectNameOption(val)
+  if(res.code==1000){
+    let optionObj={}
+    let optionsMap = new Map();
+    res.data.forEach(item=>{
+      optionObj={
+        value:item.label,
+        label:item.label
+      }
+      optionsMap.set(optionObj.value, optionObj);
+    })
+    // 将 Map 转换为数组
+    searchConfig.value.find(item => item.prop == 'subProjectName').props.options = Array.from(optionsMap.values())
+  }
+}
+getMasterProjectName()
+getSubprojectName()
 
 const search = (val) => {
   tableConfig.params = {...val}

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

@@ -569,6 +569,7 @@ const changeCollectData = () => {
 }
 
 const filterMasterProject= (val)=>{
+  masterProjectList.value= JSON.parse(localStorage.getItem("projectOption"))
   if(val){
     getProjectList(val)
   }
@@ -598,6 +599,10 @@ const getProjectList = (val) => {
         masterProjectList.value = res.data.filter(item => item.value!=route.query.projectId)
       }else{
         masterProjectList.value = res.data
+        if(!val){
+
+          localStorage.setItem("projectOption", JSON.stringify(res.data))
+        }
       }
     }
   })