up

src/views/dashboard/components/PanelGroup.vue

@@ -91,7 +91,7 @@
           <i class="iconfont icon-cheliangdangan statIcon"></i>
         </div>
         <div class="bline"></div>
-        <div class="boxcontentsubtitle">总预约数/总核销人数</div>
+        <div class="boxcontentsubtitle">总预约数/总核销数</div>
         <div class="boxcontent">
           <div class="boxcontentitem">
             <div class="boxcontentitem-big">
@@ -108,7 +108,7 @@
           </div>
         </div>
         <div class="blinefull"></div>
-        <div class="boxcontentsubtitle">今日预约数/今日核销人数</div>
+        <div class="boxcontentsubtitle">今日预约数/今日核销数</div>
         <div class="boxcontent">
           <div class="boxcontentitem">
             <div class="boxcontentitem-big">

src/views/system/department.vue

@@ -127,7 +127,11 @@
     },
     methods: {
       querySearch(queryString, cb) {
-        listuser().then(response => {
+        listuser({
+          keyword:queryString,
+          page:1,
+          page_size:999
+        }).then(response => {
           var data = response.data;
           for (var m of data) {
             m.value = m.name;

src/views/system/user.vue

@@ -23,6 +23,8 @@
           </el-table-column>
           <el-table-column prop="username" label="用户名">
           </el-table-column>
+          <el-table-column prop="departmentName" label="部门">
+          </el-table-column>
           <el-table-column prop="address" label="角色">
             <template slot-scope="scope">
               <el-tag size="medium" v-for="(item,index) in scope.row.roles" style="margin-right: 10px;">{{ item.name }}
@@ -229,6 +231,9 @@
                 mod.checked = false;
               }
             }
+            
+            m.departmentName = m.department?m.department.name:''
+            console.log("m",m)
             console.log(_u_rolelist)
             //break;
             m.rolelist = _u_rolelist;

src/views/visit/component/addCommon copy.vue

@@ -71,7 +71,7 @@
       <template v-slot:plate v-if="visitType==3">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            停车区域：
+            车辆类型：
           </div>
           <div class="xy-table-item-content">
             <el-radio-group v-model="form.plate" style="width:300px">

src/views/visit/component/addCommon.vue

@@ -71,7 +71,7 @@
       <template v-slot:plate v-if="visitType==3">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            停车区域：
+            车辆类型：
           </div>
           <div class="xy-table-item-content">
             <el-radio-group v-model="form.plate" style="width:300px">
@@ -165,15 +165,14 @@
         </div>
       </template> -->
 
-   <template v-slot:cars>
+   <template v-slot:cars v-if="visitType==3">
       <div class="xy-table-item">
         <div class="xy-table-item-label">
-          <span style="color: red;font-weight: 600;padding-right: 4px;"></span>到访车辆：
+          <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>到访车辆：
         </div>
         <div class="xy-table-item-content">
           <Button type="primary" icon="md-add" style="margin-bottom: 10px"
             @click="carsList.push({car:''})">新增到访车辆</Button>
-
           <xy-table style="width: 620px" :height="180" :is-page="false" :list="carsList"
             :table-item="carTable">
             <template v-slot:btns>
@@ -188,6 +187,28 @@
         </div>
       </div>
     </template>
+    <template v-slot:carsno v-if="visitType==1||visitType==2">
+       <div class="xy-table-item">
+         <div class="xy-table-item-label">
+           <span style="color: red;font-weight: 600;padding-right: 4px;"></span>到访车辆：
+         </div>
+         <div class="xy-table-item-content">
+           <Button type="primary" icon="md-add" style="margin-bottom: 10px"
+             @click="carsList.push({car:''})">新增到访车辆</Button>
+           <xy-table style="width: 620px" :height="180" :is-page="false" :list="carsList"
+             :table-item="carTable">
+             <template v-slot:btns>
+               <el-table-column label="操作" width="90" header-align="center" align="center">
+                 <template v-slot:default="scope">
+                   <Button size="small" type="primary" ghost
+                     @click="carsList.splice(scope.$index, 1)">删除</Button>
+                 </template>
+               </el-table-column>
+             </template>
+           </xy-table>
+         </div>
+       </div>
+     </template>
 
 
       <template v-slot:follw_people v-if="visitType==1||visitType==2">
@@ -328,6 +349,7 @@
           idcard: "",
           company_name: "",
           cars: [],
+          carsno:[],
           follw_people: [],
           long_time: 0,
           longrange: "",
@@ -481,6 +503,10 @@
             required: true,
             message: '请输入单位名称'
           }],
+          cars: [{
+            required: true,
+            message: '请输入车牌号'
+          }],
           accept_admin_id: [{
             required: true,
             message: '请选择被访人'

src/views/visit/component/showVisit.vue

@@ -29,9 +29,14 @@
           </div>
           <div class="xy-table-item-content">
             <div style="font-size: 32px;padding: 25px;width:400px">
-              <el-radio-group v-model="codeForm.type">
-                <el-radio :label="item.id" v-for="item in codeTypeList">{{item.value}}</el-radio>
-              </el-radio-group>
+              <div v-for="item in codeTypeList">
+                <div v-if="item.id == codeForm.type">
+                  {{item.value}}
+                </div>
+              </div>
+              <!-- <el-radio-group v-model="codeForm.type">
+                <el-radio :label="item.id" >{{item.value}}</el-radio>
+              </el-radio-group> -->
               <!-- {{form.audit_status_text}} -->
             </div>
           </div>
@@ -131,7 +136,7 @@
       <template v-slot:plate v-if="form.type==3">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            停车区域：
+            车辆类型：
           </div>
           <div class="xy-table-item-content">
             {{form.plate}}
@@ -391,6 +396,9 @@
           person_no: []
         }, // 核验
         codeTypeList: [{
+          id:0,
+          value:'请提醒被访人签字'
+        },{
           id: 1,
           value: '入场'
         }, {
@@ -494,7 +502,7 @@
             console.log(this.form)
             this.codeForm.code = this.form.code
             this.codeForm.admin_id = parseInt(this.gateAdminId)
-            this.codeForm.type = this.form.audit_status == 1 ? 1 : (this.form.audit_status == 3 ? 2 : '')
+            this.codeForm.type = this.form.audit_status == 1 ? 1 : (this.form.audit_status == 3 && this.form.accept_admin_sign ? 2 : 0)
             if(this.codeForm.type==1){
               this.codeForm.person_no.push({name:this.form.name,person_no:''})
               for(var k of this.form.follw_people){
@@ -595,6 +603,11 @@
         let that = this
         console.log(this.codeForm)
         console.log(this.codeForm.person_no)
+        if(this.codeForm.type==0){
+          this.$successMessage('请提醒被访人签字','','warning')
+          this.isShow = false
+          return
+        }
         cancelCode({
           ...that.codeForm
         }).then(res => {

src/views/visit/longterm.vue

@@ -30,9 +30,10 @@
     <xy-table :table-item="table" :list="data" :total="total"
       :auths="['edit','delete']"
       @pageSizeChange="e => {select.rows = e;select.page = 1;getList()}"
-      @pageIndexChange="e => {select.page = e;getList()}">
+      @pageIndexChange="e => {select.page = e;getList()}" @delete="deleteStudy" @editor="editorStudy">
 
     </xy-table>
+        <addCommon ref="addCommon" @refresh="getList"></addCommon>
   </div>
 </template>
 
@@ -43,8 +44,10 @@
   import {
     download
   } from '@/utils/downloadRequest'
+    import addCommon from '@/views/visit/component/addCommon'
   export default {
     components: {
+      addCommon
     },
     data() {
       return {
@@ -217,6 +220,22 @@
           },
           '拜访记录列表.xlsx')
           this.select.is_export = 0
+      },
+      deleteStudy(row) {
+        destroy({
+          id: row.id
+        }).then(res => {
+          this.$successMessage('destroy', '长期访客')
+          this.getList()
+        })
+      },
+      editorStudy(row) {
+        // let addWhat = row.type == 1 ? "addCommon" : (row.type == 2 ? "addBuild" : (row.type == 3 ? "addPark" : ""))
+        let addWhat = "addCommon"
+        this.$refs[addWhat].id = row.id
+        this.$refs[addWhat].visitType=row.type
+        this.$refs[addWhat].type = 'editor'
+        this.$refs[addWhat].isShow = true
       }
     },
   }

src/views/visit/record.vue

@@ -190,6 +190,40 @@
             prop: 'end_date',
             width: 180
           },
+          {
+            label: '入场时间',
+            sortable: false,
+            prop: 'gate_start_date',
+            width: 180,
+            formatter:(cell,data,value)=>{
+              if(cell.gate_logs){
+                for(let k of cell.gate_logs){
+                  if(k.remark=='进厂'){
+                    return k.created_at
+                  }
+                }
+              }else{
+                return ''
+              }
+            }
+          },
+          {
+            label: '离场时间',
+            sortable: false,
+            prop: 'gate_end_date',
+            width: 180,
+            formatter:(cell,data,value)=>{
+              if(cell.gate_logs){
+                for(let k of cell.gate_logs){
+                  if(k.remark=='离厂'){
+                    return k.created_at
+                  }
+                }
+              }else{
+                return ''
+              }
+            }
+          },
           {
             label: '创建时间',
             sortable: false,