fix: 70482 70384 70488

src/components/Page/TaskStandard.vue

@@ -7,11 +7,7 @@
       <span class="header">{{ $route.meta.title }}</span>
       <div class="header-right">
         <slot name="header-right">
-          <header-button
-            icon="arrow-left"
-            type="no-line"
-            @click="$router.back()"
-          >
+          <header-button icon="arrow-left" type="no-line" @click="goBack()">
             返回
           </header-button>
         </slot>
@@ -38,8 +34,15 @@ export default {
   data() {
     return {}
   },
-
-  created() {}
+  methods: {
+    goBack() {
+      // 获取当前路由信息
+      const currentRoute = this.$router.currentRoute
+      // 获取来源页面的路由信息
+      const fromRoute = currentRoute.from
+      console.log(currentRoute);
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>

src/mixins/router.js

+
+export default {
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.formPath = from.path
+      console.log(vm.formPath);
+    })
+  },
+  data() {
+    return {
+      formPath: '',
+    }
+  },
+  methods: {
+    /**
+      * 返回上一页
+      */
+    goBack() {
+      if (this.formPath) {
+        this.$router.push({
+          path: this.formPath
+        })
+      } else {
+        this.$router.back()
+      }
+    }
+  }
+}

src/utils/ModelDataSource.js

