Merge branch 'master' of http://git.2weisou.com/liumin/zkPCproject

src/views/ReceivingRecords/index.vue

@@ -188,8 +188,7 @@
           </el-select>
         </div>
 
-        <div class="div-lab">
-          <!-- 默认全部 -->
+        <!-- <div class="div-lab">
           <div class="label">是否加精：</div>
           <el-select
             v-model="searchForm.zfal"
@@ -206,7 +205,7 @@
             >
             </el-option>
           </el-select>
-        </div>
+        </div> -->
 
         <div class="div-lab">
           <div class="label">接待时长：</div>
@@ -246,8 +245,25 @@
           </el-select>
         </div>
 
-        <!-- <div class="div-lab">
-          <div class="label">是否有效：</div>
+        <div class="div-lab">
+          <div class="label">推荐案例：</div>
+          <el-select
+            v-model="searchForm.zfal"
+            clearable
+            filterable
+            placeholder="请选择"
+            class="div-inp"
+          >
+            <el-option
+              v-for="item in options14"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </div>
+        <div class="div-lab">
+          <div class="label">接待标识：</div>
           <el-select
             v-model="searchForm.validInvalid"
             clearable
@@ -262,7 +278,7 @@
               :value="item.value"
             ></el-option>
           </el-select>
-        </div> -->
+        </div>
       </div>
 
       <div class="app-titel" style="margin-top: 15px"></div>
@@ -299,6 +315,8 @@
         </el-table-column>
         <el-table-column prop="name" label="客户" align="center">
         </el-table-column>
+        <el-table-column prop="visitRecordName" label="到访次数" align="center">
+        </el-table-column>
 
         <el-table-column prop="mm" label="录音时长" align="center" sortable width="100">
         </el-table-column>
@@ -324,6 +342,7 @@
         <el-table-column prop="fraction" label="执行率" align="center" sortable>
           <template slot-scope="{ row }"> {{ row.fraction || "0" }}% </template>
         </el-table-column>
+        
         <!-- <el-table-column prop="address" label="禁忌执行率" align="center">
         </el-table-column> -->
         <!--  scope -->
@@ -332,12 +351,13 @@
             {{ row.taboo == 0 ? "否" : "是" }}
           </template>
         </el-table-column>
-        <el-table-column prop="zfal" label="是否加精" align="center">
+        <!-- <el-table-column prop="zfal" label="是否加精" align="center">
           <template slot-scope="{ row }">
             {{ row.zfal == 0 ? "已加精" : "未加精" }}
           </template>
-        </el-table-column>
-        <!-- <el-table-column prop="validInvalidName" label="是否有效" align="center"></el-table-column> -->
+        </el-table-column> -->
+        <el-table-column prop="validInvalidName" label="接待标识" align="center"></el-table-column>
+        <el-table-column prop="zfalName" label="推荐案例" align="center"></el-table-column>
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="{ row }">
             <el-button
@@ -395,6 +415,10 @@ export default {
           value: "2",
           label: "完整录音",
         },
+        {
+          value: "3",
+          label: "未传完",
+        },
       ],
       options3: [
         {
@@ -468,6 +492,11 @@ export default {
       ],
 
       options13: [
+        {
+          label: "全部",
+          value: "",
+        },
+        
         {
           label: "有效接待",
           value: "0",
@@ -478,6 +507,21 @@ export default {
         },
       ],
 
+      options14: [ // 正反案例
+        {
+          label: "全部",
+          value: "",
+        },
+        {
+          label: "正面案例",
+          value: "0",
+        },
+        {
+          label: "反面案例",
+          value: "1",
+        },
+      ],
+
       currentPage: 1,
       size: 10,
       total: 10,
@@ -499,7 +543,7 @@ export default {
         dateType: null,
         projectId: "",
         taboo: "",
-        zfal: "",
+        zfal: "",  // 正反案例  0：正面案例  1：反面案例
         validInvalid: "", // 是否为有效接待 0：有效  1：无效
       },
       rec_index_show: false, // 按钮权限

vue.config.js

@@ -8,6 +8,7 @@
 // const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://62.234.122.43:9999' //正式
+// const url = 'http://81.70.55.170:9999' // 新测试服务器IP
 // const url = 'http://192.168.31.89:9999' //sh
 // const url = 'https://zanyong.hfju.com' // 正式域名
 const url = 'http://81.70.55.170:9999' // 新测试