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

src/config/CodeTable/index.js

@@ -5383,12 +5383,12 @@ const CodeTable = {
 		{label:"INI Files",value:"INI" },
 	],
 	uiltxt:[
-		{label:"English",value:"EN" },
-		{label:"Italian",value:"IT" },
-		{label:"French",value:"FR" },
-		{label:"Chinese",value:"CN" },
-		{label:"German",value:"DE" },
-		{label:"Spanish",value:"SP" },
+		{label:"EN English",value:"EN" },
+		{label:"IT Italian",value:"IT" },
+		{label:"FR French",value:"FR" },
+		{label:"CN Chinese",value:"CN" },
+		{label:"DE German",value:"DE" },
+		{label:"SP Spanish",value:"SP" },
 	],
 	unttyp:[
 		{label:"Constant",value:"CONST" },

src/views/Business/Ditopn/Docpan.vue

@@ -7,9 +7,27 @@
         </el-col>
 
         <c-istream-table-docpan :list="stmData.data" :columns="stmData.columns">
+            <el-table-column label="报文格式">
+                <template slot-scope="scope">
+                    <c-select v-model="model.trnmod.trndoc.doceot[scope.row.index].docsnf" style="width:100%" placeholder="请选择"> 
+                        <el-option v-for="item in codes.docsnf" :key="item.value" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </c-select>
+                </template>
+            </el-table-column>
+            <el-table-column label="语言">
+                <template slot-scope="scope">
+                    <c-select v-model="model.trnmod.trndoc.doceot[scope.row.index].docuil" style="width:100%" placeholder="请选择"> 
+                        <el-option v-for="item in codes.uiltxt" :key="item.value" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </c-select>
+                </template>
+            </el-table-column>
             <el-table-column label="传送方式">
                 <template slot-scope="scope">
-                    <c-select v-model="model.trnmod.trndoc.doceot[scope.row.index].apf" style="width:100%" placeholder="请选择"> 
+                    <c-select v-model="model.trnmod.trndoc.doceot[scope.row.index].apf" disabled style="width:100%" placeholder="请选择"> 
                         <el-option v-for="item in codes.apftxt" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
@@ -130,11 +148,12 @@ export default {
         return {
             stmData: {
                 columns: [
+                    //注释的已改成静态
                     "role 收报人",
                     "pandsc 描述",
                     "cortyp 类型",
-                    "docsnf 报文格式",
-                    "docuil 语言",
+                    //"docsnf 报文格式",
+                    //"docuil 语言",
                     //"apf 传送方式"
                 ],
                 data: [

src/views/Business/Ditopn/index.vue

@@ -170,7 +170,9 @@ export default {
                nonrevflg1:CodeTable.nonrevflg1,
                curtxt:CodeTable.curtxt,
                litameadv:CodeTable.litameadv,
-               avbby0:CodeTable.avbby0
+               avbby0:CodeTable.avbby0,
+               uiltxt:CodeTable.uiltxt,
+               docsnf:CodeTable.docsnf,
            },
         }
     },