From d81a6c77c838c711a13472e73dd4983acbc580f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Wed, 7 Sep 2022 14:48:12 +0800
Subject: [PATCH] =?UTF-8?q?user=20=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sys/user.vue |  18 +-
 src/views/vm/visit.vue | 580 ++++++++++++++++++++++-------------------
 2 files changed, 321 insertions(+), 277 deletions(-)

diff --git a/src/views/sys/user.vue b/src/views/sys/user.vue
index b5af8110..c8e8c657 100644
--- a/src/views/sys/user.vue
+++ b/src/views/sys/user.vue
@@ -73,32 +73,36 @@
           remoteFilter
           @selection-change="selectionChange"
         >
-          <!-- <el-table-column
-						type="selection"
+          <el-table-column
+						type="index"
 						width="50"
-					></el-table-column> -->
-          <el-table-column label="ID" prop="id" width="160"></el-table-column>
+					></el-table-column>
+          <!-- <el-table-column label="ID" prop="id" width="160"></el-table-column> -->
           <el-table-column label="姓名" prop="name"></el-table-column>
-          <el-table-column label="登录账号" prop="username"></el-table-column>
+          <el-table-column label="登录账号" prop="username" width="140"></el-table-column>
           <el-table-column label="是否启用" prop="is_active">
             <template #default="scope">
               <el-tag type="success" v-if="scope.row.is_active">启用</el-tag>
               <el-tag v-else type="danger">禁用</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="微信通知" width="80">
+          <!-- <el-table-column label="微信通知" width="80">
             <template #default="scope">
               <el-icon v-if="scope.row.wx_openid" color="green"
                 ><CircleCheckFilled
               /></el-icon>
               <el-icon v-else color="red"><CircleCloseFilled /></el-icon>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 		  <el-table-column label="账号类型" prop="type">
               <template #default="scope">
                 <span>{{userTypeOptions[scope.row.type]}}</span>
               </template>
             </el-table-column>
+            <el-table-column label="部门" prop="belong_dept_name">
+            </el-table-column>
+            <el-table-column label="岗位" prop="post_name">
+            </el-table-column>
           <!-- <el-table-column label="小程序" width="80">
             <template #default="scope">
               <el-icon v-if="scope.row.wxmp_openid" color="green"
diff --git a/src/views/vm/visit.vue b/src/views/vm/visit.vue
index ffe8f93d..a208eec6 100644
--- a/src/views/vm/visit.vue
+++ b/src/views/vm/visit.vue
@@ -1,286 +1,326 @@
 <template>
