From aedad51e0775acd4e46f18ca8aaf27fc9ae221cf Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Jul 2021 22:32:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/trainingRegistration/data.js | 362 ++++++++++-------
src/api/dispatch/dispatch.js | 2
src/router/views/index.js | 84 ++-
src/views/car/data.js | 2
src/api/trainingRegistration/trainingRegistration.js | 8
src/views/dispatchChild/index.vue | 2
src/views/gun/data.js | 2
src/views/trainingRegistration/index.vue | 33 +
src/views/equipments/data.js | 2
src/views/dispatch/dispatch.vue | 0
src/views/dispatch/dispatchChildoperable.vue | 660 +++++++++++++++++++++++++++++++++
11 files changed, 959 insertions(+), 198 deletions(-)
diff --git a/src/api/dispatch/dispatch.js b/src/api/dispatch/dispatch.js
index e467c82..c055db0 100644
--- a/src/api/dispatch/dispatch.js
+++ b/src/api/dispatch/dispatch.js
@@ -39,7 +39,7 @@
}
export const getdata1 = (current, size, params) => {
- console.log(params,'set')
+ // console.log(params,'set')
return request({
url: '/api/dispatcher/page',
method: 'get',
diff --git a/src/api/trainingRegistration/trainingRegistration.js b/src/api/trainingRegistration/trainingRegistration.js
index 35687d2..6f49d3e 100644
--- a/src/api/trainingRegistration/trainingRegistration.js
+++ b/src/api/trainingRegistration/trainingRegistration.js
@@ -2,7 +2,7 @@
export const getdata = (current, size, params) => {
return request({
- url: '/api/recruitment/page',
+ url: '/api/trainingRegistration/page',
method: 'get',
params: {
...params,
@@ -14,7 +14,7 @@
export const adddata = (row) => {
return request({
- url: '/api/recruitment/submit',
+ url: '/api/trainingRegistration/submit',
method: 'post',
data: row
})
@@ -22,7 +22,7 @@
export const update = (row) => {
return request({
- url: '/api/recruitment/submit',
+ url: '/api/trainingRegistration/submit',
method: 'post',
data: row
})
@@ -30,7 +30,7 @@
export const remove = (ids) => {
return request({
- url: '/api/recruitment/remove',
+ url: '/api/trainingRegistration/remove',
method: 'post',
params: {
ids,
diff --git a/src/router/views/index.js b/src/router/views/index.js
index dcf16c5..26fc96d 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -11,7 +11,7 @@
i18n: 'dashboard'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/wel/index')
+ import( /* webpackChunkName: "views" */ '@/views/wel/index')
}, {
path: 'dashboard',
name: '控制台',
@@ -20,7 +20,7 @@
menu: false,
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
+ import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
}]
}, {
path: '/test',
@@ -33,7 +33,7 @@
i18n: 'test'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/util/test')
+ import( /* webpackChunkName: "views" */ '@/views/util/test')
}]
}, {
path: '/dict-horizontal',
@@ -46,7 +46,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+ import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
}]
}, {
path: '/dict-vertical',
@@ -59,7 +59,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+ import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
}]
}, {
path: '/info',
@@ -72,7 +72,7 @@
i18n: 'info'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+ import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
}]
}, {
path: '/work/process/leave',
@@ -85,7 +85,7 @@
i18n: 'work'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+ import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
}, {
path: 'handle/:taskId/:processInstanceId/:businessId',
name: '处理请假流程',
@@ -93,7 +93,7 @@
i18n: 'work'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+ import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
}, {
path: 'detail/:processInstanceId/:businessId',
name: '请假流程详情',
@@ -101,7 +101,7 @@
i18n: 'work'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+ import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
}]
}, {
path: '/securityAnalysis',
@@ -114,7 +114,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
+ import( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
}]
}, {
path: '/recruitmentManagement',
@@ -127,7 +127,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
+ import( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
}]
}, {
path: '/securityUnit',
@@ -140,7 +140,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
+ import( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
}]
}, {
path: '/securityGuard',
@@ -153,7 +153,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+ import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
}]
}, {
path: '/securityGuardDetail',
@@ -166,7 +166,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
+ import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
}]
}, {
path: '/resource',
@@ -179,7 +179,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
+ import( /* webpackChunkName: "views" */ '@/views/resource/attach')
}]
}, {
path: '/securityUnitChild',
@@ -192,7 +192,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
+ import( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
}]
}, {
path: '/securityGuard',
@@ -205,9 +205,24 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+ import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
}]
-}, {
+},
+// {
+// path: '/dispatch/dispatch',
+// component: Layout,
+// redirect: '/dispatch/dispatch',
+// children: [{
+// path: 'index',
+// name: '派遣服务管理',
+// meta: {
+// i18n: 'dict'
+// },
+// component: () =>
+// import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
+// }]
+// },
+{
path: '/desk',
component: Layout,
redirect: '/desk/notice',
@@ -218,22 +233,31 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
+ import( /* webpackChunkName: "views" */ '@/views/desk/notice')
}]
}, {
path: '/dispatch',
component: Layout,
- redirect: '/dispatch/index',
+ redirect: '/dispatch/dispatch',
children: [{
- path: 'index',
- name: '派遣服务管理',
+ path: 'dispatch',
+ name: '派遣单位管理',
meta: {
- i18n: 'dict'
+ i18n: 'dispatch'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/dispatch/index')
+ import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
+ }, {
+ path: 'dispatchChildoperable',
+ name: '派遣记录管理',
+ meta: {
+ i18n: 'dispatch'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperable')
}]
-}, {
+},
+{
path: '/dispatchChild',
component: Layout,
redirect: '/dispatchChild/index',
@@ -244,7 +268,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
+ import( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
}]
}, {
path: '/equipments',
@@ -257,7 +281,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/equipments/index')
+ import( /* webpackChunkName: "views" */ '@/views/equipments/index')
}]
}, {
path: '/car',
@@ -270,7 +294,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/car/index')
+ import( /* webpackChunkName: "views" */ '@/views/car/index')
}]
}, {
path: '/gun',
@@ -283,7 +307,7 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/gun/index')
+ import( /* webpackChunkName: "views" */ '@/views/gun/index')
}]
}, {
path: '/trainingRegistration',
@@ -296,6 +320,6 @@
i18n: 'dict'
},
component: () =>
- import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
+ import( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
}]
}]
\ No newline at end of file
diff --git a/src/views/car/data.js b/src/views/car/data.js
index 1968321..cda1113 100644
--- a/src/views/car/data.js
+++ b/src/views/car/data.js
@@ -60,7 +60,7 @@
}]
},
{
- label: "组织机构",
+ label: "保安公司",
prop: "tenantName",
rules: [{
required: true,
diff --git a/src/views/dispatch/index.vue b/src/views/dispatch/dispatch.vue
similarity index 100%
rename from src/views/dispatch/index.vue
rename to src/views/dispatch/dispatch.vue
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
new file mode 100644
index 0000000..d059f3c
--- /dev/null
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -0,0 +1,660 @@
+<template>
+ <div class="dispatchChildoperable">
+ <!-- <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs> -->
+ <!-- <span v-if="typeTABS.prop === 'tab1'"> -->
+ <!-- <avue-crud
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
+ >
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ </avue-crud> -->
+ <!-- <avue-form ref="form" v-model="obj0" :option="option0"> -->
+ <!-- <template slot-scope="scope" slot="menuForm">
+ <el-button @click="tip">自定义按钮</el-button>
+ </template> -->
+ <!-- </avue-form>
+ </span>
+ <span v-else-if="typeTABS.prop === 'tab2'"> -->
+ <avue-crud
+ :option="option1"
+ :data="data1"
+ :page.sync="page1"
+ ref="crudrec1"
+ :table-loading="loading1"
+ @row-save="rowSave1"
+ @search-change="searchChange1"
+ @search-reset="searchReset1"
+ @row-update="rowUpdate1"
+ @row-del="rowDel1"
+ @selection-change="selectionChange1"
+ @refresh-change="refreshChange1"
+ >
+ <!-- <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete1"
+ >删 除
+ </el-button>
+ </template> -->
+ </avue-crud>
+ <!-- </span> -->
+ <!-- <span v-else-if="typeTABS.prop === 'tab3'">选项卡内容3</span> -->
+ </div>
+</template>
+
+<script>
+// import { column, column1 } from "./data";
+import {
+ // getdata,
+ // adddata,
+ // update,
+ // remove,
+ getdata1,
+ adddata1,
+ update1,
+ remove1,
+} from "@/api/dispatch/dispatch";
+
+export default {
+ data() {
+ return {
+ // typeTABS: {}, //标签页
+ // optionTABS: {
+ // column: [
+ // {
+ // // icon: "el-icon-info",
+ // label: "派遣服务公司详情",
+ // prop: "tab1",
+ // },
+ // {
+ // // icon: "el-icon-info",
+ // label: "派遣记录",
+ // prop: "tab2",
+ // },
+ // // {
+ // // icon: "el-icon-info",
+ // // label: "选项卡3",
+ // // prop: "tab3",
+ // // },
+ // ],
+ // },
+
+ // id: "", //记录归属id
+ // //基本信息
+ // //保安单位信息表单
+ // obj0: {
+ // // title: "我是头部标题",
+ // },
+ // option0: {
+ // emptyBtn: false,
+ // submitBtn: false,
+ // gutter: 30,
+ // column: column,
+ // },
+ // loading: true, //派遣服务公司登记
+ // selectionList: [],
+ // page: {
+ // pageSize: 10,
+ // currentPage: 1,
+ // total: 0,
+ // },
+ // query: {},
+ // data: [],
+ // option: {
+ // card: true,
+ // searchSize: "mini",
+ // searchMenuSpan: 6,
+ // height: 547,
+ // menuWidth: 160,
+ // align: "center",
+ // selection: true,
+ // column: column,
+ // },
+
+ loading1: true, //派遣记录
+ selectionList1: [],
+ page1: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ query1: {},
+ data1: [],
+ option1: {
+ // card: true,
+ tip: false,
+ index: true,
+ // menu: false,
+ searchSize: "mini",
+ searchMenuSpan: 8,
+ height: 563,
+ cellBtn: false,
+ // addBtn: false,
+ // menuWidth: 160,
+ align: "center",
+ // selection: true,
+ column: [
+ // 派遣服务公司登记
+ // {
+ // label: "id",
+ // prop: "id",
+ // // search: true,
+ // // searchSpan: 4,
+ // // overHidden: true,
+ // // hide: true,
+ // // editDisplay: false,
+ // // addDisplay: false
+ // },
+ {
+ label: "保安人名称",
+ prop: "name",
+ search: true,
+ searchSpan: 5,
+ labelWidth: 120,
+ searchLabelWidth: 120,
+ // overHidden: true
+ rules: [
+ {
+ required: true,
+ message: "请输入保安人名称",
+ trigger: "click",
+ },
+ ],
+ },
+ {
+ label: "身份证",
+ prop: "cardid",
+ labelWidth: 120,
+ rules: [
+ {
+ required: true,
+ message: "请输入身份证",
+ trigger: "click",
+ },
+ ],
+ // search: true,
+ // searchSpan: 4,
+ // overHidden: true
+ },
+ // {
+ // label: "派遣人",
+ // prop: "dispatcher",
+ // // search: true,
+ // // searchSpan: 4,
+ // // overHidden: true
+ // },
+ {
+ label: "保安公司",
+ prop: "deptId",
+ labelWidth: 120,
+ searchLabelWidth: 120,
+ dicUrl:
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ search: true,
+ overHidden: true,
+ type: "select",
+ rules: [
+ {
+ required: true,
+ message: "请输入保安公司",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "派遣时间",
+ prop: "dispatchertime",
+ type: "date",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "timestamp",
+ labelWidth: 120,
+ search: true,
+ searchSpan: 5,
+ rules: [
+ {
+ required: true,
+ message: "请输入派遣时间",
+ trigger: "click",
+ },
+ ],
+ // overHidden: true
+ },
+ {
+ label: "结束时间",
+ prop: "endTime",
+ type: "date",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "timestamp",
+ labelWidth: 120,
+ rules: [
+ {
+ required: true,
+ message: "请输入结束时间",
+ trigger: "click",
+ },
+ ],
+ // search: true,
+ // searchSpan: 5,
+ // overHidden: true
+ },
+ {
+ label: "派遣地址",
+ prop: "dispatcheraddress",
+ labelWidth: 120,
+ rules: [
+ {
+ required: true,
+ message: "请输入派遣地址",
+ trigger: "click",
+ },
+ ],
+ // search: true,
+ // searchSpan: 4,
+ // overHidden: true
+ },
+ // {
+ // label: "派遣单位",
+ // // prop: "dispatcherCompany",
+ // prop: "tenantName",
+ // type: "tree",
+ // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ // props: {
+ // label: "title",
+ // value: "id"
+ // },
+ // // hide: !website.tenantMode,
+ // // addDisplay: website.tenantMode,
+ // // editDisplay: website.tenantMode,
+ // // viewDisplay: website.tenantMode,
+ // rules: [{
+ // required: true,
+ // message: "请输入派遣单位",
+ // trigger: "click"
+ // }],
+ // search: true,
+ // searchSpan: 4,
+ // overHidden: true
+ // },
+ ],
+ },
+ };
+ },
+ computed: {
+ // ids() {
+ // let ids = [];
+ // this.selectionList.forEach((ele) => {
+ // ids.push(ele.id);
+ // });
+ // return ids.join(",");
+ // },
+ ids1() {
+ let ids1 = [];
+ this.selectionList1.forEach((ele) => {
+ ids1.push(ele.id);
+ });
+ return ids1.join(",");
+ },
+ },
+ methods: {
+ handleChangeTABS(column) {
+ this.typeTABS = column;
+ if (column.prop == "tab1") {
+ this.loading1 = false;
+ // this.onLoad(this.page);
+ } else if (column.prop == "tab2") {
+ // this.loading = false;
+ console.log(document.getElementsByClassName("el-card__body")[0]);
+ this.onLoad1(this.page1); //第二个表格不会自动执行
+ }
+ // this.$message.success(JSON.stringify(column));
+ },
+ //派遣服务公司登记
+ // sizeChange(val) {
+ // this.page1.currentPage = 1;
+ // this.page1.pageSize = val;
+ // // this.getData();
+ // this.onLoad(this.page, this.query);
+ // // this.$message.success("行数" + val);
+ // },
+ // currentChange(val) {
+ // this.page1.currentPage = val;
+ // // this.getData();
+ // this.onLoad(this.page, this.query);
+ // // this.$message.success("页码" + val);
+ // },
+ // rowSave(form, done, loading) {
+ // var that = this;
+ // var form = this.data[0];
+ // delete form.id;
+ // for (var k = 0; k < 13; k++) {
+ // adddata(form).then(
+ // (res) => {
+ // this.onLoad(this.page);
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // });
+ // done();
+ // },
+ // (error) => {
+ // window.console.log(error);
+ // loading();
+ // }
+ // );
+ // }
+ // },
+ // searchChange(params, done) {
+ // this.query = params;
+ // this.page.currentPage = 1;
+ // this.onLoad(this.page, params);
+ // done();
+ // },
+ // searchReset() {
+ // this.query = {};
+ // this.onLoad(this.page);
+ // },
+ // rowUpdate(row, index, done, loading) {
+ // console.log(row);
+ // update(row).then(
+ // () => {
+ // this.onLoad(this.page);
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // });
+ // done();
+ // },
+ // (error) => {
+ // window.console.log(error);
+ // loading();
+ // }
+ // );
+ // },
+ // rowDel(row) {
+ // this.$confirm("确定将选择数据删除?", {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning",
+ // })
+ // .then(() => {
+ // return remove(row.id);
+ // })
+ // .then(() => {
+ // this.onLoad(this.page);
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // });
+ // });
+ // },
+ // selectionChange(list) {
+ // this.selectionList = list;
+ // },
+ // handleDelete() {
+ // if (this.selectionList.length === 0) {
+ // this.$message.warning("请选择至少一条数据");
+ // return;
+ // }
+ // this.$confirm("确定将选择数据删除?", {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning",
+ // })
+ // .then(() => {
+ // return remove(this.ids);
+ // })
+ // .then(() => {
+ // this.onLoad(this.page);
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // });
+ // this.$refs.crudrec.toggleSelection();
+ // });
+ // },
+ // refreshChange() {
+ // this.onLoad(this.page, this.query);
+ // },
+ // onLoad(page, params = {}) {
+ // this.loading = true;
+ // getdata(
+ // page.currentPage,
+ // page.pageSize,
+ // Object.assign(params, this.query)
+ // ).then((res) => {
+ // // console.log(res);
+ // const data = res.data.data;
+ // this.page.total = data.total;
+ // this.data = data.records;
+ // console.log(this.data);
+ // this.loading = false;
+ // });
+ // },
+ //派遣服务公司登记
+
+ //派遣记录
+ sizeChange1(val) {
+ this.page1.currentPage = 1;
+ this.page1.pageSize = val;
+ // this.getData();
+ this.onLoad1(this.page1, this.query1);
+ // this.$message.success("行数" + val);
+ },
+ currentChange1(val) {
+ this.page1.currentPage = val;
+ // this.getData();
+ this.onLoad1(this.page1, this.query1);
+ // this.$message.success("页码" + val);
+ },
+ rowSave1(form, done, loading) {
+ // var that = this;
+ // var form = this.data1[0];
+ // delete form.id;
+ // for (var k = 0; k < 13; k++) {
+ // form["deptId"] = form.tenantName;
+ // form["tenantName"] = form.$tenantName;
+ // form["dispatcherUnitId"] = this.id;
+ // console.log(form);
+
+ adddata1(form).then(
+ (res) => {
+ this.onLoad1(this.page1);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ // }
+ },
+ searchChange1(params, done) {
+ this.query1 = params;
+ this.page1.currentPage = 1;
+ this.onLoad1(this.page1, params);
+ done();
+ },
+ searchReset1() {
+ this.query = {};
+ this.onLoad1(this.page1);
+ },
+ rowUpdate1(row, index, done, loading) {
+ // row["deptId"] = row.tenantName;
+ // row["tenantName"] = row.$tenantName;
+ // row["dispatcherUnitId"] = this.id;
+ // console.log(row, "row");
+ update1(row).then(
+ () => {
+ this.onLoad1(this.page1);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowDel1(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove1(row.id);
+ })
+ .then(() => {
+ this.onLoad1(this.page1);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ selectionChange1(list) {
+ this.selectionList1 = list;
+ // console.log(this.selectionList1.length);
+ },
+ handleDelete1() {
+ console.log(this.selectionList1);
+ if (this.selectionList1.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove1(this.ids1);
+ })
+ .then(() => {
+ this.onLoad1(this.page1);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crudrec1.toggleSelection();
+ });
+ },
+ refreshChange1() {
+ // console.log(4534)
+ this.onLoad1(this.page1, this.query1);
+ },
+
+ //
+ onLoad1(page, params = {}) {
+ this.loading1 = true;
+ // params["cardid"] = this.cardid;
+ // params["name"] = this.name;
+ // params["dispatcherCompany"] = this.dispatcherCompany;
+ // params["dispatcherUnitId"] = this.id;
+ // console.log(params, "get");
+ // console.log(page);
+ getdata1(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ // console.log(res);
+ const data = res.data.data;
+ this.page1.total = data.total;
+ this.data1 = data.records;
+ console.log(this.data1, 1);
+ this.loading1 = false;
+ });
+ },
+ //派遣记录
+ // saveLock(name, val) {
+ // localStorage.setItem(name, val);
+ // },
+ // readLock(name) {
+ // return localStorage.getItem(name);
+ // },
+ },
+ mounted() {
+ this.onLoad1(this.page1, this.query1);
+ //去掉缓存
+ // this.typeTABS = this.optionTABS.column[0];
+ // var row = {};
+ // if (this.readLock("paqiandata") != null) {
+ // row = JSON.parse(this.readLock("paqiandata"));
+ // this.obj0.name = row.name;
+ // for (var k in row) {
+ // this.obj0[k] = row[k];
+ // }
+ // console.log(this.obj0, 11111111);
+ // this.id = row.id;
+ // if (this.readLock("paqiandataS") != null) {
+ // var b = JSON.parse(this.readLock("paqiandataS"));
+ // var i = 0;
+ // for (var k in b) {
+ // if (b[k].name == row.name) {
+ // i = 1;
+ // }
+ // }
+ // if (i == 1) {
+ // // console.log("存在");
+ // } else {
+ // // console.log("已删除");
+ // this.obj0 = {};
+ // this.obj0.name = row.name + " 该派遣单位已删除";
+ // window.localStorage.removeItem("paqiandata");
+ // this.id = 1244241;
+ // }
+ // }
+ // } else {
+ // // console.log("no");
+ // this.obj0.name = " 未选择派遣单位";
+ // }
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.dispatch {
+ width: 100%;
+ height: 100%;
+ // border: 1px solid #000;
+ box-sizing: border-box;
+}
+.el-collapse-item {
+ padding-top: 15px !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dispatchChild/index.vue b/src/views/dispatchChild/index.vue
index ce20d84..c88631c 100644
--- a/src/views/dispatchChild/index.vue
+++ b/src/views/dispatchChild/index.vue
@@ -506,7 +506,7 @@
// border: 1px solid #000;
box-sizing: border-box;
}
-.el-collapse-item{
+.el-collapse-item {
padding-top: 15px !important;
}
</style>
\ No newline at end of file
diff --git a/src/views/equipments/data.js b/src/views/equipments/data.js
index 41e25bc..cce2a78 100644
--- a/src/views/equipments/data.js
+++ b/src/views/equipments/data.js
@@ -58,7 +58,7 @@
// search: true,
},
{
- label: "组织机构",
+ label: "保安公司",
prop: "tenantName",
rules: [{
required: true,
diff --git a/src/views/gun/data.js b/src/views/gun/data.js
index 838266a..ab9b0c1 100644
--- a/src/views/gun/data.js
+++ b/src/views/gun/data.js
@@ -61,7 +61,7 @@
search: true,
},
{
- label: "组织机构",
+ label: "保安公司",
prop: "tenantName",
rules: [{
required: true,
diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index 704c0fc..73a1189 100644
--- a/src/views/trainingRegistration/data.js
+++ b/src/views/trainingRegistration/data.js
@@ -1,18 +1,18 @@
var DIC = [
{
- label: '招聘中',
+ label: '男',
value: 1,
}, {
- label: '停止招聘',
+ label: '女',
value: 2,
}
]
var DIC1 = [
{
- label: '拥有',
+ label: '是',
value: 1,
}, {
- label: '未拥有',
+ label: '否',
value: 2,
}
]
@@ -20,49 +20,72 @@
var w = 160
, s = 12;
export var column = [
+ // {
+ // label: "id",
+ // prop: "id",
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false
+ // },
+ // {
+ // label: "保安单位",
+ // prop: "tenantName",
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false
+ // },
+ // {
+ // label: "保安id",
+ // prop: "deptId",
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false,
+ // value: JSON.parse(window.localStorage.getItem("saber-userInfo")).content.dept_id
+ // },//上面不显示
{
- label: "id",
- prop: "id",
- hide: true,
- editDisplay: false,
- addDisplay: false
- },
- {
- label: "保安单位",
- prop: "tenantName",
- hide: true,
- editDisplay: false,
- addDisplay: false
- },
- {
- label: "保安id",
- prop: "deptId",
- hide: true,
- editDisplay: false,
- addDisplay: false,
- value: JSON.parse(window.localStorage.getItem("saber-userInfo")).content.dept_id
- },//上面不显示
- {
- label: "招聘岗位",
+ label: "姓名",
prop: "name",
+ rules: [{
+ required: true,
+ message: "请输入姓名",
+ trigger: "blur"
+ }],
+ search: true,
+ searchSpan: 5,
+ },
+ {
+ label: "性别",
+ prop: "sex",
+ rules: [{
+ required: true,
+ message: "请输入性别",
+ trigger: "blur"
+ }],
+ width: 50,
+ dicData: DIC,
+ props: {
+ label: "label",
+ value: "value"
+ },
+ // width: 70,
// search: true,
},
{
- label: "招聘人数",
- prop: "number",
- width: 70,
- // search: true,
- },
- {
- label: "保安证",
- prop: "permit",
+ label: "年龄",
+ prop: "age",
+ rules: [{
+ required: true,
+ message: "请输入年龄",
+ trigger: "blur"
+ }],
+ width: 50,
// addDisplay: true,
// editDisplay: true,
// viewDisplay: true,
- filter: false,
- type: 'tree',
- dicData: DIC1,
- searchSpan: 5,
+ // filter: false,
+ // type: 'tree',
+ // dicData: DIC1,
+ // searchSpan: 5,
// dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
// props: {
// label: "dictValue",
@@ -72,19 +95,25 @@
// type: "select",
},
{
- label: "学历要求",
- prop: "education",
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- searchSpan: 5,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- search: true,
- type: "select",
+ label: "身高",
+ prop: "height",
+ width: 50,
+ rules: [{
+ required: true,
+ message: "请输入身高",
+ trigger: "blur"
+ }]
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ // searchSpan: 5,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // search: true,
+ // type: "select",
// rules: [{
// required: true,
// message: "请选择学历",
@@ -92,19 +121,25 @@
// }],
},
{
- label: "工作经验",
- prop: "experience",
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- searchSpan: 5,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=experienceType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- search: true,
- type: "select",
+ label: "体重",
+ prop: "weight",
+ width: 50,
+ rules: [{
+ required: true,
+ message: "请输入体重",
+ trigger: "blur"
+ }]
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ // searchSpan: 5,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=experienceType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // search: true,
+ // type: "select",
// rules: [{
// required: true,
// message: "请选择工作经验",
@@ -112,48 +147,86 @@
// }],
},
{
- label: "工作任务",
- prop: "workDesc",
- // search: true,
+ label: "电话",
+ prop: "phone",
+ rules: [{
+ required: true,
+ message: "请输入电话",
+ trigger: "blur"
+ }],
width: 110,
- overHidden: true
- },
- {
- label: "福利",
- prop: "welfare",
// search: true,
- searchSpan: 4,
- overHidden: true
+ // width: 110,
+ // overHidden: true
},
{
- label: "最低薪资",
- prop: "minSalary",
- width: 70,
+ label: "身份证号",
+ prop: "idCardNo",
+ rules: [{
+ required: true,
+ message: "请输入身份证号",
+ trigger: "blur"
+ }],
+ width: 160
// search: true,
- searchSpan: 4,
+ // searchSpan: 4,
+ // overHidden: true
},
{
- label: "最高薪资",
- prop: "maxSalary",
- width: 70,
- search: true,
- searchSpan: 4,
+ label: "学历证书",
+ prop: "academicUrl",
+ rules: [{
+ required: true,
+ message: "请输入学历证书",
+ trigger: "blur"
+ }],
+ overHidden:true
+ // width: 70,
+ // search: true,
+ // searchSpan: 4,
},
{
- label: "单位性质",
- prop: "unitsNature",
- width: 70,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- searchSpan: 4,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsNatureType",
+ label: "组织机构",
+ prop: "deptId",
+ // width: 70,
+ // search: true,
+ // searchSpan: 4,
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "title",
+ value: "id"
},
// search: true,
type: "select",
+ rules: [{
+ required: true,
+ message: "请输入组织机构",
+ trigger: "blur"
+ }],
+ overHidden:true
+ },
+ {
+ label: "培训公司名称",
+ prop: "trainingUnitName",
+ rules: [{
+ required: true,
+ message: "请输入培训公司名称",
+ trigger: "blur"
+ }],
+ // width: 70,
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ searchSpan: 5,
+ searchLabelWidth: 110,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsNatureType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ search: true,
+ overHidden:true
+ // type: "select",
// rules: [{
// required: false,
// message: "请选择单位规模",
@@ -161,76 +234,51 @@
// }],
},
{
- label: "单位规模",
- prop: "unitsScale",
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- searchSpan: 4,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsScaleType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- // search: true,
- type: "select",
- // rules: [{
- // required: true,
- // message: "请选择单位规模",
- // trigger: "blur"
- // }],
- },
- {
- label: "联系人",
- prop: "linkman",
- // search: true,
- },
- {
- label: "联系人电话",
- prop: "phone",
- // search: true,
- width: 110,
- },
- {
- label: "详细地址",
- prop: "address",
- width: 110,
- // search: true,
- overHidden: true
- },
- {
- label: "开始时间",
- prop: "startTime",
- // search: true,
+ label: "培训时间",
+ prop: "trainingTime",
type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd",
valueFormat: "timestamp",
- width: 88,
- },
-
- {
- label: "结束时间",
- prop: "endTime",
- // search: true,
- type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
- width: 88,
- },
- {
- label: "招聘状态",
- // prop: "status",
- // search: true,
+ rules: [{
+ required: true,
+ message: "请输入培训时间",
+ trigger: "blur"
+ }],
+ width: 100,
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
// searchSpan: 4,
- width: 70,
- prop: 'status',
- filter: false,
- type: 'tree',
- dicData: DIC,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsScaleType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // // search: true,
+ // type: "select",
// rules: [{
// required: true,
// message: "请选择单位规模",
// trigger: "blur"
// }],
},
+ {
+ label: "是否报名",
+ prop: "cancel",
+ search: true,
+ dicData: DIC1,
+ props: {
+ label: "label",
+ value: "value"
+ },
+ // rules: [{
+ // required: true,
+ // message: "请选",
+ // trigger: "blur"
+ // }]
+ editDisplay: false,
+ addDisplay: false,
+ searchSpan: 5,
+ width: 70,
+ }
]
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index 3206f12..35387c0 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -25,6 +25,15 @@
>删 除
</el-button>
</template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="el-icon-refresh-right"
+ @click="revoke(row)"
+ :size="size"
+ :type="type"
+ >撤销报名</el-button
+ >
+ </template>
</avue-crud>
</div>
</template>
@@ -56,10 +65,11 @@
searchSize: "mini",
searchMenuSpan: 6,
height: 627,
- menuWidth: 160,
+ menuWidth: 290,
align: "center",
selection: true,
column: column,
+ delBtn: false
},
};
},
@@ -116,7 +126,8 @@
this.onLoad(this.page);
},
rowUpdate(row, index, done, loading) {
- console.log(row);
+ // console.log(row);
+
update(row).then(
() => {
this.onLoad(this.page);
@@ -132,6 +143,24 @@
}
);
},
+ revoke(row) {
+ // console.log(row);
+ row.cancel = 2;
+ update(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "成功撤销报名!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
--
Gitblit v1.9.3