bug修复

src/views/company/companyVoiceLogs/index.vue

@@ -223,6 +223,19 @@ export default {
     this.getList();
   },
   methods: {
+    formatTime(value) {
+      const hours = Math.floor(value / 3600);
+      const minutes = Math.floor((value % 3600) / 60);
+      const seconds = value % 60;
+      if(hours == 0 && minutes == 0 ){
+        return `${seconds}秒`;
+      }else if(hours == 0 && minutes != 0 ){
+        return `${minutes}分钟${seconds}秒`;
+      }else{
+        return `${hours}小时${minutes}分钟${seconds}秒`;
+      }
+      
+    },
     /** 查询通话记录列表 */
     getList() {
       this.loading = true;

src/views/crm/components/customerDetails.vue

@@ -3,7 +3,11 @@
         <div class="customer-title"  >
             <div class="customer-name">
                 {{ showDuplicate?item.customerName+"[从]":item.customerName}}
-                 <el-button size="mini"  v-if="showDuplicate"  v-hasPermi="['crm:customer:lookDuplicate']"  @click=" handleDuplicate()" >主客户</el-button>
+                 <el-button size="mini"  v-if="showDuplicate"  v-hasPermi="['crm:customer:lookDuplicate']"  @click=" getDetails" >主客户</el-button>
+            </div>
+            <div v-if="repetition !== null" style="margin-left:10px">
+                <el-link @click="handleShow(repetition)" :underline="false" type="primary" >重客户编码: {{ repetition.customerCode }}</el-link>
+                <!-- <span class="font-small" >重客户编码: {{ repetition.customerCode }}</span> -->
             </div>
             <div>
                 <el-button size="mini"  v-hasPermi="['crm:customer:edit']"  @click=" handleEdit()">修改客户</el-button>
@@ -263,6 +267,7 @@
                 customerExts:[],
                 activeName:"",
                 item:null,
+                repetition:null,
                 showDuplicate:false,
                 dCustomerId:null,
                  
@@ -293,6 +298,9 @@
            
         },
         methods: {
+            handleShow(repetition){
+                this.getDetails(repetition.customerId);
+            },
             handleEdit() {
                 this.customer.open = true;
                 var that=this;
@@ -381,6 +389,7 @@
                     });
                 });
                 getCustomerDetails(data).then(response => {
+                    this.repetition = response.repetition;
                     this.item = response.customer;
                     this.isReceive=response.isReceive;
                     if(this.item.extJson!=null){

src/views/crm/customer/my.vue

@@ -94,8 +94,8 @@
       </el-form-item>
       <el-form-item label="历史订单" prop="isHisOrder">
           <el-select style="width:220px" filterable v-model="queryParams.isHisOrder" placeholder="请选择历史订单" clearable size="small">
-            <el-option key="1"  label="是" value="1" />
-            <el-option key="0"  label="否" value="0" />
+            <el-option key="1"  label="已下单" value="1" />
+            <el-option key="0"  label="未下单" value="0" />
           </el-select>
       </el-form-item>
       <el-form-item>

src/views/store/storeAfterSales/list.vue

@@ -36,6 +36,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="手机号" prop="consigneePhone">
+        <el-input
+          v-model="queryParams.consigneePhone"
+          placeholder="请输入手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
        <el-form-item label="退款时间" prop="createTimeRange">  
             <el-date-picker
@@ -70,6 +79,17 @@
               />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="退款类型" prop="serviceType">
+        <el-select   v-model="queryParams.serviceType" placeholder="请选择类型" clearable size="small" >
+         <el-option
+                v-for="item in serviceTypeOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>