From 9c5b84b9e4c53da38fdbce66fa1402b9de5af107 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 1 Nov 2022 14:44:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?visit=20=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vm/visit.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/vm/visit.vue b/src/views/vm/visit.vue
index 826ee12e..4f7fbbbc 100644
--- a/src/views/vm/visit.vue
+++ b/src/views/vm/visit.vue
@@ -65,15 +65,21 @@
           width="50"
         ></el-table-column>
 
-        <el-table-column label="来访事由" prop="state" width="100" fixed="left">
+        <el-table-column label="来访事由" prop="state" width="80" fixed="left">
           <template #default="scope">{{
             purpose_[scope.row.purpose]
           }}</template>
         </el-table-column>
+        <el-table-column
+          label="来访概述"
+          prop="name"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
         <el-table-column
           label="访问级别"
           prop="level"
-          min-width="100"
+          min-width="80"
           fixed="left"
         >
           <template #default="scope">
@@ -87,7 +93,7 @@
           min-width="180"
           fixed="left"
         ></el-table-column>
-        <el-table-column label="项目状态" prop="state" min-width="180">
+        <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">
@@ -128,12 +134,12 @@
         <el-table-column
           label="来访时间"
           prop="visit_time"
-          width="180"
+          width="160"
         ></el-table-column>
         <el-table-column
           label="离开时间"
           prop="leave_time"
-          width="180"
+          width="160"
         ></el-table-column>
         <el-table-column
           label="来访人数"

From 8427ea66f163aedb1cc1d584ef421f842343e388 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 1 Nov 2022 16:27:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=B8=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js            |  11 +
 src/views/opm/clear.vue        |   2 +-
 src/views/opm/cooler.vue       |   2 +-
 src/views/opm/fire.vue         |   2 +-
 src/views/opm/high.vue         |   2 +-
 src/views/opm/hoisting.vue     |   2 +-
 src/views/opm/normal.vue       | 689 +++++++++++++++++++++++++++++++++
 src/views/opm/oplcate.vue      |  11 +-
 src/views/opm/oplcate_form.vue |  10 +-
 src/views/opm/preheat.vue      |   2 +-
 src/views/opm/soil.vue         |   2 +-
 src/views/opm/space.vue        |   2 +-
 src/views/opm/usecl.vue        |   3 +-
 13 files changed, 722 insertions(+), 18 deletions(-)
 create mode 100644 src/views/opm/normal.vue

diff --git a/src/config/route.js b/src/config/route.js
index d10ee03f..623b2783 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -285,6 +285,17 @@ const routes = [
           "perms": ["operation"]
         },
         "component": "opm/usecl"
+      },
+      {
+        "name": "normal",
+        "path": "/opm/normal",
+        "meta": {
+          "title": "普通作业许可证",
+          "icon": "el-icon-menu",
+          "hidden": true,
+          "perms": ["operation"]
+        },
+        "component": "opm/normal"
       }
     ]
   },
