新增岗位

src/api/basicData/scgw.js

@@ -49,8 +49,8 @@ export function doDeleteRy(query) {
   })
 }
 
-/**
- * in:id,userList
+/** * in:id
+ *
  * @param query
  */
 export function doQueryForImp(query) {
@@ -62,7 +62,8 @@ export function doQueryForImp(query) {
 }
 
 /**
- * in:id
+
+ *  in:id,userList
  * @param query
  */
 export function doImp(query) {
@@ -72,9 +73,3 @@ export function doImp(query) {
     data: query||{}
   })
 }
-
-aqgl/jcsj/scgwry
-
-
-
-

src/views/basicData/scgw/edit.vue

@@ -9,6 +9,14 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+            <el-row :gutter="20">
+                <el-col :span="24">
+                    <el-form-item label="所属部门"  ref="bmid" prop="bmid">
+                       <!-- <el-input :readonly="readonly"  v-model="form.name" ></el-input> -->
+                       <RelSelect style="width: 100%;"  src='kzzx/bm/query' :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
+                    </el-form-item>
+                </el-col>
+            </el-row>
             <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="岗位名称"  ref="name" prop="name">
@@ -55,6 +63,7 @@
 
                 /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
                 form: {
+                  bmid:'',
                         //ID
                         id:'',
                         //编码
@@ -104,5 +113,3 @@
 <style scoped lang="scss">
 
 </style>
-
-

src/views/basicData/scgw/gwrygl.vue

+<template>
+	<DefaultDialog :app='app'>
+
+		<div slot="form">
+       <gwryglAdd :app='this' v-if='showDialog' ></gwryglAdd>
+			<div style="display: flex;width: 100%;margin-bottom: 5px;">
+         <el-button size='mini' @click="addPerson" type="primary">新增人员</el-button>
+			</div>
+			<div style="height: 400px;width: 100%;margin-bottom: 5px;">
+				<!-- <EditTable :app='this'></EditTable> -->
+				<TablePager @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem'
+					:delButton='true' @getRow='getRow'>
+				</TablePager>
+			</div>
+
+		</div>
+		<div slot="reFooter" class="refooter">
+			<span slot="footer" class="dialog-footer" style="position: absolute;right: 10px;top: 12px;">
+				<el-button @click.native="app.showDialog=false">取 消</el-button>
+			</span>
+		</div>
+	</DefaultDialog>
+</template>
+<script>
+	import gwryglAdd from './gwryglAdd'
+	import {
+		doQueryRy,
+    doDeleteRy,
+		doAdd,
+		doUpdate,
+		doDelete
+	} from  '@/api/basicData/scgw.js';
+	import {
+		tableMixin_noapp
+	} from 'common'
+	export default {
+		mixins: [tableMixin_noapp],
+		props: {
+			app: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+         this.queryParams.scgwid=this.app.singleItem.id
+				this.$refs.TablePager.pageQuery()
+			})
+
+			//
+		},
+		methods: {
+      addPerson(){
+        debugger
+        this.DialogWidth = '50vw'
+        this.DialogTitle = '导入岗位人员'
+        this.showDialog = true
+      },
+			query: doQueryRy,
+			/* 基础增*/
+			/* 删除操作*/
+			apiDelete: doDeleteRy,
+			setDefault: function() {
+				if (this.selectOne || this.clickOne) {
+
+				} else {
+					this.$warning('请选中一行操作');
+				}
+
+			},
+			setStyle: function() {
+
+
+			}
+		},
+		components: {
+			gwryglAdd
+		},
+		data() {
+			return {
+        showDialog:false,
+        DialogTitle:'',
+				queryParams: {
+					scgwid: this.app.singleItem.id
+				},
+				baseUrl: 'aqgl/jcsj/scgwry',
+				editTableData: [],
+				tableTitle: [
+     //      {
+					// 	prop: 'userid',
+					// 	label: '用户编码',
+					// 	width: '120'
+					// },
+					{
+						prop: 'userName',
+						label: '姓名',
+						width: '160'
+					},
+					{
+						prop: 'bmName',
+						label: '所属部门',
+						width: '160'
+					},
+					{
+						prop: 'scgwCode',
+						label: '岗位编码',
+						width: '160'
+					},
+					{
+						prop: 'scgwName',
+						label: '岗位',
+						width: '160'
+					}
+				]
+			}
+		}
+
+	}
+</script>

src/views/basicData/scgw/gwryglAdd.vue