@@ -50,7 +50,6 @@ ModelDataSource.prototype = {
         data: params
       })
         .then(function (response) {
-          console.log(response)
           if (response.data) {
             for (let key in response.data) {
               self[key] = response.data[key]
@@ -105,7 +104,6 @@ ModelDataSource.prototype = {
         successCallback(response)
       })
       .catch(function (error) {
-        // console.log(error.response)
         // if (error.response) {
         //   _.forEach(error.response.data, function (value, key) {
         //     typeof value === 'object' && self.vm.$set(self.vm[self.settings.dataKey].errors, key, value[0]);
@@ -168,7 +166,6 @@ ModelDataSource.prototype = {
  */
 ModelDataSource.install = function (Vue) {
   Vue.prototype.$modelDataSource = function (options) {
-    console.log(this, options)
     return new ModelDataSource(this, options)
   }
 }

src/views/processing/carReview/review-form/index.vue

 <template>
   <!--查看审查问卷页面-->
   <task-standard v-loading="loading">
+    <div slot="header-right">
+      <header-button icon="arrow-left" type="no-line" @click="goBack">
+        返回
+      </header-button>
+    </div>
     <!--2-统计值-->
     <div class="main-content-style">
       <!--任务编号,名称,单位-->
@@ -143,12 +148,14 @@
 import { checkTaskDetail, getBySubtaskId } from '@/api/task/task'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
+import routerMixins from '@/mixins/router'
 export default {
   components: {
     collapse: collapse,
     'collapse-item': collapseItem
   },
   dicts: ['test_cartype_type'],
+  mixins: [routerMixins],
   data() {
     return {
       model: {

src/views/processing/carReview/source-record/index.vue

 <template>
   <!--查看审查问卷页面-->
   <task-standard v-loading="loading">
+    <div slot="header-right">
+      <header-button icon="arrow-left" type="no-line" @click="goBack">
+        返回
+      </header-button>
+    </div>
     <!--2-统计值-->
     <div class="main-content-style">
       <!--任务编号,名称,单位-->
@@ -287,12 +292,14 @@
 import { checkTaskDetail, getBySubtaskId } from '@/api/task/task'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
+import routerMixins from '@/mixins/router'
 export default {
   components: {
     collapse: collapse,
     'collapse-item': collapseItem
   },
   dicts: ['test_cartype_type'],
+  mixins: [routerMixins],
   data() {
     return {
       isShow: true,

src/views/processing/carReview/vehicle-type/index.vue

 <template>
   <!--查看审查问卷页面-->
   <task-standard v-loading="loading">
+    <div slot="header-right">
+      <header-button icon="arrow-left" type="no-line" @click="goBack">
+        返回
+      </header-button>
+    </div>
     <!--2-统计值-->
     <div class="main-content-style">
       <!--任务编号,名称,单位-->
@@ -300,12 +305,14 @@
 import { checkTaskDetail, carTaskSubmit, getBySubtaskId } from '@/api/task/task'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
+import routerMixins from '@/mixins/router'
 export default {
   components: {
     collapse: collapse,
     'collapse-item': collapseItem
   },
   dicts: ['test_cartype_type'],
+  mixins: [routerMixins],
   data() {
     return {
       isShow: true,

src/views/processing/carReview/write-check-form/components/companyFile.vue

@@ -19,6 +19,7 @@
               <el-input
                 v-model="model.enterpriseName"
                 placeholder="请输入"
+                :disabled="true"
                 @input="updateFocus"
               ></el-input>
             </el-form-item>
@@ -63,9 +64,9 @@
           <el-col :span="12">
             <el-form-item label="文件名称" prop="fileName">
               <el-input
-                v-model="fileName"
+                v-model="model.fileName"
                 placeholder="请输入"
-                :disabled="true"
+                input="updateFocus"
               ></el-input>
             </el-form-item>
             <el-form-item label="发布日期" prop="publishDate">
@@ -95,7 +96,7 @@
 export default {
   dicts: ['file_status'],
   props: {
-    fileName: {
+    enterpriseName: {
       type: String,
       default: ''
     }
@@ -147,9 +148,6 @@ export default {
     }
   },
   watch: {
-    fileName(newValue) {
-      this.model.fileName = newValue
-    },
     'dialogManger.dialogEditId'(newValue) {
       this.model.fetch(
         newValue,
@@ -159,6 +157,9 @@ export default {
       )
     }
   },
+  mounted() {
+    this.model.enterpriseName = this.enterpriseName
+  },
   created() {
     this.model.taskId = this.$route.query.taskId
   },
@@ -183,10 +184,10 @@ export default {
         if (valid) {
           this.model.save(
             res => {
-              this.$emit('handleSave', res.data)
               this.$store.dispatch('processing/getCompanyFiles', {
                 taskId: this.$route.query.taskId
               })
+              this.$emit('handleSave', res.data)
               this.$modal.msgSuccess('提交文件成功')
             },
             errors => {}

src/views/processing/carReview/write-check-form/index.vue

@@ -9,7 +9,7 @@
         >
           预览表单
         </header-button>
-        <header-button icon="arrow-left" type="no-line" @click="handleBack">
+        <header-button icon="arrow-left" type="no-line" @click="goBack">
           返回
         </header-button>
       </div>
@@ -238,7 +238,7 @@
               <company-file
                 v-show="formManger.show"
                 style="margin-left: 125px"
-                :file-name="formManger.fileName"
+                :enterprise-name="model.carReviewTask.enterpriseName"
                 @handleUpdate="handleFileUpdate"
                 @handleSave="handleFileSave"
               ></company-file>
@@ -282,6 +282,7 @@ import companyFile from './components/companyFile.vue'
 import { mapGetters } from 'vuex'
 import sceneDialog from './components/sceneDialog.vue'
 import previewView from './components/previewView.vue'
+import routerMixins from '@/mixins/router'
 export default {
   components: {
     'scene-dialog': sceneDialog,
@@ -289,6 +290,7 @@ export default {
     'scene-view': sceneView,
     'company-file': companyFile
   },
+  mixins: [routerMixins],
   dicts: ['test_cartype_type'],
   data() {
     return {
@@ -426,6 +428,7 @@ export default {
     },
     querySelect(e) {
       this.form.reviewEnterpriseArchiveId = e.id
+      console.log('企业文件筛选' + e.id)
     },
     querySearch(queryString, cb) {
       const files = this.companyFiles
@@ -562,13 +565,12 @@ export default {
       this.activeModel = index
       if (this.detailsList.length) {
         this.taskModel = JSON.parse(JSON.stringify(this.detailsList[index]))
-        console.log(this.taskModel)
         if (this.taskModel.result) {
           this.form = {
             passed: this.taskModel.result.passed,
             reviewDetailsId: this.taskModel.id,
             taskId: this.taskId,
-            fileName: this.taskModel.result.enterpriseName,
+            fileName: this.taskModel.result.fileName,
             catalogue: this.taskModel.result.catalogue,
             reviewEnterpriseArchiveId:
               this.taskModel.result.reviewEnterpriseArchiveId
@@ -577,7 +579,7 @@ export default {
             passed: this.taskModel.result.passed,
             reviewDetailsId: this.taskModel.id,
             taskId: this.taskId,
-            fileName: this.taskModel.result.enterpriseName,
+            fileName: this.taskModel.result.fileName,
             catalogue: this.taskModel.result.catalogue,
             reviewEnterpriseArchiveId:
               this.taskModel.result.reviewEnterpriseArchiveId

src/views/processing/fileLibrary/index.vue

 <template>
   <task-standard>
+    <div slot="header-right">
+      <header-button icon="arrow-left" type="no-line" @click="goBack">
+        返回
+      </header-button>
+    </div>
     <el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
       <template v-if="showSearch">
         <el-form-item prop="fileName" label="文件名称">
@@ -189,12 +194,13 @@
 <script>
 import page from '@/mixins/page'
 import dialog from './components/dialog.vue'
+import routerMixins from '@/mixins/router'
 export default {
   components: {
     'yan-dialog': dialog
   },
   dicts: ['file_status'],
-  mixins: [page],
+  mixins: [page, routerMixins],
   data() {
     return {
       // 弹窗管理器

src/views/processing/retention-file/index.vue

@@ -5,7 +5,7 @@
         icon="arrow-left"
         class="back-btn"
         type="no-line"
-        @click="handleBack"
+        @click="goBack"
       >
         返回
       </header-button>
@@ -51,7 +51,9 @@
 
 <script>
 import { getTaskById } from '@/api/task/task'
+import routerMixins from '@/mixins/router'
 export default {
+  mixins: [routerMixins],
   data() {
     return {
       task: {},

src/views/processing/systemReview/confirm-result/index.vue

 <template>
   <!--查看审查问卷页面-->
   <task-standard v-loading="loading">
+    <div slot="header-right">
+      <header-button
+        icon="arrow-left"
+        class="back-btn"
+        type="no-line"
+        @click="goBack"
+      >
+        返回
+      </header-button>
+    </div>
     <!--2-统计值-->
     <div class="main-content-style">
       <!--任务编号,名称,单位-->
@@ -275,12 +285,14 @@
 import { reviewTaskDetail, taskSubmit, getBySubtaskId } from '@/api/task/task'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
+import routerMixins from '@/mixins/router'
 export default {
   components: {
     collapse: collapse,
     'collapse-item': collapseItem
   },
   dicts: ['system_review_test'],
+  mixins: [routerMixins],
   data() {
     return {
       isShow: 1,

src/views/processing/systemReview/review-form/index.vue

 <template>
   <!--查看审查问卷页面-->
   <task-standard v-loading="loading">
+    <div slot="header-right">
+      <header-button
+        icon="arrow-left"
+        class="back-btn"
+        type="no-line"
+        @click="goBack"
+      >
+        返回
+      </header-button>
+    </div>
     <!--2-统计值-->
     <div class="main-content-style">
       <!--任务编号,名称,单位-->
@@ -142,11 +152,13 @@
 import { reviewTaskDetail, getBySubtaskId } from '@/api/task/task'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
+import routerMixins from '@/mixins/router'
 export default {
   components: {
     collapse: collapse,
     'collapse-item': collapseItem
   },
+  mixins: [routerMixins],
   dicts: ['system_review_test'],
   data() {
     return {

src/views/processing/systemReview/source-record/index.vue

 <template>
   <!--查看审查问卷页面-->
   <task-standard v-loading="loading">
+    <div slot="header-right">
+      <header-button
+        icon="arrow-left"
+        class="back-btn"
+        type="no-line"
+        @click="goBack"
+      >
+        返回
+      </header-button>
+    </div>
     <!--2-统计值-->
     <div class="main-content-style">
       <!--任务编号,名称,单位-->
@@ -319,12 +329,14 @@
 import { reviewTaskDetail, getBySubtaskId } from '@/api/task/task'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
+import routerMixins from '@/mixins/router'
 export default {
   components: {
     collapse: collapse,
     'collapse-item': collapseItem
   },
   dicts: ['system_review_test'],
+  mixins: [routerMixins],
   data() {
     return {
       isShow: 1,

src/views/processing/systemReview/write-check-form/components/companyFile.vue

@@ -19,6 +19,7 @@
               <el-input
                 v-model="model.enterpriseName"
                 placeholder="请输入"
+                :disabled="true"
                 @input="updateFocus"
               ></el-input>
             </el-form-item>
@@ -63,9 +64,9 @@
           <el-col :span="12">
             <el-form-item label="文件名称" prop="fileName">
               <el-input
-                v-model="fileName"
+                v-model="model.fileName"
                 placeholder="请输入"
-                :disabled="true"
+                input="updateFocus"
               ></el-input>
             </el-form-item>
             <el-form-item label="发布日期" prop="publishDate">
@@ -95,7 +96,7 @@
 export default {
   dicts: ['file_status'],
   props: {
-    fileName: {
+    enterpriseName: {
       type: String,
       default: ''
     }
@@ -147,9 +148,6 @@ export default {
     }
   },
   watch: {
-    fileName(newValue) {
-      this.model.fileName = newValue
-    },
     'dialogManger.dialogEditId'(newValue) {
       this.model.fetch(
         newValue,
@@ -159,6 +157,9 @@ export default {
       )
     }
   },
+  mounted() {
+    this.model.enterpriseName = this.enterpriseName
+  },
   created() {
     this.model.taskId = this.$route.query.taskId
   },

src/views/processing/systemReview/write-check-form/index.vue

@@ -9,7 +9,12 @@
         >
           预览表单
         </header-button>
-        <header-button icon="arrow-left" type="no-line" @click="handleBack">
+        <header-button
+          icon="arrow-left"
+          class="back-btn"
+          type="no-line"
+          @click="goBack"
+        >
           返回
         </header-button>
       </div>
@@ -35,7 +40,7 @@
               </span>
             </div>
             <div class="task-item">
-              <span class="task-label">委托单位:</span>
+              <span class="task-label">任务状态:</span>
               <span class="task-content">
                 {{
                   getDictData(
@@ -243,7 +248,7 @@
               <company-file
                 v-show="formManger.show"
                 style="margin-left: 125px"
-                :file-name="formManger.fileName"
+                :enterprise-name="model.systemReviewTask.enterpriseName"
                 @handleUpdate="handleFileUpdate"
                 @handleSave="handleFileSave"
               ></company-file>
@@ -287,7 +292,7 @@ import companyFile from './components/companyFile.vue'
 import { mapGetters } from 'vuex'
 import sceneDialog from './components/sceneDialog.vue'
 import previewView from './components/previewView.vue'
-previewView
+import routerMixins from '@/mixins/router'
 export default {
   components: {
     'scene-dialog': sceneDialog,
@@ -295,9 +300,11 @@ export default {
     'scene-view': sceneView,
     'company-file': companyFile
   },
+  mixins: [routerMixins],
   dicts: ['system_review_test'],
   data() {
     return {
+      formPath: '',
       sceneManger: {
         dialogVisible: false
       },
@@ -370,6 +377,7 @@ export default {
       loading: false
     }
   },
+
   computed: {
     readNumber() {
       let num = 0
@@ -420,6 +428,18 @@ export default {
     this.handleCircle(0)
   },
   methods: {
+    /**
+     * 返回上一页
+     */
+    goBack() {
+      if (this.formPath) {
+        this.$router.push({
+          path: this.formPath
+        })
+      } else {
+        this.$router.back()
+      }
+    },
     /**
      * 企业文件保存回调
      */
@@ -578,7 +598,7 @@ export default {
             passed: this.taskModel.result.passed,
             reviewDetailsId: this.taskModel.id,
             taskId: this.taskId,
-            fileName: this.taskModel.result.enterpriseName,
+            fileName: this.taskModel.result.fileName,
             catalogue: this.taskModel.result.catalogue,
             reviewEnterpriseArchiveId:
               this.taskModel.result.reviewEnterpriseArchiveId
@@ -587,7 +607,7 @@ export default {
             passed: this.taskModel.result.passed,
             reviewDetailsId: this.taskModel.id,
             taskId: this.taskId,
-            fileName: this.taskModel.result.enterpriseName,
+            fileName: this.taskModel.result.fileName,
             catalogue: this.taskModel.result.catalogue,
             reviewEnterpriseArchiveId:
               this.taskModel.result.reviewEnterpriseArchiveId