feat: 迁移记录 - 接口联调

project/src/components/customManage/removeRecord.vue

@@ -2,21 +2,21 @@
   <div v-loading="loading">
     <div class="screenBox">
       <!-- 创建人 -->
-      <selfInput label_name="创建人" :reset='resetFlag' :keyword="filter.operator_name" @inputChange='onChangeKeyword' />
+      <selfChannel title="创建人" :reset="resetFlag" type="circleCreate" :afferent_value="filter.operator_id" @channelDefine="onChangeOperatorId" />
       <!-- 迁出成员 -->
-      <serviceSingle title='迁出成员' :reset='resetFlag' :afferent_userId="filter.handover_userid" @customerDefine="onChangeHandoverUserId" />
+      <serviceSingle title="迁出成员" :reset="resetFlag" :afferent_userId="filter.handover_userid" @customerDefine="onChangeHandoverUserId" />
       <!-- 接替成员 -->
-      <serviceSingle title='接替成员' :reset='resetFlag' :afferent_userId="filter.takeover_userid" @customerDefine="onChangeTakeOverUserId" />
+      <serviceSingle title="接替成员" :reset="resetFlag" :afferent_userId="filter.takeover_userid" @customerDefine="onChangeTakeOverUserId" />
       <!-- 分配时间 -->
-      <datePicker title="分配时间" :reset='resetFlag' :afferent_time="filter.time" @changeTime="onChangeTime" />
+      <datePicker title="分配时间" :reset="resetFlag" :afferent_time="filter.time" @changeTime="onChangeTime" />
       <!-- 迁移状态 -->
-      <selfChannel title="迁移状态" :reset='resetFlag' type='remove_status' :afferent_value="filter.assignment_status" @channelDefine="onChangeStatus" />
+      <selfChannel title="迁移状态" :reset="resetFlag" type="remove_status" :afferent_value="filter.assignment_status" @channelDefine="onChangeStatus" />
       <!-- 迁移类型 -->
-      <selfChannel title="迁移类型" :reset='resetFlag' type='remove_type' :afferent_value="filter.type" @channelDefine="onChangeType" />
+      <selfChannel title="迁移类型" :reset="resetFlag" type="remove_type" :afferent_value="filter.type" @channelDefine="onChangeType" />
       <div class="reset" @click="resetEvent">重置</div>
     </div>
-    <!-- table -->
-    <el-table :height='height' :data="tableData" style="width: 100%;margin-top:10px;">
+
+    <el-table :height="height" :data="tableData" style="width: 100%;margin-top:10px;">
       <el-table-column prop="create_time" label="分配时间" align="center" min-width="160" />
       <el-table-column prop="type" label="迁移类型" align="center" min-width="140">
         <template slot-scope="{ row }">
@@ -55,9 +55,9 @@
         </template>
       </el-table-column>
     </el-table>
+
     <div class="pagination" v-show="pagination.total > 0">
-      <el-pagination background :current-page="pagination.page" @current-change="handleCurrentChange" layout="prev, pager, next" :page-count='Number(pagination.pages)'>
-      </el-pagination>
+      <el-pagination background :current-page="pagination.page" @current-change="handleCurrentChange" layout="prev, pager, next" :page-count="Number(pagination.pages)" />
     </div>
   </div>
 </template>
@@ -80,7 +80,12 @@ const statusMap = new Map([
 ])
 
 export default {
-  components: { selfInput, datePicker, serviceSingle, selfChannel },
+  components: {
+    selfInput,
+    datePicker,
+    serviceSingle,
+    selfChannel
+  },
   data () {
     return {
       loading: false,
@@ -95,7 +100,7 @@ export default {
         total: 0,
       },
       filter: {
-        operator_name: '',
+        operator_id: '',
         handover_userid: '',
         takeover_userid: '',
         time: [],
@@ -133,7 +138,6 @@ export default {
     },
     onClickDetail({ type, record_id }) {
       this.handleSetLocalParams()
-
       const pathOpt = {
         1: '/transferRecord/on',
         2: '/transferRecord/off',
@@ -149,8 +153,8 @@ export default {
     handleGetTypeName(type) {
       return typesMap.get(Number(type)) || '-'
     },
-    onChangeKeyword(val) {
-      this.filter.operator_name = val || ''
+    onChangeOperatorId(val) {
+      this.filter.operator_id = val
       this.pagination.page = 1
       this.handleGetList()
     },
@@ -181,9 +185,13 @@ export default {
       this.pagination.page = 1
       this.handleGetList()
     },
+    handleCurrentChange(currentPage) {
+      this.pagination.page = currentPage
+      this.handleGetList()
+    },
     resetEvent () {
       this.resetFlag = !this.resetFlag
-      this.filter.operator_name = ''
+      this.filter.operator_id = ''
       this.filter.handover_userid = ''
       this.filter.takeover_userid = ''
       this.filter.time = [];
@@ -193,7 +201,6 @@ export default {
       this.handleGetList()
     },
     async handleGetList() {
-      console.log('handleGetList => ')
       this.handleClearLocalParams()
       try {
         this.loading = true
@@ -202,7 +209,7 @@ export default {
         const params = {
           assignment_date_start,
           assignment_date_end,
-          operator_name: this.filter.operator_name,
+          operator_id: this.filter.operator_id,
           handover_userid: this.filter.handover_userid,
           takeover_userid: this.filter.takeover_userid,
           assignment_status: this.filter.assignment_status,
@@ -210,31 +217,27 @@ export default {
           page: this.pagination.page,
           page_size: this.pagination.page_size,
         }
-        console.log('params => ', JSON.parse(JSON.stringify(params)))
         const { data: res = {} } = await this.$axios.get(url, { params })
         if (res && res.errno == 0) {
-          this.tableData = res.rst.data;
-          this.pagination.total = res.rst.pageInfo.total;
-          this.pagination.pages = res.rst.pageInfo.pages;
+          this.tableData = res.rst.data
+          this.pagination.total = res.rst.pageInfo.total
+          this.pagination.pages = res.rst.pageInfo.pages
         } else if (res.errno != 4002) {
           this.$message.warning(res.err)
-          this.tableData = [];
-          this.pagination.total = 0;
-          this.pagination.pages = 0;
+          this.handleClearTableData()
         }
       } catch (error) {
         console.log(error)
-        this.tableData = [];
-        this.pagination.total = 0;
-        this.pagination.pages = 0;
+        this.handleClearTableData()
       } finally {
         this.loading = false
       }
     },
-    handleCurrentChange(currentPage) {
-      this.pagination.page = currentPage
-      this.handleGetList()
-    }
+    handleClearTableData() {
+      this.tableData = []
+      this.pagination.total = 0
+      this.pagination.pages = 0
+    },
   }
 }
 </script>

project/src/components/customOperate/employee_bulk_messaging_log.vue

@@ -68,7 +68,7 @@
           <!-- -1 发送失败 && 失败原因 -->
           <div class="status-wrap" >
             <span v-if="row.enable==-2" class="c-F03F5C">已删除</span>
-            <span v-else-if="row.enable==-1" :class="[(row.err_msg && row.err_msg.length) ? 'c-F03F5C' : 'c-666']">发送失败！</span>
+            <span v-else-if="row.enable==-1" :class="[(row.err_msg && row.err_msg.length) ? 'c-F03F5C' : 'c-666']">发送失败</span>
             <span v-else-if="row.enable==0" class="c-F03F5C">禁用</span>
             <span v-else-if="row.enable==1" class="c-FFB055">待发送</span>
             <span v-else-if="row.enable==2" class="c-448AFF">正在发送中</span>