Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/components/Content.vue

@@ -10,7 +10,7 @@
 			height: {
 				type: Number,
 				require: false,
-				default: 275
+				default: 250
 			}
 		},
 		data() {

src/components/HighlightContent.vue

 <template>
-<div @click="handleClick" :id="id" :class="{'c-highlight-content': true, 'highlight': highlight, 'change-light': highlightChanges}">
-  <slot></slot>
-</div>
+  <div @click="handleClick" :id="id" :class="{'c-highlight-content': true, 'highlight': highlight, 'change-light': highlightChanges}">
+    <slot></slot>
+  </div>
 </template>
 
 <script>

src/components/c-page.vue

 <template>
   <div class="c-page-container">
-    <!-- <div class="title">
+    <!-- <div class="title" v-if="showTitle">
       <i class="el-icon-location" style="color: #409eff;"></i>
       <span>{{ title }}</span>
     </div> -->
@@ -13,6 +13,11 @@
 <script>
 export default {
   props: ["title"],
+  computed: {
+    // showTitle() {
+    //   return this.$route.path.startsWith('/review');
+    // }
+  }
 };
 </script>
 <style scoped>

src/routers/index.js

@@ -15,6 +15,12 @@ const DisplayRouter = BusRouter.map(route => {
     return newRoute;
 })
 
+const ReviewRouter = BusRouter.map(route => {
+    const newRoute = Object.assign({}, route)
+    newRoute.name = newRoute.name + 'Review'
+    return newRoute;
+})
+
 /**
  * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
  * 
@@ -45,13 +51,14 @@ export const routes = [
         component: Layout,
         redirect: "/home",
         children: [
-            { path: 'home', component: () => import('~/views/Home'), name: 'Home', meta: { title: '首页', icon: 'el-icon-s-home', affix: true} },
-            { path: 'taskList', component: () => import('~/views/TaskList'), name: 'TaskList', meta: { title: '任务列表', icon: 'el-icon-s-claim', affix: true} },
+            { path: 'home', component: () => import('~/views/Home'), name: 'Home', meta: { title: '首页', icon: 'el-icon-s-home', affix: true } },
+            { path: 'taskList', component: () => import('~/views/TaskList'), name: 'TaskList', meta: { title: '任务列表', icon: 'el-icon-s-claim', affix: true } },
         ],
     },
-    { path: "/display", component: Display, children: DisplayRouter },
+    { path: "/review", component: Layout, children: ReviewRouter },
     { path: "/business", component: Layout, children: BusRouter },
-    { path: "/login", component: Login },
+    { path: "/display", component: Display, children: DisplayRouter },
+    { path: "/login", component: Login, name: "Login" },
     { path: "/docpan", component: () => import("../views/Docpan"), children: DocRouter },
 ];
 

src/views/Business/BusRouter.js

@@ -77,10 +77,10 @@ const BusRouter = [
   { path: 'ditame', component: Ditame, name: 'Ditame', meta: { title: '信用证修改' } },
   { path: 'ditcan', component: Ditcan, name: 'Ditcan', meta: { title: '信用证注销' } },
   { path: 'ditsel', component: Ditsel, name: 'Ditsel', meta: { title: '信用证查询' } },
+  { path: 'ditopn', component: Ditopn, name: 'Ditopn', meta: { title: (tag) => { return tag.path.startsWith("/review") ? "复核：" : '买方信用证开立' } } },
   { path: 'infdid', component: Infdid, name: 'Infdid', meta: { title: '信用证查询' } },
-  { path: 'ditopn', component: Ditopn, name: 'Ditopn', meta: { title: '买方信用证开立' } },
   // 例
-  { path: 'ditopn/:inr', component: Ditopn, name: 'DitopnInr', meta: { title: (params) => { return '买方信用证开立-' + params.inr } } },
+  { path: 'ditopn/:inr', component: Ditopn, name: 'DitopnInr', meta: { title: (tag) => { return '买方信用证开立-' + tag.params.inr } } },
   { path: 'office', component: Office, name: 'Office', meta: { title: 'Office' } },
   { path: 'sptsel', component: Sptsel, name: 'Sptsel', meta: { title: '待办任务' } },
   { path: 'sptbrk', component: Sptbrk, name: 'Sptbrk', meta: { title: '草稿箱' } },

src/views/Business/index.vue

@@ -10,6 +10,7 @@
 
 <script>
 export default {
+  name: "Business",
   created: () => {
     console.log("进入业务交易界面");
   },
@@ -27,8 +28,7 @@ export default {
 <style>
 #business_container {
   /* height: 100%; */
-  height: calc(100% - 36px);
-  position: absolute;
   width: 100%;
+  flex: 1;
 }
 </style>