-	<el-container>
-		<el-header>
-			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'visit.create'"></el-button>
-			</div>
-			<div class="right-panel">
-				<div class="right-panel-search">
-					<el-input
-						v-model="query.search"
-						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
-				ref="table"
-				:apiObj="apiObj"
-				row-key="id"
-				@selection-change="selectionChange"
-				stripe
-				@resetQuery="resetQuery"
-			>
-				<el-table-column
-					label="#"
-					fixed="left"
-					type="index"
-					width="50"
-				></el-table-column>
+  <el-container>
+    <el-header>
+      <div class="left-panel">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+          v-auth="'visit.create'"
+        ></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
+          v-model="timeRange"
+          type="datetimerange"
+          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
+            v-model="query.search"
+            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
+        ref="table"
+        :apiObj="apiObj"
+        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="180" fixed="left">
-					<template #default="scope">{{purpose_[scope.row.purpose] }}</template>
-				</el-table-column>
-				<el-table-column
-					label="访问级别"
-					prop="level"
-					min-width="100"
-					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
-					label="来访单位"
-					prop="company"
-					min-width="180"
-					fixed="left"
-				></el-table-column>
-				<el-table-column
-					label="项目状态"
-					prop="state"
-					min-width="180"
-				>
-					<template #default="scope">{{state_[scope.row.state] }}</template>
-				</el-table-column>
-				<el-table-column
-					label="审批状态"
-					prop="state"
-					min-width="150"
-				>
-					<template #default="scope">
-						<span v-if="scope.row.ticket_&&scope.row.ticket_.state_" style="margin-right: 5px;">{{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?'':scope.row.ticket_.act_state===2?'danger':scope.row.ticket_.act_state===3?'danger':scope.row.ticket_.act_state===5?'danger':scope.row.ticket_.act_state===4?'success':''"
-						>{{act_states[scope.row.ticket_.act_state]}}</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column
+        <el-table-column label="来访事由" prop="state" width="180" fixed="left">
+          <template #default="scope">{{
+            purpose_[scope.row.purpose]
+          }}</template>
+        </el-table-column>
+        <el-table-column
+          label="访问级别"
+          prop="level"
+          min-width="100"
+          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
+          label="来访单位"
+          prop="company"
+          min-width="180"
+          fixed="left"
+        ></el-table-column>
+        <el-table-column label="项目状态" prop="state" min-width="180">
+          <template #default="scope">{{ state_[scope.row.state] }}</template>
+        </el-table-column>
+        <el-table-column label="审批状态" prop="state" min-width="150">
+          <template #default="scope">
+            <span
+              v-if="scope.row.ticket_ && scope.row.ticket_.state_"
+              style="margin-right: 5px"
+              >{{ 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
+                  ? ''
+                  : scope.row.ticket_.act_state === 2
+                  ? 'danger'
+                  : scope.row.ticket_.act_state === 3
+                  ? 'danger'
+                  : scope.row.ticket_.act_state === 5
+                  ? 'danger'
+                  : scope.row.ticket_.act_state === 4
+                  ? 'success'
+                  : ''
+              "
+              >{{ act_states[scope.row.ticket_.act_state] }}</el-tag
+            >
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
 					label="来访概述"
 					prop="name"
 					min-width="180"
-				></el-table-column>
-				<el-table-column
-					label="来访详述"
-					prop="description"
-					min-width="180"
-				></el-table-column>
-				<el-table-column
-					label="来访时间"
-					prop="visit_time"
-					width="180"
-				></el-table-column>
-				<el-table-column
-					label="离开时间"
-					prop="leave_time"
-					width="180"
-				></el-table-column>
-				<el-table-column
-					label="来访人数"
-					prop="count_people"
-					min-width="80"
-				></el-table-column>
-				<el-table-column
-					label="属地部门"
-					prop="belong_dept"
-					min-width="150"
-				></el-table-column>
-				<el-table-column
-					label="接待人"
-					prop="receptionist_name"
-					min-width="80"
-				>
-					<template #default="scope">
-						<span v-if="scope.row.receptionist_">{{scope.row.receptionist_.name}}</span>
-					</template>
-				</el-table-column>
-				<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
-								link
-								v-if="scope.row.state==10"
-								type="primary"
-								size="small"
-								@click="addpepple(scope.row, scope.$index)"
-								v-auth="'visit.update'"
-							>继续编辑
-							</el-button>
-							<el-button
-								link
-								type="primary"
-								size="small"
-								@click="table_show(scope.row, scope.$index)"
-							>查看
-							</el-button>
-							<el-button
-								link
-								type="primary"
-								size="small"
-								@click="table_del(scope.row)"
-								v-auth="'visit.delete'"
-							>删除
-							</el-button>
-					</template>
-				</el-table-column>
-			</scTable>
-		</el-main>
-		<save-dialog
-			v-if="dialog.save"
-			ref="saveDialog"
-			@success="handleSaveSuccess"
-			@closed="dialog.save = false"
-		></save-dialog>
-		<detial-dialog
-			v-if="dialog.save"
-			ref="detialDialog"
-		></detial-dialog>
-	</el-container>
+				></el-table-column> -->
+        <el-table-column
+          label="来访时间"
+          prop="visit_time"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          label="离开时间"
+          prop="leave_time"
+          width="180"
+        ></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_">{{
+              scope.row.receptionist_.name
+            }}</span>
+          </template>
+        </el-table-column>
+        <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
+              link
+              v-if="scope.row.state == 10"
+              type="primary"
+              size="small"
+              @click="addpepple(scope.row, scope.$index)"
+              v-auth="'visit.update'"
+              >继续编辑
+            </el-button>
+            <el-button
+              link
+              type="primary"
+              size="small"
+              @click="table_show(scope.row, scope.$index)"
+              >查看
+            </el-button>
+            <el-button
+              link
+              type="primary"
+              size="small"
+              @click="table_del(scope.row)"
+              v-auth="'visit.delete'"
+              >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+    <save-dialog
+      v-if="dialog.save"
+      ref="saveDialog"
+      @success="handleSaveSuccess"
+      @closed="dialog.save = false"
+    ></save-dialog>
+    <detial-dialog v-if="dialog.save" ref="detialDialog"></detial-dialog>
+  </el-container>
 </template>
 <script>
-	import saveDialog from "./visit_form.vue";
-	import detialDialog from "./visit_detial.vue";
+import saveDialog from "./visit_form.vue";
+import detialDialog from "./visit_detial.vue";
 
