Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/callRecordForm.vue

@@ -158,7 +158,7 @@ export default {
 				this.tHeader,
 				this.filterVal,
 				data,
-				"填单记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+				"12345拨打记录报表" + this.$moment().format("YYYYMMDDHHmmss")
 			);
 			this.btnLoading = false;
 		},

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/letterRecordForm.vue

@@ -376,7 +376,7 @@ export default {
         tHeader,
         filterVal,
         data,
-        "填单记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+        "12345写信记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
       this.btnLoading = false;
     },

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/callRecord.vue

@@ -2,7 +2,7 @@
   <div class="callRecord-Container">
     <div class="header_box">
       <div>
-        <a-button type="primary" class="addclass"  @click="handleExportTable" :loading="btnLoading">
+        <a-button type="primary" class="addclass" @click="handleExportTable" :loading="btnLoading">
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
         </a-button>
         <b>叫号次数：<i>{{ tablePagination.total }}</i> 次</b>
@@ -10,6 +10,18 @@
       </div>
       <span>
         <a-space>
+          <a-select v-model="searchForm.hallid">
+            <a-select-option value=""> 全部大厅 </a-select-option>
+            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+              {{ item.hallName }}
+            </a-select-option>
+          </a-select>
+          <a-select v-model="searchForm.sectionid">
+            <a-select-option value=""> 全部部门 </a-select-option>
+            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="searchForm.id">
             <a-select-option value=""> 全部设备 </a-select-option>
             <a-select-option v-for="item in deviceData" :key="item.id" :value="item.id">
@@ -27,7 +39,7 @@
           <a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索" @pressEnter="handleSearch">
             <a-icon slot="prefix" type="search" />
           </a-input>
-          <a-button type="primary" class="addclass"  @click="handleSearch">搜索</a-button>
+          <a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
           <a-button @click="resetBtn">重置</a-button>
         </a-space>
       </span>
@@ -126,6 +138,8 @@ import BusinessInfo from "./components/businessInfo.vue";
 import WorkpeopleInfo from "./components/workpeopleInfo.vue";
 import HandlingDetails from "./components/HandlingDetails.vue";
 import {
+  getDatingList,
+  getBumenList,
   getCalllist,
   getCallQueList,
   getBusinessEvent,
@@ -265,7 +279,13 @@ export default {
         style: "", // 状态
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
         flownum: "", // 排号编码
+        hallid: "",
+        sectionid: ""
       },
+      // 大厅列表
+      datingList: [],
+      // 部门列表
+      bumenList: [],
       //状态
       style: [
         {
@@ -326,11 +346,25 @@ export default {
     HandlingDetails,
   },
   created() {
+    this.getDatingListArr();
+    this.getBumenListArr();
     this.getCalllistArr();
     this.getCallQueListArr();
   },
   mounted() { },
   methods: {
+    // 获取大厅列表
+    async getDatingListArr() {
+      await getDatingList({ page: 1, size: -1 }).then((res) => {
+        this.datingList = res.data.data;
+      });
+    },
+    // // 获取部门列表
+    async getBumenListArr() {
+      await getBumenList({ page: 1, size: -1 }).then((res) => {
+        this.bumenList = res.data.data;
+      });
+    },
     //重置按钮
     resetBtn() {
       this.tableSelectedKeys = [];
@@ -341,6 +375,8 @@ export default {
         style: "", // 状态
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
         flownum: "", // 排号编码
+        hallid: "",
+        sectionid: ""
       };
       this.getCallQueListArr();
     },
@@ -504,6 +540,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.ant-select {
+  width: 120px;
+}
+
 /deep/.ant-spin-container {
   display: block !important;
 }

portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/productManage.vue

@@ -116,6 +116,7 @@ export default {
         this.$refs.AddEditAppName.appInfoFome.id = item.id;
         this.$refs.AddEditAppName.appInfoFome.productName = item.productName;
       } else {
+        this.$refs.AddEditAppName.appInfoFome.id = '';
         this.$refs.AddEditAppName.VisibleTitle = "新增产品";
       }
       this.$refs.AddEditAppName.Visible = true;