访客测试

.env.production

 NODE_ENV = 'production'
-VUE_APP_API_URL = 'https://gateway-beta.mingwork.com'
\ No newline at end of file
+VUE_APP_API_URL = 'https://gateway.mingwork.com'
\ No newline at end of file

.env.test

+NODE_ENV = 'test'
+VUE_APP_API_URL = 'https://gateway-beta.mingwork.com'
\ No newline at end of file

package.json

@@ -7,6 +7,7 @@
     "devserve": "vue-cli-service serve --model development",
     "build": "vue-cli-service build",
     "probuild": "vue-cli-service build --mode production",
+    "test": "vue-cli-service build --mode test",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

src/components/pages/VisitorManagement/HistoricalVisitors.vue

@@ -21,18 +21,82 @@
         :open="endOpen"
         @openChange="handleEndOpenChange"
       />
-      <a-button type="primary" @click="getStatisticalProductPage">查询</a-button>
+      <a-button type="primary" @click="queryRecordList">查询</a-button>
     </div>
-    <!-- <a-table :columns="columns" :dataSource="dataSource" rowKey="productId" :pagination="pagination" @change="handleTableChange">
-      <span slot="productIcon" slot-scope="productIcon">
-        <img style="width: 100px" :src="productIcon" alt="" />
+    <a-table :columns="columns" :dataSource="dataSource" style="margin-top: 20px;" rowKey="recordId" :pagination="pagination" @change="handleTableChange">
+      <span slot="visitorList" slot-scope="visitorList">
+        <span v-for="(item, index) in visitorList" :key="item.visitorId">
+          {{ index === visitorList.length - 1 ? item.name : `${item.name}，`}}
+        </span>
       </span>
-      <span slot="productName"></span>
-      <span slot="productPrice" slot-scope="productPrice">
-        {{ productPrice.toFixed(2) }}
+      <span slot="companyName"></span>
+      <span slot="purpose"></span>
+      <span slot="byVisitorName"></span>
+      <span slot="startTime" slot-scope="startTime, record">
+        {{ startTime }} - {{ record.endTime }}
       </span>
-      <span slot="productStatisticalQuantity"></span>
-    </a-table> -->
+      <span slot="processStatus" slot-scope="processStatus">
+        {{processStatus === 'invite' ? '已邀请' : processStatus === 'reach' ? '已接待' : '已取消'}}
+      </span>
+      <span slot="byVisitorName"></span>
+      <span slot="action" slot-scope="text, record">
+        <a @click="showModal(record)">查看详情</a>
+      </span>
+    </a-table>
+    <a-modal v-model="visible" title="访客详情" :footer="null">
+      <div class="recordDetails">
+        <div>
+          <label>到访情况</label>
+          <div>{{showModalData.processStatus === 'invite' ? '已邀请' : showModalData.processStatus === 'reach' ? '已接待' : '已取消'}}</div>
+        </div>
+        <div>
+          <label>主访客</label>
+          <div>{{showModalData.visitorName}} {{showModalData.mobile}}</div>
+        </div>
+        <div>
+          <label>随行访客</label>
+          <div>
+            <p v-for="item in showModalData.visitorList" :key="item.visitorId" v-show="item.mobile !== showModalData.mobile">{{item.name}} {{item.mobile}}</p>
+          </div>
+        </div>
+        <div>
+          <label>访客公司</label>
+          <div>{{showModalData.companyName}}</div>
+        </div>
+        <div>
+          <label>被约时间</label>
+          <div>{{showModalData.inviteTime}}</div>
+        </div>
+        <div>
+          <label>被访人</label>
+          <div>{{showModalData.byVisitorName}}</div>
+        </div>
+        <div>
+          <label>开始时间</label>
+          <div>{{showModalData.startTime}}</div>
+        </div>
+        <div>
+          <label>结束时间</label>
+          <div>{{showModalData.endTime}}</div>
+        </div>
+        <div>
+          <label>来访目的</label>
+          <div>{{showModalData.purpose}}</div>
+        </div>
+        <div>
+          <label>到访地址</label>
+          <div>{{showModalData.visitAddress}}</div>
+        </div>
+        <div>
+          <label>周知人员</label>
+          <div><span v-for="item in showModalData.participatorUserList" :key="item.ddUserId" style="margin-right: 10px;"></span></div>
+        </div>
+        <div>
+          <label>备注</label>
+          <div>{{showModalData.remark}}</div>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -58,31 +122,50 @@ export default {
         total: 0
       },
       columns: [{
-        title: '产品图',
-        dataIndex: 'productIcon',
-        scopedSlots: { customRender: 'productIcon' }
+        title: '访客姓名',
+        dataIndex: 'visitorList',
+        scopedSlots: { customRender: 'visitorList' }
+      }, {
+        title: '访客单位',
+        dataIndex: 'companyName'
+      }, {
+        title: '来访目的',
+        dataIndex: 'purpose'
+      }, {
+        title: '被访人',
+        dataIndex: 'byVisitorName'
       }, {
-        title: '菜名',
-        dataIndex: 'productName'
+        title: '被约时间',
+        dataIndex: 'startTime',
+        scopedSlots: { customRender: 'startTime' }
       }, {
-        title: '售出(份数)',
-        dataIndex: 'productStatisticalQuantity'
+        title: '状态',
+        dataIndex: 'processStatus',
+        scopedSlots: { customRender: 'processStatus' }
+      }, {
+        title: '操作',
+        dataIndex: 'action',
+        scopedSlots: { customRender: 'action' }
       }],
