修改

src/components/commonPage/commonTripList.vue

@@ -19,7 +19,7 @@
         position: relative;
         border-left: 2px solid #ebebec;
         position: relative;
-        padding: 0 0 20px 50px;
+        padding: 0 0 50px 50px;
         margin-left: 10px;
     }
     .Trip_Content{
@@ -71,7 +71,7 @@
         background-color: #f60;
         border-radius: 100%;
         cursor: pointer;
-        margin:4px 0 20px 128px;
+        margin:-2px 0 20px 130px;
     }
 </style>
 
@@ -91,11 +91,12 @@
                 <el-form-item label="是否过境" label-width='100px' style="display:inline-block;">
                     <el-checkbox v-model="item.IsOut" :true-label="CheckedVaule" :false-label="UnCheckedVaule"></el-checkbox>
                 </el-form-item>
-                <el-input type="textarea" resize="none" rows="16" cols="40" v-model="item.TravelContent"></el-input>
+                <quill-editor v-model="item.TravelContent" style="height:300px;"></quill-editor>
+                <!-- <el-input type="textarea" resize="none" rows="16" cols="40" v-model="item.TravelContent"></el-input> -->
                 <div class="TC_circles"></div>
             </div> 
             <div class="TripControl">
-                <i class="iconfont icon-baocun1" @click="saveTripList(item,index)"></i>
+                <!-- <i class="iconfont icon-baocun1" @click="saveTripList(item,index)"></i> -->
                 <i class="iconfont icon-img_delete_small" style="margin-left:10px;" @click="delTrip(index)"></i>
             </div>
         </div>
@@ -105,6 +106,7 @@
 
 <script>
 export default {
+  props:["ContractTripList"],
   data() {
     return {
       checked: false,
@@ -117,7 +119,9 @@ export default {
     };
   },
   mounted() {
-    
+    if(this.ContractTripList&&this.ContractTripList.length>0){
+        this.TripListArr=this.ContractTripList;
+    }
   },
   methods: {
     //添加行程
@@ -128,9 +132,9 @@ export default {
             GoProvice:'', //前往国家地区
             IsOut:0,  // 是否过境(0-不过，1-过)
             TravelContent:'',    //行程内容
-            IsShow:0,
         }
         this.TripListArr.push(obj);
+        this.getSavedData();
     },
     //删除行程
     delTrip(index){
@@ -138,15 +142,16 @@ export default {
         this.getSavedData();
     },
     //保存行程
-    saveTripList(item,index){
-        item.DayNum=index+1;
-        item.IsShow=1;
-        this.getSavedData();
-    },
+    // saveTripList(item,index){
+    //     item.DayNum=index+1;
+    //     item.IsShow=1;
+    //     this.getSavedData();
+    // },
     //遍历已经保存数据
     getSavedData(){
         let sendArr=[];
-        this.TripListArr.forEach(x=>{
+        this.TripListArr.forEach((x,index)=>{
+            x.DayNum=index+1;
             sendArr.push(x);
         })
         this.$emit('tripData', sendArr);

src/components/onedayTripContract.vue

@@ -1040,10 +1040,10 @@
             《行程单》用语须准确清晰，在表明服务标准用语中不应当出现“准×星级”、“豪华”、“仅供参考”、“以××为准”、“与××同级”等不确定用语。
           </div>
           <div v-if="CtObj.TripType==0">
-              <quill-editor v-model="CtObj.travelContent" style="height:400px;"></quill-editor>
+              <quill-editor v-model="TripInfo" style="height:400px;"></quill-editor>
           </div>
           <div v-if="CtObj.TripType==1"> 
-              <commonTripList @tripData="tripData" > </commonTripList>
+              <commonTripList @tripData="tripData" :ContractTripList="CtObj.ContractTripList"> </commonTripList>
           </div>
         </div>
         <div class="block mtop15" id="anchor-4" ref="anchor4">
@@ -1493,18 +1493,7 @@ export default {
         "自愿购物活动补充协议"
       ],
       ckedIndex: 0,
-      //旅客信息Arr
-      touristList: [
-        {
-          CGuestName: "",
-          CGuestSex: "男",
-          CGuestCertificateType: "身份证",
-          CGuestCertificateNum: "",
-          CGuestTel: "",
-          CGuestHealth: "健康",
-          IsShow: 1
-        }
-      ],
+      TripInfo:'',
     };
   },
   components: {
@@ -1518,6 +1507,19 @@ export default {
     },
     //提交数据
     SaveMsg() {
+      if(this.CtObj.TripType==0){
+        this.CtObj.ContractTripList=[];
+        let obj={
+          DayNum: 1,
+          Go:'',
+          GoProvice:'',
+          IsOut:1,
+          TravelContent:'',
+          TripType:0
+        }
+        obj.TravelContent=this.TripInfo;
+        this.CtObj.ContractTripList.push(obj);
+      }
       this.apipost(
         "travelcontract_post_SetTravelContractService",
         this.CtObj,
@@ -1623,6 +1625,7 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             var tempObj = res.data.data;
+            console.log(tempObj,'tempObj');
             this.CtObj.ID = tempObj.ID;
             this.CtObj.CType = tempObj.CType;
             this.CtObj.T_ContractNum = tempObj.T_ContractNum;
@@ -1770,6 +1773,9 @@ export default {
             } else {
               this.CtObj.ContractTripList = [];
             }
+            if(this.CtObj.TripType==0){
+              this.TripInfo=this.CtObj.ContractTripList[0].TravelContent;
+            }
           } else {
             this.Error(res.data.message);
           }