1

src/components/guestManagement/Activity.vue

@@ -417,7 +417,7 @@
                         </div>
                         <div>
                           <p>{{subItem.CustomerFollowUpModel.CreateByStr}}</p>
-                          <p class="font-color-info">{{subItem.UpdateDate}}</p>
+                          <p class="font-color-info">{{subItem.UpdateDateStr}}</p>
                         </div>
                         <div class="tag">
                           <span>{{subItem.CustomerFollowUpModel.FollowUpTypeStr}}</span>
@@ -439,7 +439,7 @@
                               </p>
                             </div>
                           </div>
-                          <p> <span class="font-color-info">下次联系时间：</span> <span>{{subItem.CustomerFollowUpModel.NextContactDate}}</span></p>
+                          <p> <span class="font-color-info">下次联系时间：</span> <span>{{subItem.CustomerFollowUpModel.NextContactDateStr}}</span></p>
                         </div>
                       </div>
                     </div>

src/components/guestManagement/Agreement.vue

@@ -118,7 +118,15 @@
             label="退款"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
+              <!-- v-if="scope.row.OrderStatus!=1" -->
+              {{scope.row.BackMoney}}<i @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
+            </template>
+        </el-table-column>
+        <el-table-column
+            label="成本"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.PayMoney}}<i @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
             </template>
         </el-table-column>
         <el-table-column
@@ -135,13 +143,6 @@
               </p>
             </template>
         </el-table-column>
-        <el-table-column
-            label="成本"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
-            </template>
-        </el-table-column>
         <el-table-column
             label="出票状态"
             show-overflow-tooltip>
@@ -165,7 +166,7 @@
         </el-table-column>
         <el-table-column
             prop="Remark"
-            label="下单备注"
+            label="客户需求"
             show-overflow-tooltip>
         </el-table-column>
         <el-table-column
@@ -262,19 +263,17 @@ export default {
   },
   methods: {
     // 制作单据
-    makeAdocument(row,type){
-      if(type!=1){
-        type = 2
-      }
+    makeAdocument(row,num){
+      let type
+      type = num==1? 1:2
       let href
       let url
       if(this.isOnline()){
         url = 'http://yx.oytour.com/#/'
-        href = url +'automaticLogin?token=' + this.getLocalStorage().token +'&type=' +type
       }else{
         url = 'http://www.test.com:8081/#/'
-        href = url+'automaticLogin?token=' + this.getLocalStorage().token +'&type=' +type
       }
+      href = url+'automaticLogin?token='+this.getLocalStorage().token+'&type='+type+'&OtherType=55'+'&ReFinanceId='+row.OrderId+'&ReFinanceId2='+num+'&GuestId=' +row.GuestId
       window.open(href);
     },
     // 操作日志

src/components/guestManagement/customerInfoBox.vue

@@ -82,8 +82,9 @@
         <p>{{detailsData.SurName + detailsData.Name}}</p>
       </div>
       <div class="right" v-if="!hiddenMenu">
+        {{detailsData.IsCreate}}
         <el-button class="crm-btn query-btn" @click="editCust">编辑</el-button>
-        <el-dropdown @command="handleCommand" style="top: 1px;">
+        <el-dropdown @command="handleCommand" style="top: 1px;" v-if="detailsData.IsCreate==1">
           <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
             <i class="iconfont icongengduo"></i>
           </el-button>
@@ -183,8 +184,7 @@
         deep: true,
       },
     },
-    created()
-    {
+    created() {
 
     },
     mounted() {
@@ -242,8 +242,7 @@
           this.$emit("transferS", 3);
         } else if (command === "g") {}
       },
-      handleClick(tab, event) {
-      },
+      handleClick(tab, event) {},
       editCust() {
         this.$emit("editCustS", 1);
       },