fix

CallCenterWeb.UI/README-zh.md

@@ -147,5 +147,6 @@ Copyright (c) 2017-present PanJiaChen
 deepClone 修改成 this.deepClone
 
 ## vuedraggable问题
-
+<!-- 2025-02-19 -->
+<!-- 重新安装使用之前的依赖 npm install --legacy-peer-deps -->
 - 使用2.16.0会报错；目前使用的2.15.0

CallCenterWeb.UI/package.json

@@ -92,7 +92,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "^3.1.0",
+    "webpack-cli": "3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },

CallCenterWeb.UI/src/views/faxManager/faxTransmission/index.vue

@@ -52,43 +52,44 @@
             >导出Excel</el-button
           >
         </el-col>
-        <el-col :span="7">
-          <label style="font-size: 12px; margin-left: 43%">客户性质：</label>
+        <el-col :span="8">
+          <label style="font-size: 12px; margin-left: 66%">是否发送：</label>
           <el-select
-            v-model="searchData.cusSign"
-            class="form_select"
+            v-model="searchData.smsStatus"
             size="mini"
-            style="width: 127px"
+            style="width: 88px"
             clearable
             filterable
-            placeholder=""
           >
             <el-option
-              v-for="item in seatGroupList"
-              :key="item.id"
-              :label="item.deptName"
-              :value="item.id"
+              v-for="item in smsStatusData"
+              :key="item.value"
+              :label="item.faxStatus"
+              :value="item.value"
             />
           </el-select>
         </el-col>
         <el-col :span="3">
-          <label style="font-size: 12px">短信状态：</label>
+          <label style="font-size: 12px;">客户性质：</label>
           <el-select
-            v-model="searchData.smsStatus"
+            v-model="searchData.cusSign"
+            class="form_select"
             size="mini"
-            style="width: 88px"
+            style="width: 127px"
             clearable
             filterable
+            placeholder=""
           >
             <el-option
-              v-for="item in smsStatusData"
-              :key="item.value"
-              :label="item.faxStatus"
-              :value="item.value"
+              v-for="item in seatGroupList"
+              :key="item.id"
+              :label="item.deptName"
+              :value="item.id"
             />
           </el-select>
         </el-col>
-        <el-col :span="4" class="colorsize">
+        
+        <el-col :span="3" class="colorsize">
           <div style="float: right; font-size: 12px">
             浅绿:有经办人；浅灰:不用编号
           </div>
@@ -417,7 +418,7 @@
         min-width="80"
       >
         <template slot-scope="scope">
-          {{ scope.row.sendSMS?'已发送':'未发送' }}
+          {{ scope.row.sendSMS?'发送':'未发送' }}
         </template>
       </el-table-column>
       <el-table-column label="是否关闭" align="left" min-width="80">
@@ -492,7 +493,7 @@ export default {
     },
     faxSmsStatusFilter(status) {
       const statusMap = {
-        1: '已发送',
+        1: '发送',
         0: '未发送'
       }
       return statusMap[status]
@@ -575,6 +576,7 @@ export default {
         faxNumber: '', // 传真编号
         faxPhone: '', // 传真号码
         faxStatus: '', // 传真状态
+        smsStatus:'',
         companyName: '', // 单位名称
         cusCode: '', // 客户代码
         faxType: '', // 传真类型
@@ -606,11 +608,11 @@ export default {
       smsStatusData: [
         {
           value: '1',
-          faxStatus: '已发送'
+          faxStatus: '是'
         },
         {
           value: '0',
-          faxStatus: '未发送'
+          faxStatus: '否'
         }
       ], // 下拉框
       signList: [
@@ -1135,7 +1137,7 @@ export default {
     },
     faxSmsStatusFilter(status) {
       const statusMap = {
-        '1': '已发送',
+        '1': '发送',
         '0': '未发送'
       }
       return statusMap[status]

CallCenterWeb.UI/src/views/orderSearch/orderList/detail.vue

@@ -3,6 +3,7 @@
     <el-card shadow="hover">
       <el-row :gutter="20">
         <el-col :md="24" class="order_detail_body">
+
           <el-col :md="21">
             <h1 class="title">
               <svg-icon class="title_icon" icon-class="hongqi" />工单编号：{{
@@ -10,6 +11,7 @@
               }}
             </h1>
           </el-col>
+
           <el-col :md="24" class="order_detail_content">
             <el-col :md="6" class="order_detail_item">
               客户代码：{{ orderDetailData.cusCode }}
@@ -66,15 +68,16 @@
             <el-col :md="6" class="order_detail_item">
               发生频率：{{ orderDetailData.rate }}
             </el-col>
-            <el-col span="24" class="order_detail_item">
+            <el-col :span="24" class="order_detail_item">
               来电内容：{{ orderDetailData.content }}
             </el-col>
-            <el-row v-if="isClose!=1">
-              <el-col span="24" class="order_detail_item">
-                处理结果：{{ orderDetailData.processingResult }}
-              </el-col>
-            </el-row>
+
+            <el-col v-if="isClose!=1" :span="24" class="order_detail_item">
+              处理结果：{{ orderDetailData.processingResult }}
+            </el-col>
+            <!-- <el-row></el-row> -->
           </el-col>
+
         </el-col>
       </el-row>
 
@@ -87,6 +90,7 @@
           </el-form>
         </el-col>
       </el-row>
+
       <el-row v-if="isClose==1"><el-button type="primary" @click="save">保存</el-button></el-row>
     </el-card>
   </div>

CallCenterWeb.UI/src/views/orderSearch/orderList/index.vue

@@ -63,7 +63,7 @@
             @click="btn_search_task"
           >搜索</el-button
           >
-          <el-button :loading="downloadLoading" :disabled="disableBL" class="filter-item" type="primary" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
+          <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
         </div>
         <el-table
           v-loading="loading"
@@ -189,6 +189,7 @@ export default {
   data() {
     return {
       pickerOptions,
+      downloadLoading:false,
       zx: '', // 受理坐席
       makeType: [],
       slTp: '', // 咨询类型