fix: visit purpose options

src/views/vm/visit.vue

@@ -2,113 +2,47 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button
+        <el-button type="primary" icon="el-icon-plus" @click="add">新建项目</el-button>
-          type="primary"
+        <el-select v-model="query.purpose" placeholder="来访事由" @change="handleQuery" clearable style="margin-left: 2px">
-          icon="el-icon-plus"
+          <el-option v-for="item in purposeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
-          @click="add"
-        >新建项目</el-button>
-        <el-select
-          v-model="query.purpose"
-          placeholder="来访事由"
-          @change="handleQuery"
-          clearable
-          style="margin-left: 2px"
-        >
-          <el-option
-            v-for="item in purposeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
         </el-select>
-        <el-date-picker
+        <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" start-placeholder="来访时间始"
-          v-model="timeRange"
+          end-placeholder="来访时间止" style="margin-left: 2px" value-format="YYYY-MM-DD HH:mm:ss" @change="handleQuery"
-          type="datetimerange"
+          clearable />
-          range-separator="至"
-          start-placeholder="来访时间始"
-          end-placeholder="来访时间止"
-          style="margin-left: 2px"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          @change="handleQuery"
-          clearable
-        />
       </div>
       <div class="right-panel">
         <div class="right-panel-search">
-          <el-input
+          <el-input v-model="query.search" placeholder="名称" clearable @keyup.enter="handleQuery"></el-input>
-            v-model="query.search"
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-            placeholder="名称"
-            clearable
-            @keyup.enter="handleQuery"
-          ></el-input>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            @click="handleQuery"
-          ></el-button>
         </div>
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable
+      <scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" stripe
-        ref="table"
+        @resetQuery="resetQuery">
-        :apiObj="apiObj"
+        <el-table-column label="#" fixed="left" type="index" width="50"></el-table-column>
-        row-key="id"
-        @selection-change="selectionChange"
-        stripe
-        @resetQuery="resetQuery"
-      >
-        <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
 
         <el-table-column label="来访事由" prop="state" width="80" fixed="left">
           <template #default="scope">{{
             purpose_[scope.row.purpose]
           }}</template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="来访概述" prop="name" min-width="160" :show-overflow-tooltip="true"></el-table-column>
-          label="来访概述"
+        <el-table-column label="访问级别" prop="level" min-width="80" fixed="left">
-          prop="name"
-          min-width="160"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="访问级别"
-          prop="level"
-          min-width="80"
-          fixed="left"
-        >
           <template #default="scope">
             <el-space v-if="scope.row.level == 10">一般</el-space>
             <el-space v-else>重要</el-space>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="来访单位" prop="company" min-width="220" fixed="left"></el-table-column>
-          label="来访单位"
-          prop="company"
-          min-width="220"
-          fixed="left"
-        ></el-table-column>
         <el-table-column label="项目状态" prop="state" min-width="80">
           <template #default="scope">{{ state_[scope.row.state] }}</template>
         </el-table-column>
         <el-table-column label="审批状态" min-width="200">
           <template #default="scope">
-            <span
+            <span v-if="scope.row.ticket_ && scope.row.ticket_.state_" style="margin-right: 5px">{{
-              v-if="scope.row.ticket_ && scope.row.ticket_.state_"
+              scope.row.ticket_.state_.name }}</span>
-              style="margin-right: 5px"
+            <el-tag v-if="scope.row.ticket_ && scope.row.ticket_.act_state" class="mx-1" size="small" :type="scope.row.ticket_.act_state === 0
-              >{{ scope.row.ticket_.state_.name }}</span
-            >
-            <el-tag
-              v-if="scope.row.ticket_ && scope.row.ticket_.act_state"
-              class="mx-1"
-              size="small"
-              :type="
-                scope.row.ticket_.act_state === 0
                 ? ''
                 : scope.row.ticket_.act_state === 1
                   ? ''
@@ -121,9 +55,7 @@
                         : scope.row.ticket_.act_state === 4
                           ? 'success'
                           : ''
-              "
+              ">{{ act_states[scope.row.ticket_.act_state] }}</el-tag>
-              >{{ act_states[scope.row.ticket_.act_state] }}</el-tag
-            >
           </template>
         </el-table-column>
         <!-- <el-table-column
@@ -131,21 +63,9 @@
 					prop="name"
 					min-width="180"
 				></el-table-column> -->
