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

src/views/Business/Ditopn/Docpan.vue

@@ -10,7 +10,7 @@
             <el-table-column label="传送方式">
                 <template slot-scope="scope">
                     <!-- <c-select v-model="model.trnmod_trndoc_doceot[scope.$index]" style="width:100%" placeholder="请选择"> -->
-                    <c-select v-model="model.trnmod.trndoc.doceot[scope.row.index].apflab1" style="width:100%" placeholder="请选择"> 
+                    <c-select v-model="model.trnmod.trndoc.doceot[scope.row.index].apf" style="width:100%" placeholder="请选择"> 
                         <el-option v-for="item in codes.apftxt" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>

src/views/Business/Sptsel/Menu.vue

@@ -183,6 +183,24 @@ export default {
         return {
             stmData: {
                 columns: [
+                    "4 1 \"TRN\" 50 ",
+                    "5 2 \"Reference\" 150",
+                    "6 3 \"Name\" 110",
+                    "18 5 \"MT\" 100",
+                    "7 6 \"Creation\" 101 20 DateTime 1",
+                    "20 7 \"Cur\" 30",
+                    "21 8 \"Amt\" 69 2 8 1 16",
+                    "1 9 \"Status\" 60 1 tdViewTypeEdit:0 1 SPT:STA",
+                    "20 7 \"Cur\" 30",
+                    "21 8 \"Amt\" 69 2 8 1 16",
+                    "1 9 \"Status\" 60 1 tdViewTypeEdit:0 1 SPT:STA",
+                    "8 10 \"By User\" 66",
+                    "15 11 \"Work User\" 76",
+                    "17 12 \"Work Branch\" 126",
+                    "16 13 \"Last User\" 76",
+                    "3 14 \"Info\" 50 1 20:0 1 FormatINFDSP",
+                    "19 15 \"Key\" 90",
+                    "10 16 \"Infotext\" 500"
                 ],
                 data: [
                 ]

src/views/Business/Sptsel/index.vue

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