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

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

src/fvcomponents/fvTable/index.vue

@@ -220,7 +220,11 @@ const getList = async () => {
   if (api) {
     localData.loading = true
     try {
-      const {code, data, msg} = await requestList(api, queryParmas)
+      const {code, data, msg} = await requestList(api, queryParmas).then(res=>{
+        console.log(res)
+        return res
+      })
+      console.log(code,data,msg)
       if (code === 1000) {
         if (data.rows) {
           localData.list = data.rows
@@ -239,6 +243,10 @@ const getList = async () => {
         localData.loading = false
       }
     } catch (error) {
+      console.log("error",error)
+      if (!error){
+        return
+      }
       ElNotification({
         title: '提示',
         message: '请求数据失败',
@@ -305,6 +313,7 @@ onMounted(() => {
   getList()
 })
 
+
 </script>
 
 <style lang="scss" scoped>

src/utils/request.js

@@ -25,14 +25,23 @@ serveice.interceptors.request.use(config => {
 })
 serveice.interceptors.response.use(response => {
   axiosCanceler.removePendingRequest(response.config)
+  console.log(response,"response")
   //二进制数据直接返回
   if (response.request.responseType === 'blob' || response.request.responseType === 'arraybuffer') {
     return response.data
   }
+  console.log("1")
   return response.data
 }, error => {
+  console.log(error)
   let response = error.response
+  if (!response) {
+    return Promise.reject()
+  }
   const status = response.status;
+  if (!status) {
+    return Promise.reject()
+  }
   switch (status) {
     case 401:
       // ElMessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {

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

@@ -305,7 +305,9 @@ const search = (val) => {
   tableConfig.params = {...val, projectId: route.query.id}
   tableIns.value.refresh()
 }
-
+onActivated(()=>{
+  init()
+})
 </script>
 
 <style scoped>

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

@@ -133,7 +133,7 @@ const rules = reactive({
   digest: [{required: true, message: '请输入摘要', trigger: 'blur'}],
   afterTax: [{required: true, message: '请输入税后余额', trigger: 'blur'}]
 })
-const tableForm = reactive({
+const tableForm = ref({
   tableData: [
     {
       projectId: route.query.id,
@@ -164,10 +164,10 @@ const handleAdd = () => {
     digest: '',
     afterTax: null
   }
-  tableForm.tableData.push(row)
+  tableForm.value.tableData.push(row)
 }
 const handleDelete = (index) => {
-  tableForm.tableData.splice(index, 1)
+  tableForm.value.tableData.splice(index, 1)
 }
 const handleSubmit = (instance) => {
   if (!instance) return
@@ -181,10 +181,10 @@ const handleSubmit = (instance) => {
       return;
     }
     instance.clearValidate()
-    tableForm.tableData.forEach(item => {
+    tableForm.value.tableData.forEach(item => {
       item.projectName = projectName.value
     })
-    const res = await addLedger(tableForm.tableData)
+    const res = await addLedger(tableForm.value.tableData)
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -204,6 +204,20 @@ const handleSubmit = (instance) => {
 const handleBack = () => {
   history.back()
 }
+onActivated(()=>{
+  tableForm.value = {
+    tableData: [
+      {
+        projectId: route.query.id,
+        time: '',
+        projectCost: '',
+        researchStage: '',
+        digest: '',
+        afterTax: null
+      }
+    ]
+  }
+})
 </script>
 <style scoped lang="scss">
 :deep(.el-table--enable-row-transition) {