-      dataSource: []
+      dataSource: [],
+      showModalData: {},
+      visible: false
     }
   },
   created () {
-    let date = new Date()
-    let year = date.getFullYear()
-    let month = date.getMonth() + 1
-    let day = (new Date(year, month, 0).getDate().toString()).length > 1 ? new Date(year, month, 0).getDate() : '0' + new Date(year, month, 0).getDate()
-    this.startTime = `${year}-${month.toString().length > 1 ? month : '0' + month}-01`
-    this.endTime = `${year}-${month.toString().length > 1 ? month : '0' + month}-${day}`
-    this.startValue = this.moment(`${year}-${month.toString().length > 1 ? month : '0' + month}-01`, 'YYYY-MM-DD')
-    this.endValue = this.moment(`${year}-${month.toString().length > 1 ? month : '0' + month}-${day}`, 'YYYY-MM-DD')
     this.queryRecordList()
   },
   methods: {
+    showModal (record) {
+      this.showModalData = record
+      this.visible = true
+    },
+    // handleOk (e) {
+    //  this.visible = false
+    // },
+    // handleCancel (e) {
+    //   this.visible = false
+    // },
     moment,
     disabledStartDate (startValue) {
       const endValue = this.endValue
@@ -114,14 +197,16 @@ export default {
     },
     queryRecordList () {
       let RecordListData = {
-        startTime: `${this.startTime} 00:00:00`,
-        endTime: `${this.endTime} 23:59:59`,
+        visitorName: this.visitorName,
+        byVisitorName: this.byVisitorName,
+        startTime: this.startTime ? `${this.startTime} 00:00:00` : '',
+        endTime: this.endTime ? `${this.endTime} 23:59:59` : '',
         pageNumber: 10,
         currentPage: this.pagination.current
       }
-      $http.post(`/admin/visitor/queryRecordList`, RecordListData).then((res) => {
-        if (res.data.resultCode === 0) {
-          this.dataSource = res.data.data.list
+      $http.post(`/admin/visitor/getRecordList`, RecordListData).then((res) => {
+        if (res.data.code === 0) {
+          this.dataSource = res.data.data.records
           this.pagination.total = res.data.data.total
         } else {
           this.$message.error(res.data.message)
@@ -149,4 +234,15 @@ export default {
 .searchBox input{
   margin-right: 20px;
 }
+.recordDetails>div{
+  width: 100%;
+  display: flex;
+  margin: 10px;
+}
+.recordDetails>div label {
+  width: 120px;
+  font-weight: bolder;
+  margin-right: 10px;
+  text-align: right;
+}
 </style>