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

src/config/CodeTable/index.js

@@ -4417,9 +4417,15 @@ const CodeTable = {
 		{label:"SENT",value:"S" },
 	],
 	relflg:[
-		{label:"Preliminary",value:"P" },
+		{label:"Closed",value:"M" },
+		{label:"Correct",value:"C" },
 		{label:"Entered",value:"E" },
+		{label:"External",value:"X" },
+		{label:"Final",value:"F" },
+		{label:"Picked up",value:"P" },
+		{label:"Rejected",value:"N" },
 		{label:"Released",value:"R" },
+		{label:"Waiting",value:"W" },
 	],
 	relgrp:[
 		{label:"Authorized",value:"A" },

src/views/Business/Ditopn/index.vue

@@ -166,6 +166,7 @@ export default {
                tratyp:CodeTable.tratyp,
                dspflg:CodeTable.dspflg,
                inflev:CodeTable.inflev,
+               apftxt:CodeTable.apftxt,
                nonrevflg1:CodeTable.nonrevflg1,
                curtxt:CodeTable.curtxt
            },

src/views/Business/Trnrel/Inftrnps.vue

@@ -240,6 +240,24 @@ export default {
         return {
             stmData: {
                 columns: [
+                    "10 1 \"TRN\" 50 1 tdViewTypeEdit:0 3 ATPTXT",
+                    "11 2:1 \"Own Reference\" 112",
+                    "17 2:2 \"Addtional Text\" 112",
+                    "12 3 \"Cur\" 37",
+                    "13 4 \"Relevant Amount\" 101 2 8:1 2 5",
+                    "14 5 \"Entry\" 104 20 DateTime 1",
+                    "9 6:1 \"Req\" 39",
+                    "2 6:2 \"Sig\" 35",
+                    "6 8:1 \"Rq0\" 40",
+                    "3 8:2 \"Rel0\" 40",
+                    "7 9:1 \"Rq1\" 40",
+                    "4 9:2 \"Rel1\" 40",
+                    "8 10:1 \"Rq2\" 40",
+                    "5 10:2 \"Rel2\" 40",
+                    "15 13 \"Branch\" 142",
+                    "16 11:1 \"User\" 62",
+                    "18 11:2 \"\" 62",
+                    "0 12 \"Status\" 54 1 tdViewTypeEdit:0 1 RELSTA"
                 ],
                 data: [
                 ]

src/views/Business/Trnrel/index.vue

@@ -70,7 +70,7 @@ export default {
         that.init(that.model).then(res => {
             //TODO 处理数据逻辑
              that.model = Utils.copyValueFromVO(that.model, res.data)
-             that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
+            //  that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
         })
     }
 }