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

src/mixin/commonProcess.js

@@ -70,12 +70,13 @@ export default {
       for (let i = 0; i < fields.length; i++) {
         const field = fields[i];
         if (field.prop === prop) {
-          if (field.$children[1].$children[0].$el.className.startsWith("el-select")) {
+          if (field.$children[1].$children[0].$el.className.startsWith("el-select") || field.$children[1].$children[0].$el.className.startsWith("el-checkbox")) {
             return "change";
           }
           return "blur";
         }
       }
+      return "blur";
     },
     changeFormValidateDisabled(flag) {
       const fields = this.$refs.modelForm.fields

src/model/Ditopn/Default.js

@@ -260,7 +260,7 @@ function defaultDidgrpRecExpplc() {
 }
 function defaultDidgrpAdvPtsBankno() {
     const that = this;
-    that.executeRule("executeRule").thes(res => {
+    that.executeRule("executeRule").then(res => {
         //TODO
     })
 }

src/model/Ditopn/Pattern.js

@@ -504,7 +504,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "liaall.misamt":[
-        {type: "number", required: false, message: "必输项"},
+        // {type: "number", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],

src/model/Trnrel/Event.js

@@ -341,5 +341,8 @@ export default {
     },
     onSeainf() {
 
+    },
+    display(index, row){
+        window.open("/#/display/"+row['10'].toLowerCase()+"?trn="+row['1']);
     }
 }
\ No newline at end of file

src/views/Business/Ditopn/index.vue

@@ -203,6 +203,7 @@ export default {
         console.log("进入ditopn交易");
         this.changeFormValidateDisabled(true);
         let rtnmsg = await this.init()
+        // let rtnmsg = {respCode: ''}
         if(rtnmsg.respCode == SUCCESS)
         {
             //更新数据

src/views/Business/Sptsel/Menu.vue

 <template>
     <div class="eibs-tab">
 
-        <el-col :span="24" style="text-align:center;margin-bottom: 18px;">
-            <c-checkbox v-model="model.chkinc">Incoming</c-checkbox>
-            <c-checkbox v-model="model.chkpen">Pending</c-checkbox>
-            <c-checkbox v-model="model.chkcor">Correction</c-checkbox>
-            <c-checkbox v-model="model.chkaut">Automatic</c-checkbox>
-            <c-checkbox v-model="model.chkdel">Deleted</c-checkbox>
-            <c-checkbox v-model="model.chktco">网银</c-checkbox>
-            <c-checkbox v-model="model.chkcan">归档</c-checkbox>
+        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
+            <el-form-item label="" prop="chkinc">
+                    <c-checkbox v-model="model.chkinc">Incoming</c-checkbox>
+            </el-form-item>
+        </el-col>
+
+        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
+            <el-form-item label="" prop="chkinc">
+                <c-checkbox v-model="model.chkpen">Pending</c-checkbox>
+            </el-form-item>
+        </el-col>
+
+        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
+            <el-form-item label="" prop="chkinc">
+                <c-checkbox v-model="model.chkcor">Correction</c-checkbox>
+            </el-form-item>
+        </el-col>
+       
+        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
+            <el-form-item label="" prop="chkinc">
+                <c-checkbox v-model="model.chkaut">Automatic</c-checkbox>
+            </el-form-item>
+        </el-col>
+
+        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
+            <el-form-item label="" prop="chkinc">
+                <c-checkbox v-model="model.chkdel">Deleted</c-checkbox>
+            </el-form-item>
+        </el-col>
+        
+        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
+            <el-form-item label="" prop="chkinc">
+                <c-checkbox v-model="model.chktco">网银</c-checkbox>
+            </el-form-item>
+        </el-col>
+
+        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
+            <el-form-item label="" prop="chkinc">
+                <c-checkbox v-model="model.chkcan">归档</c-checkbox>
+            </el-form-item>
         </el-col>
 
         <!--        

src/views/Business/Trnrel/Inftrnps.vue

@@ -227,7 +227,9 @@
               label="Display"
               width="100">
             <template slot-scope="scope">
-              <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank">显示快照</a>
+<!--              <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>-->
+              <a @click="display(scope.$index, scope.row)">显示快照</a>
+
             </template>
           </el-table-column>
         </c-istream-table>