litopn修改

src/views/Business/Litopn/Detp.vue

@@ -355,11 +355,11 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="交单期限" prop="lidgrp.blk.preper">
+        <el-form-item label="交单期限" prop="lidgrp.rec.prepertxts18">
           <c-fullbox>
             <c-input
               type="textarea"
-              v-model="model.lidgrp.blk.preper"
+              v-model="model.lidgrp.rec.prepertxts18"
               maxlength="35"
               show-word-limit
               placeholder="请输入交单期限"
@@ -376,28 +376,7 @@
         </el-form-item>
       </c-col>
 
-<<<<<<< HEAD
-            <c-col :span="24">
-                <el-form-item label="交单期限" prop="lidgrp.rec.prepertxts18">
-                    <c-fullbox>
-                    <c-input type="textarea" v-model="model.lidgrp.rec.prepertxts18" maxlength="35" show-word-limit placeholder="请输入交单期限" ></c-input>
-                <template slot="footer">
-                    <c-button 
-                    size="small" 
-                    type="primary" 
-                    icon="el-icon-search" 
-                    @click="onPreperButtxmsel"></c-button>
-                    </template>
-                    </c-fullbox>
-                </el-form-item>
-            </c-col>
-                                                    
-           
-
-            <!-- <c-col :span="24">
-=======
       <!-- <c-col :span="24">
->>>>>>> a44f1767300502ba3f9b5825d06fabccbf2a4a61
                 <el-form-item label="Presentation period text" prop="lidgrp.rec.prepertxts18">
                     <c-input  v-model="model.lidgrp.rec.prepertxts18" maxlength="35"  placeholder="请输入Presentation period text"></c-input>
                 </el-form-item>