Merge remote-tracking branch 'origin/develop' into develop

src/page/Funds/FundsRouter.js

@@ -28,8 +28,8 @@ const BusRouter = [
     meta: { title: "结售汇平盘登记" },
     module: "Funds",
   },
-  // { path: 'fxtsqo', component: ()=>import("./Fxtsqo/views"), name: 'Fxtsqo', meta: { title: 'Fxtsqo' } ,module:'Funds'},
   { path: 'fxtssb', component: ()=>import("./Fxtssb/views"), name: 'Fxtssb', meta: { title: 'Fxtssb' } ,module:'Funds'},
   { path: 'fxtsss', component: ()=>import("./Fxtsss/views"), name: 'Fxtsss', meta: { title: 'Fxtsss' } ,module:'Funds'},
+  { path: 'fxtsqo', component: ()=>import("./Fxtsqo/views"), name: 'Fxtsqo', meta: { title: 'Fxtsqo' } ,module:'Funds'},
 ];
-export default BusRouter;
+export default BusRouter

src/page/Funds/Fxtsqo/event/index.js

+import commonFunctions from '~/mixin/commonFunctions.js';
+import Api from '~/service/Api';
+
+export default {
+	mixins: [commonFunctions],
+	methods: {
+    }
+}
\ No newline at end of file

src/page/Funds/Fxtsqo/views/Fxtapll1.vue

 <template>
     <div class="eibs-tab">
-                              
         <c-col :span="12">
             <c-form-item label="XMLPanel fxtapll1的内置block" prop="fxtapll1blk">
-            <c-input type="textarea" v-model="model.fxtapll1blk" maxlength="200" show-word-limit :placeholder="$t('other.please_enter')+'XMLPanel fxtapll1的内置block'" ></c-input>
+                <c-mul-row-input :rows="4" :cols="50" :autosize="{minRows: 4, maxRows: 4}" v-model="model.fxtapll1blk" show-word-limit></c-mul-row-input>
             </c-form-item>
         </c-col>
     </div>
@@ -16,19 +15,17 @@ import Event from "../model/Event"
 
 export default {
     inject: ['root'],
-    props:["model","codes"],
+    props: ["model", "codes"],
     mixins: [commonProcess],
-    data(){
+    data() {
         return {
 
         }
     },
-    methods:{...Event},
-    created:function(){
+    methods: { ...Event },
+    created: function () {
 
     }
 }
 </script>
-<style>
-
-</style>
+<style></style>

src/page/Funds/Fxtsqo/views/index.vue

 <template>
   <div class="eContainer">
+    <c-page title="结售汇报价">
         <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="myTabClick" >
                     <!--Quote -->
@@ -31,13 +32,22 @@
                 </el-tab-pane> -->
             </c-tabs>
         </el-form>
+        <c-function-btn
+        :handleCheck="handleCheck"
+        :handleStash="handleStash"
+        :handleSubmit="handleSubmit"
+        @handleSureWarning="handleSureWarning"
+        ref="commonBtn"></c-function-btn>
+    </c-page>
   </div>
 </template>
 <script>
 import Api from "~/service/Api"
 import CodeTable from "~/config/CodeTable"
 import Fxtsqo from "../model"
-import commonProcess from "~/mixin/commonProcess"
+import commonProcess from "~/mixin/commonProcess";
+import commonDepend from "~/mixin/commonDepend";
+import operationFunc from "~/mixin/operationFunc";
 import Check from "../model/Check"
 import Default from "../model/Default"
 import Pattern from "../model/Pattern"
@@ -67,7 +77,7 @@ export default {
             root: this
         }
     },
-    mixins: [commonProcess,event,buildFn],    // 里面包含了Default、Check等的公共处理
+    mixins: [commonProcess,event,buildFn,commonDepend,operationFunc],    // 里面包含了Default、Check等的公共处理
     data(){
         return {
             tabVal: "quop",
@@ -92,17 +102,15 @@ export default {
     },
     created:async function(){
         console.log("进入fxtsqo交易");
-        let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           this.updateModel(rtnmsg.data)
-           //TODO 处理数据逻辑
+        // todo 初始化方法
+        // let rtnmsg = await this.init({})
+        // if(rtnmsg.respCode == SUCCESS) {
+        //    this.updateModel(rtnmsg.data)
+        //    //TODO 处理数据逻辑
 
-        }
-        else
-        {
-            this.$notify.error({title: '错误',message: '服务请求失败！'});
-        }
+        // } else {
+        //     this.$notify.error({title: '错误',message: '服务请求失败！'});
+        // }
     }
 }
 </script>