From 8bc6ec10c4c9309686256f2ff19beaa222817fdb Mon Sep 17 00:00:00 2001
From: zcx <377075991@qq.com>
Date: Sat, 16 Sep 2023 22:45:02 +0800
Subject: [PATCH] bug

---
 src/views/zs/clue/ClueForm/index.vue          | 30 ++++++++++++++++++-
 src/views/zs/clue/index.vue                   | 10 +++++--
 .../zs/sign/components/SignFormDialog.vue     |  2 +-
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/views/zs/clue/ClueForm/index.vue b/src/views/zs/clue/ClueForm/index.vue
index a76713b..c419ced 100644
--- a/src/views/zs/clue/ClueForm/index.vue
+++ b/src/views/zs/clue/ClueForm/index.vue
@@ -64,6 +64,16 @@
                 <el-input v-model="clueForm.weChat" placeholder="请输入微信号" />
               </el-form-item>
             </el-col>
+            <el-col :span="24" v-if="clueForm.source == '抖音直播'">
+              <el-form-item label="商品名称" prop="goodName">
+                <el-input v-model="clueForm.goodName" placeholder="请输入商品名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="clueForm.source == '抖音直播'">
+              <el-form-item label="订单实收" prop="amountReceived">
+                <el-input v-model="clueForm.amountReceived" placeholder="请输入订单实收" />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="跟进人员" prop="followUser">
                 <el-select style="width: 100%;" v-model="clueForm.followUser" multiple clearable :disabled="admin != 'true' && clueForm.clueId != undefined">
@@ -73,7 +83,19 @@
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="意向状态" prop="intentionState">
+              <el-form-item label="意向状态" prop="intentionState" v-if="clueForm.source == '抖音直播'">
+                <el-select style="width: 100%;" v-model="clueForm.intentionState" placeholder="请选择" clearable>
+                  <el-option v-for="dict in intentionOptions.filter(item => item.remark == undefined || item.remark == '抖音')" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue">
+                    <i class="el-icon-star-on" :style="dict.cssClass" />
+                    <span style="float: right; color: #8492a6; font-size: 13px">
+                      {{ dict.dictValue }}
+                    </span>
+                  </el-option>
+                  
+                </el-select>
+                </el-form-item>
+              
+                <el-form-item label="意向状态" prop="intentionState" v-else>
                 <el-select style="width: 100%;" v-model="clueForm.intentionState" placeholder="请选择" clearable>
                   <el-option v-for="dict in intentionOptions.filter(item => item.remark == undefined || item.remark == '正常')" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue">
                     <i class="el-icon-star-on" :style="dict.cssClass" />
@@ -81,9 +103,15 @@
                       {{ dict.dictValue }}
                     </span>
                   </el-option>
+                  
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24" v-if="clueForm.source == '抖音直播'">
+              <el-form-item label="核销时间" prop="writeOffTime">
+                <el-date-picker style="width: 100%;" v-model="clueForm.writeOffTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="下次跟进时间" prop="followTime">
                 <el-date-picker style="width: 100%;" v-model="clueForm.followTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
diff --git a/src/views/zs/clue/index.vue b/src/views/zs/clue/index.vue
index 491e4c3..3eb5fdc 100644
--- a/src/views/zs/clue/index.vue
+++ b/src/views/zs/clue/index.vue
@@ -29,8 +29,8 @@
       </el-table-column>
       <el-table-column label="操作" fixed="right" align="left" min-width="200">
         <template slot-scope="scope">
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.source == '抖音直播'" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleDYAddandUpdate(scope.row)">编辑</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.source != '抖音直播'" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
+          <!-- <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.source == '抖音直播'" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleDYAddandUpdate(scope.row)">编辑</el-button> -->
+          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
           <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1  )" v-hasPermi="['zs:clue:distribute']" type="text" @click.native.stop="handleDistribute(scope.row)">分发</el-button>
           <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1  ) && scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a" @click.native.stop="handleSign(scope.row)">已登记</el-button>
           <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1  ) && !scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
@@ -284,7 +284,11 @@ export default {
     },
     handleRowClick(row) {
       if (this.quickSearch != 8) {
-        this.handleAddandUpdate(row)
+        // if(row.source == '抖音直播'){
+        //   this.handleDYAddandUpdate(row);
+        // } else {
+          this.handleAddandUpdate(row)
+        // }
       }
     },
     handleCellClick(row, column, cell, event) {
diff --git a/src/views/zs/sign/components/SignFormDialog.vue b/src/views/zs/sign/components/SignFormDialog.vue
index e52948b..baf6f1b 100644
--- a/src/views/zs/sign/components/SignFormDialog.vue
+++ b/src/views/zs/sign/components/SignFormDialog.vue
@@ -332,7 +332,7 @@ export default {
       });
     },
     getPlaces(schoolId) {
-      getAllPlaces({ schoolId: schoolId, status: '0' }).then((resp) => {
+      getAllPlaces({ schoolId: schoolId, status: '0' , showInMap : true}).then((resp) => {
         this.placeOptions = resp.data;
       });
     },