src/views/Display/index.vue

@@ -8,6 +8,7 @@
 import businessContainer from "../Business"
 import { mapMutations } from 'vuex'
 export default {
+    name: "Display",
     components:{
         businessContainer //复用业务容器
     },

src/views/Layout/components/TagsView/index.vue

@@ -21,7 +21,7 @@
           :class="tag.meta.icon"
         ></span>
         {{
-          typeof tag.title === "function" ? tag.title(tag.params) : tag.title
+          typeof tag.title === "function" ? tag.title(tag) : tag.title
         }}
         <span
           v-if="!isAffix(tag)"

src/views/Layout/index.vue

@@ -14,7 +14,11 @@
       <el-main class="m-app-main">
         <tagViews></tagViews>
         <div style="height: 2px"></div>
-        <business style="background-color: var(--bgcolor)"></business>
+        <keep-alive>
+          <component v-bind:is="activeComponentName"></component>
+        </keep-alive>
+        <!-- <business v-if="activeComponentName === 'Business'"></business>
+        <review v-if="activeComponentName === 'Review'"></review> -->
         <toolbars></toolbars>
       </el-main>
     </el-container>
@@ -24,23 +28,33 @@
 <script>
 import headerCom from "./Header";
 import sideMenu from "./SideMenu";
-import tagViews from "./components/TagsView"
+import tagViews from "./components/TagsView";
 import business from "../Business";
-import toolbars from "~/components/Toolbars"
+import review from "../Review";
+import toolbars from "~/components/Toolbars";
 
 export default {
-  components: { headerCom, sideMenu, tagViews, business, toolbars }
+  name: "Layout",
+  components: { headerCom, sideMenu, tagViews, business, review, toolbars },
+  computed: {
+    activeComponentName() {
+      return this.$route.path.startsWith("/review") ? "review" : "business"
+    }
+  }
 };
 </script>
 
 <style>
 .m-app-main {
+  background-color: var(--bgcolor);
   padding: 0;
   position: relative;
   height: 100%;
-  /* padding-bottom: 68px; */
   box-sizing: border-box;
   margin-right: 10px;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
 }
 .el-aside {
   height: 100%;

src/views/Review/RefuseNode.vue

+<template>
+<div>
+  <el-radio-group v-model="model">
+    <el-radio v-for="item in nodelist" :key="item.value" :label="item.value">{{item.label}}</el-radio>
+  </el-radio-group>
+  <p v-if="errShow" style="color: red">{{errMsg}}</p>
+</div>
+</template>
+<script>
+import Request from '~/utils/request'
+
+export default {
+  props: ['txSriNo'],
+  data: function () {
+    return {
+      nodelist: [],
+      model: '',
+      errShow: false,
+      errMsg: ''
+    }
+  },
+  mounted: function () {
+    console.log('mounted')
+    this.getList()
+  },
+  // watch: {
+  //   'dialogVisible': function() {
+  //     // if (this.dialogVisible && this.nodelist.length == 0 && this.txSriNo) {
+  //     //   this.getList()
+  //     // }
+  //     if (!this.dialogVisible) {
+  //       this.errShow = false
+  //       this.errMsg = ''
+  //     }
+  //   }
+  // },
+  methods: {
+    getList: function () {
+      Request.get('/v1/pm/process/taskBackQry/'+ this.txSriNo).then(res => {
+        if (res.code == '000000' && res.data && res.data.length > 0) {
+          this.nodelist = []
+          res.data.forEach(item => {
+            if (item.taskName && item.returnNodeNo) {
+              this.nodelist.push(
+                 {
+                    label: item.taskName || item.taskDesc || '',
+                    value: item.returnNodeNo || item.taskId || ''
+                  }
+              )
+            }
+            return
+          })
+        }
+      })
+    },
+    check: function () {
+      if (this.model) {
+        this.errShow = false
+        this.errMsg = ''
+        return this.model
+      } else {
+        this.errShow = true
+        this.errMsg = '请选择需要打回的节点'
+        return false
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file

src/views/Review/btnStatusConfig.js

+export const TaskFlagStatusMap = {
+  '3': { // 未完成详情
+    showStart: false,
+    showSubmit: false,
+    showCheck: false,
+    showSave: false,
+    showRefuse: false,
+    showAccRefuse: false,
+    showPass: false,
+    showReSubmit: false,
+    showReAcc: false,
+    showCheckAcc: false,
+    showEdit: false
+  },
+  '4': { // 已完成详情
+    showStart: false,
+    showSubmit: false,
+    showCheck: false,
+    showSave: false,
+    showRefuse: false,
+    showAccRefuse: false,
+    showPass: false,
+    showReSubmit: false,
+    showReAcc: false,
+    showCheckAcc: false,
+    showEdit: false
+  },
+  '5': { // 草稿箱进入
+    showStart: true,
+    showSubmit: false,
+    showCheck: true,
+    showSave: true,
+    showPass: false,
+    showRefuse: false,
+    showAccRefuse: false,
+    showReSubmit: false,
+    showReAcc: false,
+    showCheckAcc: false,
+    showEdit: false
+  }
+}
+
+export const ProcessStatusMap = {
+  '0': { // 受理中心经办
+    showStart: false,
+    showSubmit: true,
+    showCheck: true,
+    showSave: true,
+    showPass: false,
+    showRefuse: false,
+    showAccRefuse: false,
+    // showReSubmit: false,
+    showReAcc: false,
+    showCheckAcc: false,
+    showEdit: true
+  },
+  '1': { // 复核
+    showStart: false,
+    showSubmit: false,
+    showCheck: false,
+    showSave: false,
+    showPass: true,
+    showRefuse: true,
+    showAccRefuse: false,
+    // showReSubmit: false,
+    showReAcc: false,
+    showCheckAcc: false,
+    showEdit: false
+  },
+  '2': { // 单证中心经办
+    showStart: false,
+    showSubmit: true,
+    showCheck: true,
+    showSave: false,
+    showPass: false,
+    showRefuse: true,
+    showAccRefuse: false,
+    // showReSubmit: false,
+    showReAcc: false,
+    showCheckAcc: false,
+    showEdit: true
+  },
+  '3': { // 受理中心经办 打回
+    showStart: false,
+    showSubmit: true,
+    showCheck: true,
+    showSave: false,
+    showPass: false,
+    showRefuse: false,
+    showAccRefuse: false,
+    // showReSubmit: false,
+    showReAcc: false,
+    showCheckAcc: false,
+    showEdit: true
+  },
+  '4': { // 单证中心经办 打回
+    showStart: false,
+    showSubmit: true,
+    showCheck: true,
+    showSave: false,
+    showPass: false,
+    showRefuse: true,
+    showAccRefuse: false,
+    // showReSubmit: false,
+    showReAcc: false,
+    showCheckAcc: false,
+    showEdit: true
+  },
+  '5': { // 人工确认
+    showStart: false,
+    showSubmit: false,
+    showCheck: false,
+    showSave: false,
+    showPass: false,
+    showRefuse: false,
+    showAccRefuse: true,
+    // showReSubmit: true,
+    showReAcc: true,
+    showCheckAcc: true,
+    showEdit: false
+  }
+}
+
+export const NoSaveList = [
+  'public/refMessage/EleMessageReg'
+]
\ No newline at end of file