Merge branch 'development-202206' into 'development-202206'

Litdla缺陷修改

See merge request fukai/vue-gjjs!23

src/views/Business/Litdla/Amep.vue

@@ -203,8 +203,8 @@
        </c-col>
 
        <c-col :span="24">
-        <el-form-item label="交单期限描述" prop="trnmod.swiadd.prepertxts18">
-            <c-input disabled v-model="model.trnmod.swiadd.prepertxts18" maxlength="35"  placeholder="请输入交单期限描述"></c-input>
+        <el-form-item label="交单期限描述" prop="oldlidgrp.rec.prepertxts18">
+            <c-input disabled v-model="model.oldlidgrp.rec.prepertxts18" maxlength="35"  placeholder="请输入交单期限描述"></c-input>
         </el-form-item>
        </c-col>
 

src/views/Business/Litdla/Detp.vue

@@ -142,11 +142,11 @@
        </c-col>
 
        <c-col :span="24">
-        <el-form-item label="寄单描述" prop="lidgrp.blk.preper">
+        <el-form-item label="寄单描述" prop="lidgrp.rec.prepertxts18">
             <c-input 
             disabled 
             :rows="4"
-            type="textarea" v-model="model.lidgrp.blk.preper" maxlength="35" show-word-limit placeholder="请输入内容" ></c-input>
+            type="textarea" v-model="model.lidgrp.rec.prepertxts18" maxlength="35" show-word-limit placeholder="请输入内容" ></c-input>
         </el-form-item>
         </c-col>
         <c-col :span="24">

src/views/Business/Litdla/Ovwp1.vue

@@ -127,21 +127,15 @@
        </c-col>
 
        <c-col :span="12">
-        <el-form-item label="分批装运" prop="lidgrp.rec.shppar">
-            <c-select disabled v-model="model.lidgrp.rec.shppar" style="width:100%" placeholder="请选择">
-              </c-select>
-        </el-form-item>
-       </c-col>
-                  
-       <c-col :span="12">
         <el-form-item label="分批装运" prop="lidgrp.rec.shppars18">
             <c-select disabled v-model="model.lidgrp.rec.shppars18" style="width:100%" placeholder="请选择">
               </c-select>
         </el-form-item>
        </c-col>
+                  
        <c-col :span="12">
-        <el-form-item label="是否可转运" prop="lidgrp.rec.shptrs">
-            <c-select disabled v-model="model.lidgrp.rec.shptrs" style="width:100%" placeholder="请选择">
+        <el-form-item label="是否可转运" prop="lidgrp.rec.shptrss18">
+            <c-select disabled v-model="model.lidgrp.rec.shptrss18" style="width:100%" placeholder="请选择">
               </c-select>
         </el-form-item>
        </c-col>