-	export default {
-		name: "visit",
-		components: {
-			saveDialog,
-			detialDialog
-		},
-		data() {
-			return {
-				dialog: {
-					save: false,
-					permission: false,
-				},
-				apiObj: this.$API.vm.visit.list,
-				query: {},
-				selection: [],
-				search: {
-					keyword: null,
-				},
+export default {
+  name: "visit",
+  components: {
+    saveDialog,
+    detialDialog,
+  },
+  data() {
+    return {
+      timeRange: [],
+      dialog: {
+        save: false,
+        permission: false,
+      },
+      apiObj: this.$API.vm.visit.list,
+      query: {},
+      selection: [],
+      search: {
+        keyword: null,
+      },
+      purposeOptions: [
+        { label: "参观", value: 10 },
+        { label: "拜访", value: 20 },
+        { label: "面试", value: 30 },
+        { label: "开会", value: 40 },
+        { label: "拉送货", value: 50 },
+      ],
+      purpose_: {
+        10: "参观",
+        20: "拜访",
+        30: "面试",
+        40: "开会",
+        50: "拉送货",
+      },
+      state_: {
+        10: "创建中",
+        20: "审批中",
+        30: "待入厂",
+        40: "进行中",
+        50: "已完成",
+        60: "已关闭",
+      },
+      act_states: {
+        0: "草稿中", //p
+        1: "进行中", //p
 
-				purpose_: {
-					10: "参观",
-					20: "拜访",
-					30: "面试",
-					40: "开会"
-				},
-				state_: {
-					10: "创建中",
-					20: "审批中",
-					30: "待入厂",
-					40: "进行中",
-					50: "已完成",
-					60: "已关闭"
-				},
-				act_states: {
-					0: "草稿中",//p
-					1: "进行中",//p
+        2: "被退回", //d
+        3: "被撤回", //d
 
-					2: "被退回",//d
-					3: "被撤回",//d
+        4: "已完成", //s
+        5: "已关闭", //d
+      },
+    };
+  },
+  methods: {
+    //添加
+    add() {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("add");
+      });
+    },
+    addpepple(row) {
+      this.$router.push({
+        name: "vistoradd",
+        query: {
+          visitid: row.id, //访问项目id
+        },
+      });
+    },
 
-					4: "已完成",//s
-					5: "已关闭",//d
-				},
-			};
-		},
-		methods: {
-			//添加
-			add() {
-				this.dialog.save = true;
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open("add");
-				});
-			},
-			addpepple(row) {
-				this.$router.push({
-					name: "vistoradd",
-					query: {
-						visitid: row.id, //访问项目id
-					},
-				});
-			},
+    //查看
+    table_show(row) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.detialDialog.open("show").setData(row);
+      });
+    },
 
+    //权限设置
+    permission() {
+      this.dialog.permission = true;
+      this.$nextTick(() => {
+        this.$refs.permissionDialog.open();
+      });
+    },
+    //删除
+    table_del(row) {
+      this.$API.vm.visit.delete
+        .req(row.id)
+        .then((res) => {
+          this.$message.success("删除成功");
 
-			//查看
-			table_show(row) {
-				this.dialog.save = true;
-				this.$nextTick(() => {
-					this.$refs.detialDialog.open("show").setData(row);
-				});
-			},
+          return res;
+        })
+        .catch((err) => {
+          return err;
+        });
+    },
 
-			//权限设置
-			permission() {
-				this.dialog.permission = true;
-				this.$nextTick(() => {
-					this.$refs.permissionDialog.open();
-				});
-			},
-			//删除
-			table_del(row) {
-				this.$API.vm.visit.delete
-					.req(row.id)
-					.then((res) => {
-						this.$message.success("删除成功");
+    //表格选择后回调事件
+    selectionChange(selection) {
+      this.selection = selection;
+    },
 
-						return res;
-					})
-					.catch((err) => {
-						return err;
-					});
-
-			},
-
-			//表格选择后回调事件
-			selectionChange(selection) {
-				this.selection = selection;
-			},
-
-
-			//本地更新数据
-			handleSaveSuccess(data, mode) {
-				if (mode == "add") {
-					this.$refs.table.refresh();
-				} else if (mode == "edit") {
-					this.$refs.table.refresh();
-				}
-			},
-			resetQuery() {
-				this.query = {};
-			},
-			handleQuery() {
-				this.$refs.table.queryData(this.query)
-			},
-		},
-	};
+    //本地更新数据
+    handleSaveSuccess(data, mode) {
+      if (mode == "add") {
+        this.$refs.table.refresh();
+      } else if (mode == "edit") {
+        this.$refs.table.refresh();
+      }
+    },
+    resetQuery() {
+      this.query = {};
+    },
+    handleQuery() {
+      if (this.timeRange) {
+        this.query.start_come = this.timeRange[0];
+        this.query.end_come = this.timeRange[1];
+      } else {
+        this.query.end_come = null;
+        this.query.start_come = null;
+      }
+      this.$refs.table.queryData(this.query);
+    },
+  },
+};
 </script>