Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/config/CodeTable/index.js

@@ -2918,6 +2918,12 @@ const CodeTable = {
 		{ label: "票据买断", value: "F" },
 		{ label: "出口贴现", value: "D" },
 	],
+	fintyp1:[
+		{label:"进口信用证押汇",value:"BRF"},
+		{label:"进口代收押汇",value:"BCF"},
+		{label:"汇出汇款押汇",value:"ECF"},
+		{label:"打包贷款",value:"PCL"},
+	],
 	fktype: [
 		{ label: "邮划", value: "Y" },
 		{ label: "电划", value: "D" },

src/model/Busvol/Check.js

+import Utils from "~/utils"
+
+/**
+* Busvol Check规则
+*/
+
+let checkObj={
+    "" :null,
+    
+
+}
+for (const key in checkObj) {
+    if (Object.hasOwnProperty.call(checkObj, key)) {
+        checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
+    }
+}
+export default checkObj
\ No newline at end of file

src/model/Busvol/Default.js

+/**
+* Busvol  Default规则
+*/
+import Api from "~/service/Api";
+import Utils from "~/utils/index"
+
+export default {
+    "": Utils.defaultFunction,
+
+
+}

src/model/Busvol/Event.js

+import Api from "~/service/Api"
+import Utils from "~/utils"
+
+export default{
+    async handleSearch(){
+
+    },
+
+    async handleReset(){
+
+    }
+}
\ No newline at end of file

src/model/Busvol/Pattern.js

+export default {
+   
+}
\ No newline at end of file

src/model/Busvol/index.js

+import Api from "~/service/Api"
+import Pts from "../Common/Pts"
+
+export default class Gitset{
+    constructor () {
+        this.data = {
+				}
+    }
+}
\ No newline at end of file

src/model/Iaefts/Check.js

+import Utils from "~/utils"
+
+/**
+* Iaefts Check规则
+*/
+
+let checkObj={
+    "" :null,
+    
+
+}
+for (const key in checkObj) {
+    if (Object.hasOwnProperty.call(checkObj, key)) {
+        checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
+    }
+}
+export default checkObj
\ No newline at end of file

src/model/Iaefts/Default.js

+/**
+* Iaefts  Default规则
+*/
+import Api from "~/service/Api";
+import Utils from "~/utils/index"
+
+export default {
+    "": Utils.defaultFunction,
+
+
+}

src/model/Iaefts/Event.js

@@ -3,16 +3,18 @@ import Utils from "~/utils"
 
 export default {
     async handleSearch(){
-        let rtnmsg = await this.executeRule("infbut.butprt")
-        if(rtnmsg.respCode == SUCCESS)
-        {
-        //TODO 处理数据逻辑
-
-        }
-        else
-        {
-        this.$notify.error({title: '错误',message: '服务请求失败！'});
-        }
+        console.log(this.tempData.tdata)
+        // this.stmData.data=this.tempData.tdata
+        // let rtnmsg = await this.executeRule("infbut.butprt")
+        // if(rtnmsg.respCode == SUCCESS)
+        // {
+        // //TODO 处理数据逻辑
+        // this.data=this.tdata    
+        // }
+        // else
+        // {
+        // this.$notify.error({title: '错误',message: '服务请求失败！'});
+        // }
     },
 
     async handleReset(){

src/model/Iaefts/Pattern.js

+export default {
+   
+}
\ No newline at end of file

src/model/Iaefts/index.js

+
+import Api from "~/service/Api"
+import Pts from "../Common/Pts"
+
+export default class Gitset{
+    constructor () {
+        this.data = {
+				}
+    }
+}
\ No newline at end of file

src/model/Notice/Pattern.js

@@ -4,8 +4,8 @@ export default{
         {max: 20,message:"长度不能超过20"}
 
     ],
-    "theme":[
-        {type: "string", required: false, message: "必输项"},
+    "edit.theme":[
+        {type: "string", required: true, message: "必输项" ,trigger:'change'},
         {max: 20,message:"长度不能超过20"}
     ],
     "unit":[

src/service/notice/index.js

 import Api from "~/service/Api"
 
 export function my(data) {
-    return Api.post("/notice/task/my", data)
+    return Api.post("/report/notice/my", data)
 }
\ No newline at end of file

src/views/Business/BusRouter.js

@@ -129,6 +129,7 @@ import Notice from "./Notice"
 
 import Iaefts from "./Iaefts"
 import Expben from "./Expben"
+import Busvol from "./Busvol"
 
 import AssetInfo from "./AssetInfo"
 import AssetPub from "./AssetPub"
@@ -260,8 +261,8 @@ const BusRouter = [
   { path: 'gitcrq', component: Gitcrq, name: 'Gitcrq', meta: { title: '进口保函索赔登记' } },
 
   { path: 'ditdav', component: Ditdav, name: 'Ditdav', meta: { title: '信用证收单' } },
-  { path: 'Infpty', component: Infpty, name: 'Infpty', meta: { title: 'Infpty' } },
-  { path: 'Dbipty', component: Dbipty, name: 'Dbipty', meta: { title: 'Dbipty' } },
+  { path: 'Infpty', component: Infpty, name: 'Infpty', meta: { title: '客户查询' } },
+  { path: 'Dbipty', component: Dbipty, name: 'Dbipty', meta: { title: '客户静态信息管理' } },
   { path: 'betdcr', component: Betdcr, name: 'Betdcr', meta: { title: '出口信用证电提不符点/拒付' } },
   { path: 'betdrv', component: Betdrv, name: 'Betdrv', meta: { title: '出口信用证单据修改' } },
   { path: 'letnot', component: Letnot, name: 'Letnot', meta: { title: '出口信用证预通知' } },
@@ -274,8 +275,9 @@ const BusRouter = [
   { path: 'notice', component: Notice, name: 'Notice', meta: { title: '通知公告设置' } },
 
 
-  { path: 'Iaefts', component: Iaefts, name: 'Iaefts', meta: { title: '进出口融资交易' } },
-  { path: 'Expben', component: Expben, name: 'Expben', meta: { title: '费用收益交易' } },
+  { path: 'Iaefts', component: Iaefts, name: 'Iaefts', meta: { title: '融资量交易' } },
+  { path: 'Expben', component: Expben, name: 'Expben', meta: { title: '费用收益' } },
+  { path: 'Busvol', component: Busvol, name: 'Busvol', meta: { title: '业务量交易' } },
 
   { path: 'assetinfo', component: AssetInfo, name: 'AssetInfo', meta: { title: '资产信息管理' } },
   { path: 'assetpub', component: AssetPub, name: 'AssetPub', meta: { title: '资产发布信息管理' } },

src/views/Business/Busvol/index.vue

+<template>
+  <div class="eContainer">
+    <el-form
+      :model="model"
+      :rules="rules"
+      ref="modelForm"
+      label-width="150px"
+      label-position="right"
+      size="small"
+      :validate-on-rule-change="false"
+    >
+
+    <m-Volume :model="model" :codes="codes" />
+    </el-form>
+  </div>
+</template>
+
+<script>
+import commonProcess from "~/mixin/commonProcess";
+import commonFuncs from "~/mixin/commonFuncs";
+import CodeTable from "~/config/CodeTable";
+import Check from "~/model/Busvol/Check";
+import Default from "~/model/Busvol/Default";
+import Pattern from "~/model/Busvol/Pattern"
+
+import Busvol from "~/model/Busvol"
+
+import Volume from "./Volume";
+
+export default {
+    name:"Busvol",
+    mixins:[commonProcess, commonFuncs],
+
+    components:{
+        "m-Volume" : Volume,
+    },
+
+    provide() {
+    return {
+      root: this,
+    };
+  },
+
+    data() {
+        return {
+            tabVal:"Volume",
+            trnNam:"Busvol",
+            model: null,
+            checkRules: Check,
+            defaultRules: Default,
+            pattern: Pattern,
+            rules: null,
+            codes: { ...CodeTable },
+        }
+    },
+    methods: {
+   
+  },
+  created: async function () {
+    console.log("进入业务量交易");
+  },
+
+};
+</script>
+
+<style></style>

src/views/Business/Expben/index.vue

 <template>
   <div class="eContainer">
   <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
-  <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
+  <!-- <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
   
-      <el-tab-pane label="费用收益" name="ExpenseIncome">
+      <!-- <el-tab-pane label="费用收益" name="ExpenseIncome"> -->
           <m-ExpenseIncome :model="model" :codes="codes"/>
-      </el-tab-pane>
+      <!-- </el-tab-pane> -->
   
-  </c-tabs>
+  <!-- </c-tabs> -->
   </el-form> 
   </div>  
 </template>

src/views/Business/Iaefts/index.vue

 <template>
-  <div class="eContainer">
-  <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
-  <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
-  
-      <el-tab-pane label="进出口融资量" name="Finance">
-          <m-Finance :model="model" :codes="codes"/>
-      </el-tab-pane>
-  
-  </c-tabs>
-  </el-form> 
-  </div>  
+  <div class="eContainer" style="height: 90%">
+    <el-form
+      :model="model"
+      :rules="rules"
+      ref="modelForm"
+      label-width="150px"
+      label-position="right"
+      size="small"
+      :validate-on-rule-change="false"
+    >
+      <m-Finance :model="model" :codes="codes" />
+      <!-- 去除tabs的蓝底下划线 -->
+      <!-- <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
+      <!-- Tabs 标签页 -->
+      <!-- <el-tab-pane label="进出口融资量" name="Finance"> -->
+
+      <!-- </el-tab-pane> -->
+
+      <!-- </c-tabs> -->
+    </el-form>
+  </div>
 </template>
 
 <script>
-import commonProcess from "~/mixin/commonProcess"
-import CodeTable from "~/config/CodeTable"
+import commonProcess from "~/mixin/commonProcess";
+import commonFuncs from "~/mixin/commonFuncs";
+import CodeTable from "~/config/CodeTable";
+import Iaefts from "~/model/Iaefts";
 
-import Finance from "./Finance"
+
+import Finance from "./Finance";
 
 export default {
-    name:"Iaefts",
-    mixins: [commonProcess], 
-    
-    components:{
-        "m-Finance" : Finance,
-    },
-    provide() {
-        return {
-            root: this
-        }
-    },
-    
-    data(){
-        return {
-            tabVal: "Finance",
-            trnName: "iaefts",
-            model: null,
-            rules: null,
-            codes: {
-            },
-        }
-    },
-
-    methods:{
-        tabClick(){
-        }
-    },
-
-    created:async function(){
-        console.log("进入进出口融资")    
-    }
-    
-
-
-}
+  name: "Iaefts",
+  mixins: [commonProcess, commonFuncs],
 
-</script>
+  components: {
+    "m-Finance": Finance,
+  },
+  provide() {
+    return {
+      root: this,
+    };
+  },
 
-<style>
+  data() {
+    return {
+      tabVal: "Finance",
+      trnName: "iaefts",
+      model: null,
+      checkRules: null,
+      defaultRules: null,
+      pattern: null,
+      rules: null,
+      codes: { ...CodeTable },
+    };
+  },
+
+  methods: {
+   
+  },
+
+  created: async function () {
+    console.log("进入进出口融资");
+  },
+};
+</script>
 
-</style>
\ No newline at end of file
+<style></style>

src/views/Business/Notice/index.vue

@@ -12,7 +12,7 @@
                :validate-on-rule-change="false"
                >
                 <c-content> 
-                    <m-infsea   :model="model" :codes="codes" ref="infsea"/>
+                    <m-infsea   :model="model" :rules="rules" :codes="codes" ref="infsea"/>
                 
                 </c-content>
                <!-- <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->

src/views/Home/cells/CustomerAnalyse.vue

@@ -31,7 +31,7 @@ export default {
       echartInstance: null,
       //componentIndex
       mapping: {
-        0: "trnfnd",
+        0: "busvol",
         1: "iaefts",
         2: "expben",
       },
@@ -201,11 +201,10 @@ export default {
 
         //  要使用=>函数使内外的this指向一致
         if (path === 0) {
-          this.$router.push("/taskList").then(() => {
-            this.$store.commit(
-              "setTaskListTabVal",
-              this.mapping[params.componentIndex]
-            );
+          this.$router.push({
+            path:"/business/Busvol",
+            query:{name: params.name}
+
           });
         } else if (path === 1) {
           //{path:"/xxxpath",query:"id:xxx"} router跳转页面传参业务 接受页面用created(){if(this.$route.query){todo}}

vue.config.js

@@ -47,13 +47,7 @@ module.exports = {
           '^/gjjs/report': '/gjjs/report'
         }
       },
-      '/gjjs/notice/': {
-        target: 'http://127.0.0.1:8085',
-        changeOrigin: true,
-        pathRewrite: {
-          '^/gjjs/notice': '/gjjs/notice'
-        }
-      },
+      
       '/gjjs/devtools/': {
         target: 'http://127.0.0.1:8083',
         changeOrigin: true,