-        <el-table-column
+        <el-table-column label="来访时间" prop="visit_time" width="160"></el-table-column>
-          label="来访时间"
+        <el-table-column label="离开时间" prop="leave_time" width="160"></el-table-column>
-          prop="visit_time"
+        <el-table-column label="来访人数" prop="count_people" min-width="80"></el-table-column>
-          width="160"
-        ></el-table-column>
-        <el-table-column
-          label="离开时间"
-          prop="leave_time"
-          width="160"
-        ></el-table-column>
-        <el-table-column
-          label="来访人数"
-          prop="count_people"
-          min-width="80"
-        ></el-table-column>
         <el-table-column label="接待人" prop="receptionist_name" min-width="80">
           <template #default="scope">
             <span v-if="scope.row.receptionist_">{{
@@ -153,46 +73,22 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="创建时间" prop="create_time" width="180"></el-table-column>
-          label="创建时间"
-          prop="create_time"
-          width="180"
-        ></el-table-column>
         <el-table-column label="操作" fixed="right" align="left" width="170">
           <template #default="scope">
-            <el-button
+            <el-button link v-if="scope.row.state == 10" type="primary" size="small"
-              link
+              @click="addpepple(scope.row, scope.$index)">继续编辑
-              v-if="scope.row.state == 10"
-              type="primary"
-              size="small"
-              @click="addpepple(scope.row, scope.$index)"
-              >继续编辑
             </el-button>
-            <el-button
+            <el-button link type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
-              link
-              type="primary"
-              size="small"
-              @click="table_show(scope.row, scope.$index)"
-              >查看
             </el-button>
-            <el-button
+            <el-button v-if="scope.row.state != 30" link type="danger" size="small" @click="table_del(scope.row)">删除
-              v-if="scope.row.state != 30"
-              link
-              type="danger"
-              size="small"
-              @click="table_del(scope.row)"
-              >删除
             </el-button>
           </template>
         </el-table-column>
       </scTable>
     </el-main>
-    <save-dialog
+    <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
-      v-if="dialog.save"
+      @closed="dialog.save = false"></save-dialog>
-      ref="saveDialog"
-      @success="handleSaveSuccess"
-      @closed="dialog.save = false"
-    ></save-dialog>
     <detial-dialog v-if="dialog.save" ref="detialDialog"></detial-dialog>
   </el-container>
 </template>
@@ -220,6 +116,8 @@ export default {
         keyword: null,
       },
       purposeOptions: [
+        { label: "售后服务", value: 2 },
+        { label: "业务洽谈", value: 4 },
         { label: "参观", value: 10 },
         { label: "拜访", value: 20 },
         { label: "面试", value: 30 },
@@ -228,6 +126,8 @@ export default {
         { label: "其他", value: 60 },
       ],
       purpose_: {
+        2: "售后服务",
+        4: "业务洽谈",
         10: "参观",
         20: "拜访",
         30: "面试",

src/views/vm/visit_detial.vue

@@ -19,7 +19,8 @@
             <el-descriptions-item label="离开时间:">{{ form.leave_time }}</el-descriptions-item>
             <el-descriptions-item label="来访事由:">{{ purpose_[form.purpose] }}</el-descriptions-item>
             <el-descriptions-item label="来访详述:">{{ form.description }}</el-descriptions-item>
-            <el-descriptions-item label="接待人:" v-if="form.receptionist_">{{ form.receptionist_.name }}</el-descriptions-item>
+            <el-descriptions-item label="接待人:" v-if="form.receptionist_">{{ form.receptionist_.name
+            }}</el-descriptions-item>
           </el-descriptions>
           <div v-if="form.vehicle_photos_">
             <span style="vertical-align: top;">车辆照片:</span>
@@ -42,13 +43,9 @@
                     <el-space v-else>否</el-space>
                   </el-descriptions-item>
                   <el-descriptions-item label="照片:">
-                    <el-image 
+                    <el-image v-if="scope.row.visitor_ && scope.row.visitor_.photo"
-                        v-if="scope.row.visitor_ && scope.row.visitor_.photo"
+                      style="margin-right: 8px;height: 146px;height:146px;" :src="scope.row.visitor_.photo"
-                        style="margin-right: 8px;height: 146px;height:146px;"
+                      :preview-src-list="[scope.row.visitor_.photo]" fit="cover" />
-                        :src="scope.row.visitor_.photo"
-                        :preview-src-list="[scope.row.visitor_.photo]"
-                        fit="cover"
-                      />
                   </el-descriptions-item>
                   <!-- <el-descriptions-item label="健康码:">
                     <el-image style="width: 100px; height: 100px" :src="scope.row.health_code"
@@ -77,8 +74,8 @@
             <el-table-column label="创建时间" prop="create_time"></el-table-column>
             <el-table-column label="操作" width="60">
               <template #default="scope">
-                <el-button link v-if="scope.row.blt_ == null" type="primary" size="small"
+                <el-button link v-if="scope.row.blt_ == null" type="primary" size="small" @click="bindCard(scope.row, 10)"
-                  @click="bindCard(scope.row, 10)" v-auth="'blt_bind.create'">绑卡
+                  v-auth="'blt_bind.create'">绑卡
                 </el-button>
               </template>
             </el-table-column>
@@ -127,6 +124,8 @@ export default {
       selectionFilters: [],
       setFiltersVisible: false,
       purposeoptions: [
+        { name: "售后服务", id: 2 },
+        { name: "业务洽谈", id: 4 },
         { id: 10, name: "参观" },
         { id: 20, name: "拜访" },
         { id: 30, name: "面试" },
@@ -135,6 +134,8 @@ export default {
         { id: 60, name: "其他" },
       ],
       purpose_: {
+        2: "售后服务",
+        4: "业务洽谈",
         10: "参观",
         20: "拜访",
         30: "面试",

src/views/vm/visit_form.vue

@@ -1,30 +1,13 @@
 <template>
-  <el-drawer
+  <el-drawer :title="titleMap[mode]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
-    :title="titleMap[mode]"
-    v-model="visible"
-    :size="1000"
-    destroy-on-close
-    @closed="$emit('closed')"
-  >
     <el-container v-loading="loading">
       <el-main style="padding: 0 20px 20px 20px">
-        <el-form
+        <el-form ref="dialogForm" :model="form" :rules="rules" :disabled="mode == 'show'" label-width="100px">
-          ref="dialogForm"
-          :model="form"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="100px"
-        >
           <el-row>
             <el-col :md="24" :sm="12" :xs="24">
               <el-form-item label="来访事由">
                 <el-select v-model="form.purpose" placeholder="选择来访事由">
-                  <el-option
+                  <el-option v-for="item in purposeoptions" :key="item.id" :label="item.name" :value="item.id" />
-                    v-for="item in purposeoptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -36,30 +19,18 @@
             </el-col>
             <el-col :md="24" :sm="12" :xs="24">
               <el-form-item label="来访详述">
-                <el-input
+                <el-input v-model="form.description" type="text" clearable></el-input>
-                  v-model="form.description"
-                  type="text"
-                  clearable
-                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="12" :xs="24">
               <el-form-item label="来访时间">
-                <el-date-picker
+                <el-date-picker v-model="form.visit_time" type="datetime" placeholder="选择来访时间" />
-                  v-model="form.visit_time"
-                  type="datetime"
-                  placeholder="选择来访时间"
-                />
               </el-form-item>
             </el-col>
 
             <el-col :md="12" :sm="12" :xs="24">
               <el-form-item label="离开时间">
-                <el-date-picker
+                <el-date-picker v-model="form.leave_time" type="datetime" placeholder="选择离开时间" />
-                  v-model="form.leave_time"
-                  type="datetime"
-                  placeholder="选择离开时间"
-                />
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24" :xs="24">
@@ -81,11 +52,7 @@
             </el-col>
             <el-col :md="24" :sm="12" :xs="24">
               <el-form-item label="来访单位">
-                <el-input
+                <el-input v-model="form.company" type="text" clearable></el-input>
-                  v-model="form.company"
-                  type="text"
-                  clearable
-                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24" :xs="24">
@@ -98,12 +65,8 @@
             </el-col>
             <el-col :md="12" :sm="12" :xs="24">
               <el-form-item label="来访人数">
-                <el-input-number
+                <el-input-number v-model="form.count_people" :min="0" :max="32767"
-                  v-model="form.count_people"
+                  controls-position="right"></el-input-number>
-                  :min="0"
-                  :max="32767"
-                  controls-position="right"
-                ></el-input-number>
 
 
 
@@ -114,9 +77,7 @@
         </el-form>
       </el-main>
       <el-footer>
-        <el-button type="primary" :loading="isSaveing" @click="submit"
+        <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          >保存</el-button
-        >
         <el-button @click="visible = false">取消</el-button>
       </el-footer>
     </el-container>
@@ -150,6 +111,8 @@ export default {
       selectionFilters: [],
       setFiltersVisible: false,
       purposeoptions: [
+        { name: "售后服务", id: 2 },
+        { name: "业务洽谈", id: 4 },
         { id: 10, name: "参观" },
         { id: 20, name: "拜访" },
         { id: 30, name: "面试" },