Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/components/FunctionBtn.vue

@@ -5,9 +5,9 @@
 <template>
   <div class="m-Btn-eContainer" v-if="!buttonHide && ((!isReview && !funcBtnHide) || showSetBtn)">
     <div class="m-funcBtn-eContainer" v-if="!isReview && !buttonHide && !funcBtnHide">
-      <el-button type="primary" size="small" @click="confirm" :loading="$store.state.Status.loading.confirm">{{ $t('buttons.confirm') }}</el-button>
-      <el-button type="primary" size="small" @click="start" :loading="$store.state.Status.loading.submit">{{ $t('buttons.submit') }}</el-button>
-      <el-button size="small" @click="check" :loading="$store.state.Status.loading.check">{{ $t('buttons.check') }}</el-button>
+      <el-button type="primary" v-show="root.judgeVisiableInfo('mtabut.usrcon')" size="small" @click="confirm" :loading="$store.state.Status.loading.confirm">{{ $t('buttons.confirm') }}</el-button>
+      <el-button type="primary" v-show="root.judgeVisiableInfo('mtabut.sav')" size="small" @click="start" :loading="$store.state.Status.loading.submit">{{ $t('buttons.submit') }}</el-button>
+      <el-button size="small" v-show="root.judgeVisiableInfo('mtabut.chk')" @click="check" :loading="$store.state.Status.loading.check">{{ $t('buttons.check') }}</el-button>
       <el-button size="small" @click="save" :loading="$store.state.Status.loading.stash">{{ $t('buttons.stash') }}</el-button>
       <el-button size="small" @click="handleCancel">{{ $t('buttons.quit') }}</el-button>
     </div>
@@ -45,6 +45,7 @@
 // 反洗钱组件引入
 
 export default {
+    inject: ["root"],
   // 如果需要制裁信息按钮则给组件传 showAml 方法，如果不需要则不传
   props: ["handleSubmit", "handleCheck", "handleStash", "handleExit", "hideFuncBtn", "handleConfirm"],
   data: function() {
@@ -79,9 +80,13 @@ export default {
     },
     buttonHide() {
       return this.$route.path.indexOf("display") !== -1;
-    }
+    },
+
   },
   methods: {
+    // judgeVisiableInfo() {
+
+    // },
     start: async function() {
       this.handleSubmit && (await this.handleSubmit());
     },

src/mixin/commonProcess.js

@@ -416,6 +416,25 @@ export default {
       layout.changeSize(1);
       layout.currentTool = currentTool;
       layout.toolTitle = toolTitle;
+    },
+
+    /**
+     * 判断状态信息，包括visiable，modified，enabled等
+     */
+    judgeVisiableInfo(rulePath){
+        var model = this.model;
+        if(model == null){
+            return false;
+        }
+        var info = this.model.statusInfo;
+        if(info == null || info.length == 0){
+            return false;
+        }
+        var visiable = info["visiable"];
+        if(visiable[rulePath] == null){
+            return false;
+        }
+        return visiable[rulePath];
     }
   },
   computed: {

src/model/Litopn/index.js

@@ -299,7 +299,8 @@ export default class Litopn{
 						hmdmod2:{
 							bennam:"",			//  交易对手名称		.hmdmod2.bennam
 						},
-						pageId: ""			// ctx的key
+						pageId: "",			// ctx的key
+                        statusInfo: "",
 				}
     }
 }
\ No newline at end of file

src/views/Business/Litopn/Detp.vue

@@ -355,11 +355,11 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="交单期限" prop="lidgrp.blk.preper">
+        <el-form-item label="交单期限" prop="lidgrp.rec.prepertxts18">
           <c-fullbox>
             <c-input
               type="textarea"
-              v-model="model.lidgrp.blk.preper"
+              v-model="model.lidgrp.rec.prepertxts18"
               maxlength="35"
               show-word-limit
               placeholder="请输入交单期限"
@@ -376,28 +376,7 @@
         </el-form-item>
       </c-col>
 
-<<<<<<< HEAD
-            <c-col :span="24">
-                <el-form-item label="交单期限" prop="lidgrp.rec.prepertxts18">
-                    <c-fullbox>
-                    <c-input type="textarea" v-model="model.lidgrp.rec.prepertxts18" maxlength="35" show-word-limit placeholder="请输入交单期限" ></c-input>
-                <template slot="footer">
-                    <c-button 
-                    size="small" 
-                    type="primary" 
-                    icon="el-icon-search" 
-                    @click="onPreperButtxmsel"></c-button>
-                    </template>
-                    </c-fullbox>
-                </el-form-item>
-            </c-col>
-                                                    
-           
-
-            <!-- <c-col :span="24">
-=======
       <!-- <c-col :span="24">
->>>>>>> a44f1767300502ba3f9b5825d06fabccbf2a4a61
                 <el-form-item label="Presentation period text" prop="lidgrp.rec.prepertxts18">
                     <c-input  v-model="model.lidgrp.rec.prepertxts18" maxlength="35"  placeholder="请输入Presentation period text"></c-input>
                 </el-form-item>