+<template>
+	<DefaultDialog :app='app'>
+		<div slot="form">
+			<div style="height: 400px;width: 100%;margin-bottom: 5px;">
+				<!-- <EditTable :app='this'></EditTable> -->
+				<TablePager  @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem'
+					:delButton='false' @getRow='getRow'>
+				</TablePager>
+			</div>
+
+		</div>
+		<div slot="reFooter" class="refooter">
+			<span slot="footer" class="dialog-footer" style="position: absolute;right: 10px;top: 12px;">
+				<el-button @click.native="app.showDialog=false">取 消</el-button>
+        <el-button type="primary" @click.native="drry">导 入</el-button>
+			</span>
+		</div>
+	</DefaultDialog>
+</template>
+<script>
+	// import Edit from './customEdit'
+	import {
+		doQueryForImp,
+    doImp
+	} from  '@/api/basicData/scgw.js';
+	import {
+		tableMixin_noapp
+	} from 'common'
+	export default {
+		mixins: [tableMixin_noapp],
+		props: {
+			app: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+         this.queryParams.id=this.app.queryParams.scgwid
+				this.$refs.TablePager.pageQuery()
+			})
+
+
+		},
+		methods: {
+			query: doQueryForImp,
+			/* 基础增*/
+			/* 删除操作*/
+			drry(){
+      (this.multipleSelection.length==0&&this.$warning('请至少勾选一人'))||(this.multipleSelection.length>0&&doImp({id:this.queryParams.id,userList:this.multipleSelection}).then(res=>{
+       if(res.success){
+         this.$success('导入成功')
+         this.app.$refs.TablePager.pageQuery()
+         this.app.showDialog=false
+       }
+      }))
+      },
+			setStyle: function() {
+
+
+			}
+		},
+		components: {
+			// Edit
+		},
+		data() {
+			return {
+        showDialog:false,
+        DialogTitle:'',
+				queryParams: {
+					scgwid: this.app.singleItem.id
+				},
+				baseUrl: 'aqgl/jcsj/scgwry',
+				editTableData: [],
+				tableTitle: [{
+						prop: 'userid',
+						label: '用户编码',
+						width: '120'
+					},
+					{
+						prop: 'username',
+						label: '姓名',
+						width: '160'
+					},
+					{
+						prop: 'bmmc',
+						label: '所属部门',
+						width: '160'
+					},
+					{
+						prop: 'phone',
+						label: '电话',
+						width: '160'
+					},
+					{
+						prop: 'email',
+						label: '邮箱',
+						width: '160'
+					}
+				]
+			}
+		}
+
+	}
+</script>

src/views/basicData/scgw/index.vue

@@ -2,6 +2,7 @@
 	<div class="min_full">
 		<!-- 查询条件-->
 		<div class="search" v-condition>
+      <Gwrygl :app='this' v-if='showDialog' ></Gwrygl>
 			<SearchButton :app='app'></SearchButton>
 			<el-row :gutter="20" class="search-row-1">
 				<el-col :span="12" class="search-col">
@@ -22,6 +23,7 @@
 			<AttachFileButton  :app='app' ></AttachFileButton>
 			<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton>
+      <el-button size='mini' @click.native="doPerson" type="primary">岗位人员管理</el-button>
 			<!-- 额外按钮-->
 			<!-- 表头设置 -->
 
@@ -40,6 +42,7 @@
 
 <script>
 	/* 引入需要的接口*/
+  import Gwrygl from './gwrygl'
 	import {
 		doQuery,
 		doAdd,
@@ -57,13 +60,14 @@
 
 		/* 初始额外赋值*/
 		async mounted() {
+   
 		this.$refs['TablePager'].pageQuery()
 	},
 	data() {
 		return {
 			/*需要的额外参数 */
 			showDialog: false,
-			DialogName: '',
+      DialogWidth:'',
 			type: '',
 			DialogTitle: '',
 			/* 基础url*/
@@ -76,6 +80,7 @@
 			tableTitle: [
 				{label: "编码", prop: "code", fieldType: "ftString",width:240},
 				{label: "岗位名称", prop: "name", fieldType: "ftString",width:300},
+        {label: "所属部门", prop: "bmName", fieldType: "ftString",width:300},
 				// {label: "负责人编码", prop: "fzrid", fieldType: "ftString",width:192},
 				{label: "负责人", prop: "fzrName", fieldType: "ftString",width:192},
 				{label: "备注", prop: "bz", fieldType: "ftString",width:300},
@@ -85,7 +90,15 @@
 		}
 	},
 	methods: {
-
+    doPerson(){
+      if (this.app.selectOne || this.app.clickOne) {
+      	this.DialogWidth = '70vw'
+      	this.DialogTitle = '岗位人员管理'
+      	this.showDialog = true
+      } else {
+      	this.$warning('请选中一行操作');
+      }
+    },
 		/* 基础查询*/
 		query: doQuery,
 				/* 基础增*/
@@ -101,6 +114,7 @@
 	},
 	components: {
 		Edit,
+    Gwrygl
 	}
 
 
@@ -110,4 +124,3 @@
 <style scoped>
 
 </style>
-

src/views/dangerManagement/dangerRectificationRecord/index.vue

@@ -55,7 +55,7 @@
 				<!--<EditButton ref="edit" :app='app'></EditButton>-->
 				<!--<DeleteButton :app='app'></DeleteButton>-->
 
-       <AttachFileButton_aqyh :params="{childPath:'yhzg',allowAddFile:'none'}" :app='this'></AttachFileButton_aqyh>
+       <AttachFileButton_aqyh :params="{childPath:'yhzg'}" :app='this'></AttachFileButton_aqyh>
       <!--  <WorkFlowButton  :app='app' ></WorkFlowButton> -->
 				<FieldButton :app='app'></FieldButton>
 				<ExcelButton :app='app'></ExcelButton>

src/views/dangerManagement/yhznytj/index.vue

@@ -115,7 +115,7 @@
           {
           	prop: 'wclCount',
           	label: '未处理完毕数量',
-          	width: 100
+          	width: 300
           },
           {
           	prop: 'cqCount',