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

src/model/Ditopn/Pattern.js

@@ -88,7 +88,7 @@ export default {
 
 
     "didgrp.cbs.max.amt":[
-        {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位" }
     ],
@@ -321,7 +321,7 @@ export default {
     ],
 
     "didgrp.rec.conamt":[
-        {type: "number", required: false, message: "必输项"},
+        // {type: "number", required: false, message: "必输项"},
         {max: 16,message:"整数位不能超过13位"},
         {pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/, message: "小数位不能超过2位" }
     ],

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

@@ -161,7 +161,7 @@ export default {
                bdflg:CodeTable.bdflg,
                avbwth:CodeTable.avbwth,
                lcrtyp:CodeTable.lcrtyp,
-               avbby:CodeTable.avbby,
+               avbby:CodeTable.avbby0,
                shppar:CodeTable.shppar,
                tratyp:CodeTable.tratyp,
                dspflg:CodeTable.dspflg,

src/views/Business/Office/TodoItem.vue

@@ -89,7 +89,7 @@ export default {
          }
     },
     mounted(){
-        this.onOffpTodo()
+        //this.onOffpTodo()
     }
 }
 </script>

src/views/Business/Office/index.vue

@@ -186,7 +186,8 @@ export default {
     mounted:async function(){
 
         console.log("进入office交易");
-        
+        if(1) return
+
         let rtnmsg = await Api.post("office/init",{params:{}})
         console.log(rtnmsg)
         if(rtnmsg.code == SUCCESS)

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>