diff --git a/src/views/opm/clear.vue b/src/views/opm/clear.vue
index 7750da4f..a257e686 100644
--- a/src/views/opm/clear.vue
+++ b/src/views/opm/clear.vue
@@ -662,7 +662,7 @@
 			},
 			//作业部门
 			getDept() {
-				this.$API.system.dept.list.req({page: 0}).then((res) => {
+				this.$API.system.dept.list.req({page: 0, type__in:'dept,rparty'}).then((res) => {
 					this.deptoptions = genTree(res);
 				});
 			},
diff --git a/src/views/opm/cooler.vue b/src/views/opm/cooler.vue
index 58ac26f3..8005a0a9 100644
--- a/src/views/opm/cooler.vue
+++ b/src/views/opm/cooler.vue
@@ -660,7 +660,7 @@
 			},
 			//作业部门
 			getDept() {
-				this.$API.system.dept.list.req({page: 0}).then((res) => {
+				this.$API.system.dept.list.req({page: 0, type__in:'dept,rparty'}).then((res) => {
 					this.deptoptions = genTree(res);
 				});
 			},
diff --git a/src/views/opm/fire.vue b/src/views/opm/fire.vue
index a2970eb3..6e6e48d2 100644
--- a/src/views/opm/fire.vue
+++ b/src/views/opm/fire.vue
@@ -673,7 +673,7 @@
 			},
 			//作业部门
 			getDept() {
-				this.$API.system.dept.list.req({page: 0}).then((res) => {
+				this.$API.system.dept.list.req({page: 0, type__in:'dept,rparty'}).then((res) => {
 					this.deptoptions = genTree(res);
 				});
 			},
diff --git a/src/views/opm/high.vue b/src/views/opm/high.vue
index 96fd0f69..14d8abc5 100644
--- a/src/views/opm/high.vue
+++ b/src/views/opm/high.vue
@@ -499,7 +499,7 @@
 			},
 			//作业部门
 			getDept() {
-				this.$API.system.dept.list.req({page: 0}).then((res) => {
+				this.$API.system.dept.list.req({page: 0, type__in:'dept,rparty'}).then((res) => {
 					this.deptoptions = genTree(res);
 				});
 			},
diff --git a/src/views/opm/hoisting.vue b/src/views/opm/hoisting.vue
index 567fa6d4..86324a90 100644
--- a/src/views/opm/hoisting.vue
+++ b/src/views/opm/hoisting.vue
@@ -498,7 +498,7 @@
 			},
 			//作业部门
 			getDept() {
-				this.$API.system.dept.list.req({page: 0}).then((res) => {
+				this.$API.system.dept.list.req({page: 0, type__in:'dept,rparty'}).then((res) => {
 					this.deptoptions = genTree(res);
 				});
 			},
diff --git a/src/views/opm/normal.vue b/src/views/opm/normal.vue
new file mode 100644
index 00000000..4a71ff1c
--- /dev/null
+++ b/src/views/opm/normal.vue
@@ -0,0 +1,689 @@
+<template>
+	<el-container>
+		<el-header>
+			<el-steps
+				:active="active"
+				style="width: 100%"
+				:align-center="true"
+				finish-status="success"
+			>
+				<el-step
+					v-for="(item, index) of stepTitle"
+					:key="index"
+					:title="item"
+					style="50%"
+					@click="handleStep(index)"
+				>
+				</el-step>
+			</el-steps>
+		</el-header>
+		<!--基本信息!-->
+		<el-main class="nopadding" v-show="active === 0">
+			<el-form
+				v-show="active === 0"
+				ref="dialogForm"
+				:model="form"
+				:rules="rules"
+				label-width="110px"
+				style="margin: 40px 40px 0px 40px"
+			>
+				<el-row>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="关联作业">
+							<el-input
+								v-model="form.name"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业许可种类">
+							<el-input
+								v-model="pagtitle"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业开始时间" prop="start_time">
+							<el-date-picker
+								v-model="form.start_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业结束时间" prop="end_time">
+							<el-date-picker
+								v-model="form.end_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24" >
+						<el-form-item label="作业部门" prop="dept_do">
+							<el-cascader
+								placeholder="选择作业部门"
+								getCheckedNodes="true"
+								v-model="form.dept_do"
+								:options="deptoptions"
+								:props="{
+                  expandTrigger: 'hover', // 次级菜单的展开方式
+                  label: 'label', //
+                  value: 'value', //
+                  emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+				  checkStrictly: true
+                }"
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业负责人" prop="charger">
+							<el-input
+								v-model="form.charger_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<!-- <el-select v-model="form.charger_name" placeholder="选择作业负责人">
+								<el-option
+									v-for="item in useroptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								/>
+							</el-select> -->
+							<ehsUserSelect :multiple="false" @submit="getCharger"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业监护人" prop="monitor">
+							<el-input
+								v-model="form.monitor_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getMonitor"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="风险选择" prop="risks_checked">
+							<el-checkbox-group v-model="form.risks_checked">
+								<el-checkbox
+									v-for="(item, index) in risklist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="其他风险">
+							<el-input
+								v-model="form.other_risk"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="措施选择" prop="measures_checked">
+							<el-checkbox-group v-model="form.measures_checked">
+								<el-checkbox
+									v-for="(item, index) in measurelist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
+							>下一步
+							</el-button>
+			</div>
+		</el-main>
+
+		<!--作业人员!-->
+		<el-main class="nopadding" v-show="active === 1">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addworker"
+				></el-button>
+			</div>
+			<scTable
+				ref="workerTable"
+				:data="apiworkerObj"
+				row-key="id"
+				hidePagination
+				stripe
+				hideDo
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column label="姓名" prop="name" width="150">
+					<template #default="scope">
+						{{ scope.row.worker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="工作职责" prop="duty" width="150">
+				</el-table-column>
+				<el-table-column label="证书" prop="certificates" width="150">
+					<template #default="scope">
+						<el-tag v-for="item in scope.row.certificates_"
+								:key="item.number"
+								:label="item.name"
+								:value="item.number">{{item.name}}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="创建时间"
+					prop="create_time"
+					width="150"
+				></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
+
+						<el-popconfirm
+							title="确定删除该作业人员吗？"
+							@confirm="delWorker(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="workerdialog" draggable title="选择作业人员">
+				<el-form
+					ref="workerForm"
+					:model="formworker"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="作业人员">
+								<el-input
+								v-model="formworker.worker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getWorker"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="工作职责">
+								<el-select
+									v-model="formworker.duty"
+									filterable
+									allow-create
+									default-first-option
+									:reserve-keyword="false"
+								>
+									<el-option
+										v-for="item in dutyOptions"
+										:key="item.value"
+										:label="item.label"
+										:value="item.label"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="证书">
+								<el-select
+									v-model="formworker.certificates"
+									multiple
+									placeholder="选择证书"
+								>
+									<el-option
+										v-for="item in certificatesOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialogcart = false">取 消</el-button>
+					<el-button type="primary" @click="submitWorker">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+				<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
+			<el-button
+				:loading="tLoading"
+				v-for=" item in initForm.transitions"
+				:key="item.id"
+				type="primary"
+				@click="submitTicketCreate(item.id)"
+				style="margin-right:4px"
+			>{{item.name}}
+			</el-button>
+			<el-button @click="submitOut" type="warning">退出</el-button>
+
+			</div>
+		</el-main>
+	</el-container>
+</template>
+<style scoped>
+	.clearfix {
+		font-size: 20px;
+	}
+
+	.box-card p {
+		line-height: 20px;
+	}
+
+	.content {
+		margin-top: 10px;
+	}
+
+	.stepSuc:hover {
+		cursor: pointer;
+	}
+
+	.stepErr:hover {
+		cursor: not-allowed;
+	}
+</style>
+<script>
+	import {genTree} from "@/utils/verificate";
+
+	const defaultformworker = {
+		id: "",
+		worker: null,
+		duty: "作业人员",
+		certificates: [],
+		opl: "",
+	};
+	const defaultformgas = {
+  id: "",
+  check_time: null,
+  opl:""
+};
+	export default {
+		name: "fire",
+		components: {},
+		data() {
+			return {
+				active: 0,
+				stepSuc: [0],
+				stepTitle: ["基本信息", "作业人员"],
+				query: {},
+				selection: [],
+				issave: false, //控制基本信息提交
+				search: {
+					keyword: null,
+				},
+				form: {
+					id: "",
+					start_time: null,
+					end_time: null,
+					operation: "",
+					cate: "",
+					risks_checked: [],
+				},
+				initForm: {},
+				operationId: "",
+				oplcateId: "",
+				oplcateCode: "",
+				oplId: "",
+				leveloptions: [
+        { id: "主干道", name: "主干道" },
+         { id: "次干渠", name: "次干渠" }
+      ],
+				deptoptions: [],
+				useroptions: [],
+				risklist: [],
+				measurelist: [],
+				pagtitle: "",
+				dutyOptions: [
+					{value: 10, label: "作业人员"},
+					{value: 20, label: "起重司机"},
+					{value: 30, label: "司索人员"},
+					{value: 40, label: "起重指挥"},
+					{value: 40, label: "电工"},
+				],
+				certificatesOptions: [],
+				formworker: defaultformworker,
+				apiworkerObj: [],
+				workerdialog: false,
+				gasdialog: false,
+				formgas: defaultformgas,
+				apigasObj: [],
+				is_ok_: {
+					true: "正常",
+					false: "不正常",
+				},
+				tLoading: false,
+				rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
+			};
+		},
+		mounted() {
+			this.operationId = this.$route.query.operationid; //作业ID
+			this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
+			this.oplId = this.$route.query.oplId; //许可证ID
+			this.getoplData();
+			this.getInit();
+			this.getDept();
+			// this.getUser();
+		},
+		methods: {
+			getCharger(data) {
+				this.form.charger=data.id;
+      			this.form.charger_name=data.name
+			},
+			getChecker(data){
+				this.formgas.checker=data.id;
+      			this.formgas.checker_name=data.name
+			},
+			getMonitor(data) {
+				this.form.monitor=data.id;
+				this.form.monitor_name=data.name
+			},
+			getWorker(data) {
+				this.formworker.worker=data.id,
+				this.formworker.worker_name=data.name
+				this.selectWorker()
+			},
+			getoplData() {
+				if (this.oplId == "") {
+					this.getOperation();
+					this.getOplcates();
+				} else {
+					this.getData();
+				}
+			},
+			//根据oplId，查许可证
+			getData() {
+				this.$API.opm.opl.read.req(this.oplId).then((res) => {
+					this.form = res;
+					this.oplId = res.id;
+					this.oplcateId = res.cate;
+					this.operationId = res.operation;
+					this.getOperation();
+					this.getOplcates();
+				});
+			},
+			//根据operationId，查作业信息
+
+			getOperation() {
+				this.$API.opm.operation.read.req(this.operationId).then((res) => {
+					this.form.start_time = res.start_time; //作业开始时间
+					this.form.end_time = res.end_time; //作业结束时间
+					this.form.name = res.name; //作业结束时间
+
+					console.log(res);
+				});
+			},
+			//作业部门
+			getDept() {
+				this.$API.system.dept.list.req({page: 0, type__in:'dept,rparty'}).then((res) => {
+					this.deptoptions = genTree(res);
+				});
+			},
+
+			//作业负责人、作业监护人
+			//作业
+
+			//根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情
+			getOplcates() {
+				this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
+					console.log(res); //
+					this.pagtitle = res.name;
+					this.oplcateCode = res.code;
+					this.risklist = res.risk_options_; //风险缝隙
+					this.measurelist = res.measure_options_; //控制措施
+				});
+			},
+			handleStep(val) {
+				//点击步骤条
+				if (this.stepSuc.includes(val) === true) {
+					this.active = val;
+				}
+			},
+			//组件点击上一步
+			handleLastStep() {
+				if (--this.active === 0) {
+					this.active = 0;
+				}
+			},
+			//组件点击下一步
+			handleNextStep() {
+
+				if (this.active == 0) {
+					this.$refs.dialogForm.validate((valid) => {
+					if (valid) {
+											//如果是创建许可证书
+					if (this.oplId == "") {
+						//基本信息提交
+						debugger;
+						this.form.cate = this.oplcateId;
+						this.form.operation = this.operationId;
+						console.log(this.form);
+						this.$API.opm.opl.create
+							.req(this.form)
+							.then((res) => {
+								this.$emit("success", this.form);
+								this.$message.success("创建成功");
+								this.issave = true;
+								this.active = 1;
+
+								this.oplId = res.id;
+								this.getworkerList();
+								this.getgasList();
+								return res;
+							})
+							.catch((err) => {
+								return err;
+							});
+					} else if (this.oplId != "") {
+
+						this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
+							this.$message.success("基本修改成功！");
+							this.issave = true;
+							this.active = 1;
+							this.getgasList();
+							this.getworkerList();
+
+						});
+					} else {
+						this.active = 1;
+					}
+					}
+				})
+				} 
+				// this.stepSuc.push(++this.active)
+			},
+
+			//选择人员后，调出该人员的所有证书
+			selectWorker() {
+				this.$API.hrm.certificate.list
+					.req({employee__user: this.formworker.worker, page: 0})
+					.then((res) => {
+						this.certificatesOptions = res;
+						console.log(res);
+					});
+			},
+			//作业人员列表
+
+			getworkerList() {
+				this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apiworkerObj = res;
+					console.log(res);
+				});
+			},
+			//创建作业人员，显示Form
+			addworker() {
+				this.workerdialog = true;
+
+				this.formworker = Object.assign({}, defaultformworker);
+			},
+
+			//删除作业人员
+			delWorker(row) {
+				this.$API.opm.worker.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("作业人员删除成功");
+						this.getworkerList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+			//提交作业人员信息
+			submitWorker() {
+				this.formworker.opl = this.oplId;
+				this.$refs.workerForm.validate(async (valid) => {
+
+					this.$API.opm.worker.create
+						.req(this.formworker)
+						.then((res) => {
+							this.$message.success("创建作业人员成功");
+							this.getworkerList();
+							this.workerdialog = false;
+						})
+						.catch((err) => {
+							return err;
+						});
+				});
+			},
+
+			//气体检测记录列表
+			getgasList() {
+				this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apigasObj = res;
+					console.log(res);
+				});
+			},
+
+			//创建气体检测记录，显示Form
+			addgas() {
+				this.gasdialog = true;
+				this.formgas = Object.assign({}, defaultformgas);
+			},
+
+			//提交气体检测记录
+			submitgas() {
+				this.formgas.opl = this.oplId;
+				this.$refs.gasForm.validate(async (valid) => {
+
+					this.$API.opm.gas.create
+						.req(this.formgas)
+						.then((res) => {
+							this.$message.success("创建气体检测记录成功");
+							this.getgasList();
+							this.gasdialog = false;
+
+						})
+						.catch((err) => {
+							return err;
+						});
+
+				});
+			},
+
+			//删除气体检测记录
+			delgas(row) {
+				this.$API.opm.gas.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("气体检测记录删除成功");
+						this.getgasList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+
+			//渲染工单提交按钮
+			getInit() {
+				this.$API.wf.workflow.initkey.req('opl_normal').then((res) => {
+					this.initForm = res;
+				});
+			},
+
+			//提交,创建工单
+			submitTicketCreate(id) {
+				if(this.apiworkerObj.length==0){
+							this.$message.warning("请添加作业人员");
+							return
+						}
+				let ticket = {};
+				ticket.workflow = this.initForm.workflow;
+				ticket.ticket_data = {opl: this.oplId};
+				ticket.transition = id;
+				ticket.title = this.form.name + '-申请';
+				this.tLoading = true
+				this.$API.wf.ticket.create.req(ticket).then((res) => {
+					this.tLoading = false
+					this.$message.success("提交成功");
+					this.submitOut()
+				}).catch(e=>{this.tLoading=false});
+			},
+
+			//退出界面
+			submitOut() {
+				this.$router.push({
+					name: "opl",
+					query: {
+						id: this.operationId,//作业ID
+
+					},
+				});
+			}
+		},
+	};
+</script>
diff --git a/src/views/opm/oplcate.vue b/src/views/opm/oplcate.vue
index 965520ac..6f21cde9 100644
--- a/src/views/opm/oplcate.vue
+++ b/src/views/opm/oplcate.vue
@@ -20,14 +20,13 @@
 				<el-table-column label="标识" prop="code" width="180">
 
 				</el-table-column>
-                
+                <el-table-column label="排序" prop="sort" width="180">
+
+				</el-table-column>
 				<el-table-column label="操作" fixed="right" align="right" width="170">
 					<template #default="scope">
-						<el-button-group>
-							<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
-							<el-button text type="warning" size="small" @click="table_edit(scope.row, scope.$index)" v-auth="'opl_cate.update'">编辑</el-button>
-							
-						</el-button-group>
+							<el-button link type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
+							<el-button link type="warning" size="small" @click="table_edit(scope.row, scope.$index)" v-auth="'opl_cate.update'">编辑</el-button>
 					</template>
 				</el-table-column>
 
diff --git a/src/views/opm/oplcate_form.vue b/src/views/opm/oplcate_form.vue
index 10d5f3c2..b2f02b4b 100644
--- a/src/views/opm/oplcate_form.vue
+++ b/src/views/opm/oplcate_form.vue
@@ -26,8 +26,12 @@
                 <el-input v-model="form.name" type="text" clearable></el-input>
               </el-form-item>
             </el-col>
-
             <el-col :md="8" :sm="12" :xs="24">
+              <el-form-item label="排序">
+                <el-input-number v-model="form.sort" :min="1"/>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :md="8" :sm="12" :xs="24">
               <el-form-item label="工作流">
                 <el-select v-model="form.workflow">
                   <el-option
@@ -38,7 +42,7 @@
                   />
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :md="24" :sm="12" :xs="24">
               <el-form-item label="风险分析">
                 <el-transfer
@@ -124,7 +128,7 @@ export default {
     };
   },
   mounted() {
-    this.getWorkflow();
+    // this.getWorkflow();
     this.getRisk();
     this.getMeasure();
     this.getClose();
diff --git a/src/views/opm/preheat.vue b/src/views/opm/preheat.vue
index bdcd26eb..27d47eb2 100644
--- a/src/views/opm/preheat.vue
+++ b/src/views/opm/preheat.vue
@@ -501,7 +501,7 @@
 			},
 			//作业部门
 			getDept() {
-				this.$API.system.dept.list.req({page: 0}).then((res) => {
+				this.$API.system.dept.list.req({page: 0, type__in:'dept,rparty'}).then((res) => {
 					this.deptoptions = genTree(res);
 				});
 			},
diff --git a/src/views/opm/soil.vue b/src/views/opm/soil.vue
index 8e27bad2..945acd79 100644
--- a/src/views/opm/soil.vue
+++ b/src/views/opm/soil.vue
@@ -499,7 +499,7 @@
 			},
 			//作业部门
 			getDept() {
-				this.$API.system.dept.list.req({page: 0}).then((res) => {
+				this.$API.system.dept.list.req({page: 0, type__in:'dept,rparty'}).then((res) => {
 					this.deptoptions = genTree(res);
 				});
 			},
diff --git a/src/views/opm/space.vue b/src/views/opm/space.vue
index 17671cc1..3bf50afa 100644
--- a/src/views/opm/space.vue
+++ b/src/views/opm/space.vue
@@ -676,7 +676,7 @@
 			},
 			//作业部门
 			getDept() {
-				this.$API.system.dept.list.req({page: 0}).then((res) => {
+				this.$API.system.dept.list.req({page: 0, type__in:'dept,rparty'}).then((res) => {
 					this.deptoptions = genTree(res);
 				});
 			},
diff --git a/src/views/opm/usecl.vue b/src/views/opm/usecl.vue
index 46739b45..e1b56524 100644
--- a/src/views/opm/usecl.vue
+++ b/src/views/opm/usecl.vue
@@ -78,6 +78,7 @@
                   label: 'label', //
                   value: 'value', //
                   emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+                  checkStrictly: true
                 }"
                 clearable
               />
@@ -571,7 +572,7 @@ export default {
     },
     //作业部门
     getDept() {
-      this.$API.system.dept.list.req({ page: 0 }).then((res) => {
+      this.$API.system.dept.list.req({ page: 0, type__in:'dept,rparty' }).then((res) => {
         this.deptoptions = genTree(res);
       });
     },

From 647a08476e075adfa97f65b10a4864ad3a42282f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Fri, 4 Nov 2022 07:04:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8F=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=BA=BA=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wf/allwork.vue   | 5 +----
 src/views/wf/ccwork.vue    | 5 +----
 src/views/wf/ownerwork.vue | 5 +----
 src/views/wf/worked.vue    | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue
index f8e73526..4f54af06 100644
--- a/src/views/wf/allwork.vue
+++ b/src/views/wf/allwork.vue
@@ -94,10 +94,7 @@
         </el-table-column>
         <el-table-column label="可处理人" :show-overflow-tooltip="true">
            <template #default="scope">
-            <span v-if="scope.row.participant_type==1">
-              {{ scope.row.participant_ .name}}
-            </span>
-            <span v-else-if="scope.row.participant_type==2">
+            <span v-if="scope.row.participant_type==2 || scope.row.participant_type == 1">
               <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
             </span>
             <span v-else>
diff --git a/src/views/wf/ccwork.vue b/src/views/wf/ccwork.vue
index c0cbe350..85edf2e1 100644
--- a/src/views/wf/ccwork.vue
+++ b/src/views/wf/ccwork.vue
@@ -51,10 +51,7 @@
         </el-table-column>
         <el-table-column label="可处理人" :show-overflow-tooltip="true">
                      <template #default="scope">
-            <span v-if="scope.row.participant_type==1">
-              {{ scope.row.participant_ .name}}
-            </span>
-            <span v-else-if="scope.row.participant_type==2">
+            <span v-if="scope.row.participant_type==2 || scope.row.participant_type == 1">
               <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
             </span>
             <span v-else>
diff --git a/src/views/wf/ownerwork.vue b/src/views/wf/ownerwork.vue
index 76a91101..e97a5c92 100644
--- a/src/views/wf/ownerwork.vue
+++ b/src/views/wf/ownerwork.vue
@@ -52,10 +52,7 @@
         </el-table-column>
         <el-table-column label="可处理人" :show-overflow-tooltip="true">
                      <template #default="scope">
-            <span v-if="scope.row.participant_type==1">
-              {{ scope.row.participant_ .name}}
-            </span>
-            <span v-else-if="scope.row.participant_type==2">
+            <span v-if="scope.row.participant_type==2 || scope.row.participant_type == 1">
               <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
             </span>
             <span v-else>
diff --git a/src/views/wf/worked.vue b/src/views/wf/worked.vue
index e42b278b..a4d6c4bf 100644
--- a/src/views/wf/worked.vue
+++ b/src/views/wf/worked.vue
@@ -51,10 +51,7 @@
         </el-table-column>
         <el-table-column label="可处理人" :show-overflow-tooltip="true">
                      <template #default="scope">
-            <span v-if="scope.row.participant_type==1">
-              {{ scope.row.participant_ .name}}
-            </span>
-            <span v-else-if="scope.row.participant_type==2">
+            <span v-if="scope.row.participant_type==2 || scope.row.participant_type == 1">
               <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
             </span>
             <span v-else>

From 349a52b3a7bafb39dda14aa14c476c12f1aab1f5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 4 Nov 2022 09:23:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?user=20=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sys/user.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sys/user.vue b/src/views/sys/user.vue
index e735454d..c49ead04 100644
--- a/src/views/sys/user.vue
+++ b/src/views/sys/user.vue
@@ -130,7 +130,7 @@
                 link
                 size="small"
                 @click="formSetting(scope.row)"
-                v-auth="'user.create'"
+                v-auth="'user.update'"
               >
                 设置
               </el-button>