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

src/config/CodeTable/index.js

@@ -5247,10 +5247,16 @@ const CodeTable = {
 		{label:"不申报",value:"2" },
 	],
 	tratyp:[
-		{label:"陆运",value:"L" },
-		{label:"水运",value:"S" },
-		{label:"空运",value:"K" },
-		{label:"铁路",value:"T" },
+		{label:"铁路",value:"00" },
+		{label:"公路",value:"01" },
+		{label:"空运",value:"02" },
+		{label:"海运",value:"03" },
+		{label:"内河",value:"04" },
+		{label:"多式联运",value:"05" },
+		{label:"快邮",value:"06" },
+		{label:"仓储交货",value:"07" },
+		{label:"其他",value:"08" },
+
 	],
 	trdtyp:[
 		{label:"服务贸易",value:"TDSV" },

src/model/Ditopn/Pattern.js

@@ -212,12 +212,12 @@ export default {
 
     "didgrp.blk.adlcnd":[
         {type: "string", required: true, message: "必输项"},
-        {max: 390,message:"长度不能超过390"}
+        {max: 1430,message:"长度不能超过1430"}
     ],
 
     "didgrp.blk.insbnk":[
         {type: "string", required: true, message: "必输项"},
-        {max: 1430,message:"长度不能超过1430"}
+        {max: 325,message:"长度不能超过325"}
     ],
 
 

src/views/Business/Ditopn/Detp.vue

@@ -31,8 +31,8 @@
 
         <el-col :span="12">
             <el-form-item label="分期装运/提供服务" prop="didgrp.rec.fqzytgfw">
-                <c-select v-model="model.didgrp.rec.fqzytgfw" :readonly="true" style="width:100%" placeholder="请选择">
-                </c-select>
+
+              <c-input v-model="model.didgrp.rec.fqzytgfw" placeholder="请输入" :readonly="true"></c-input>
             </el-form-item>
         </el-col>
 
@@ -63,6 +63,8 @@
         <el-col :span="12">
             <el-form-item label="转运" prop="didgrp.rec.shptrs">
                 <c-select v-model="model.didgrp.rec.shptrs" style="width:100%" placeholder="请选择">
+                  <el-option label="NOT ALLOWED" value="1"></el-option>
+                  <el-option label="ALL OWED" value="2"></el-option>
                 </c-select>
             </el-form-item>
         </el-col>
@@ -117,6 +119,7 @@
         <el-col :span="12">
             <el-form-item label="合同币种" prop="didgrp.rec.concur">
                 <c-select v-model="model.didgrp.rec.concur" style="width:100%" placeholder="请选择">
+                  <el-option label="CNY 人民币" value="CNY"></el-option>
                 </c-select>
             </el-form-item>
         </el-col>

src/views/Business/Ditopn/Tk.vue

@@ -6,7 +6,7 @@
 	</el-col>
     -->          
        <el-col :span="24">
-        <el-form-item label="货物/服务描述" prop="didgrp.blk.lcrgod">
+        <el-form-item label="货物描述" prop="didgrp.blk.lcrgod">
             <c-input type="textarea" v-model="model.didgrp.blk.lcrgod" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入Description of Goods" ></c-input>
         <c-button size="small" type="primary" icon="el-icon-search" @click="onLcrgodButtxmsel">
             ...
@@ -25,7 +25,7 @@
                                                     
        <el-col :span="24">
         <el-form-item label="附加条款" prop="didgrp.blk.adlcnd">
-            <c-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" v-model="model.didgrp.blk.adlcnd" style="width:70%;margin-right:20px;" maxlength="390" show-word-limit placeholder="请输入附加条款" ></c-input>
+            <c-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" v-model="model.didgrp.blk.adlcnd" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入附加条款" ></c-input>
             <c-button size="small" type="primary" icon="el-icon-search" @click="onAdlcndButtxmsel">
                 ...
             </c-button>
@@ -33,19 +33,19 @@
        </el-col>
                                                     
        <el-col :span="24">
-        <el-form-item label="其他条款" prop="didgrp.blk.insbnk">
-            <c-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" v-model="model.didgrp.blk.insbnk" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入付行的指示" ></c-input>
+        <el-form-item label="给付款丶承兑丶议付行的指示" prop="didgrp.blk.insbnk">
+            <c-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" v-model="model.didgrp.blk.insbnk" style="width:70%;margin-right:20px;" maxlength="325" show-word-limit placeholder="请输入付行的指示" ></c-input>
             <c-button size="small" type="primary" icon="el-icon-search" @click="onInsbnkButtxmsel">
                 ...
             </c-button>
         </el-form-item>
        </el-col>
                   
-       <el-col :span="24">
-       <el-form-item label="" prop="didgrp.rec.redclsflg">
-	    <c-checkbox v-model="model.didgrp.rec.redclsflg">红/绿条款</c-checkbox>
-        </el-form-item>
-       </el-col> 
+<!--       <el-col :span="24">-->
+<!--       <el-form-item label="" prop="didgrp.rec.redclsflg">-->
+<!--	    <c-checkbox v-model="model.didgrp.rec.redclsflg">红/绿条款</c-checkbox>-->
+<!--        </el-form-item>-->
+<!--       </el-col> -->
   </div>
 </template>
 <script>

src/views/Business/Ditopn/index.vue

@@ -169,7 +169,8 @@ export default {
                apftxt:CodeTable.apftxt,
                nonrevflg1:CodeTable.nonrevflg1,
                curtxt:CodeTable.curtxt,
-               litameadv:CodeTable.litameadv
+               litameadv:CodeTable.litameadv,
+               avbby0:CodeTable.avbby0
            },
         }
     },