Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

src/api/daily/duty.js

@@ -8,6 +8,15 @@ method: 'post',
 data: query||{}
 })
 }
+
+export function doQueryOwn(query) {
+  return request({
+    url: '/aqgl/rcgl/lzrw/queryOwn',
+    method: 'post',
+    data: query||{}
+  })
+}
+
 /* 更新 */
 export function doUpdate(query) {
 return request({

src/api/daily/lzszmx.js

+import request from 'common/src/utils/request'
+
+/* 查询 */
+export function doQuery(query) {
+return request({
+url: '/aqgl/rcgl/lzszmx/query',
+method: 'post',
+data: query||{}
+})
+}
+/* 更新 */
+export function doUpdate(query) {
+return request({
+url: '/aqgl/rcgl/lzszmx/update',
+method: 'post',
+data: query||{}
+})
+}
+export function doAdd(query) {
+return request({
+url: '/aqgl/rcgl/lzszmx/add',
+method: 'post',
+data: query||{}
+})
+}
+export function doDelete(query) {
+return request({
+url: '/aqgl/rcgl/lzszmx/delete',
+method: 'post',
+data: query||{}
+})
+}
+
+/**
+ * 生成风险排查任务
+ * in:id
+ */
+export function doAutoGen(query) {
+  return request({
+    url: '/aqgl/rcgl/lzbz/genLzrw',
+    method: 'post',
+    data: query||{}
+  })
+}
+
+
+

src/api/daily/performanceReport.js

@@ -51,7 +51,20 @@ export function doAddDtl(query) {
   })
 }
 
-
+export function lzwc(query) {
+  return request({
+    url: 'aqgl/rcgl/lzrw/lzwc',
+    method: 'post',
+    data: query||{}
+  })
+}
+export function qxwc(query) {
+  return request({
+    url: 'aqgl/rcgl/lzrw/qxwc',
+    method: 'post',
+    data: query||{}
+  })
+}
 
 
 

src/views/contingency/contingencyplan/index.vue

@@ -20,7 +20,7 @@
 			<CopyButton ref="copy" :app='app'></CopyButton>
 			<EditButton ref="edit" :app='app'></EditButton>
 			<!--<AttachFileButton  :app='app' ></AttachFileButton>-->
-      <AttachFileShow :delButton='false' :addButton='false' :app='app'></AttachFileShow>
+      <AttachFileShow :delButton='true' :addButton='true' :app='app'></AttachFileShow>
 			<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton>
 			<!-- 额外按钮-->
@@ -77,7 +77,11 @@
 			tableTitle: [
         {label: "年度", prop: "year", fieldType: "int"},
         //{label: "季度", prop: "quarter", fieldType: "ftString",width:80},
-        {label: "季度", prop: "quarterName", fieldType: "ftString",width:80},
+        {label: "季度", prop: "quarter",formatter:function(row, column, value, index) {
+            let jdobj=['','第一季度','第二季度','第三季度','第四季度']
+            return jdobj[value]
+
+          },width:80},
 				{label: "演练名称", prop: "name", fieldType: "ftString",width:180},
 				{label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180},
 				{label: "培训人数", prop: "pxrs", fieldType: "int"},

src/views/contingency/contingencystudy/edit.vue

@@ -9,16 +9,31 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="公司"  ref="gsid" prop="gsid">
+            <RelSelect  style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
+          </el-form-item>
+        </el-col>
+        <!--<el-col :span="12">
           <el-form-item label="演练单位"  ref="zzdw" prop="zzdw">
             <el-input :readonly="readonly"  v-model="form.zzdw" ></el-input>
           </el-form-item>
-        </el-col>
+        </el-col>-->
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="12">
+        <!--<el-col :span="12">
           <el-form-item label="培训人数"  ref="pxrs" prop="pxrs">
             <el-input :readonly="readonly"  v-model="form.pxrs" ></el-input>
           </el-form-item>
+        </el-col>-->
+        <!--<el-col :span="12">
+          <el-form-item label="演练单位"  ref="zzdw" prop="zzdw">
+            <el-input :readonly="readonly"  v-model="form.zzdw" ></el-input>
+          </el-form-item>
+        </el-col>-->
+        <el-col :span="12">
+          <el-form-item label="演练单位"  ref="yldwid" prop="yldwid">
+            <RelSelect  linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="主(协)办单位"  ref="zbdw" prop="zbdw">
@@ -58,7 +73,7 @@
         </el-col>
       </el-row>
    <!--   <el-row :gutter="24">
-     
+
       </el-row> -->
       <el-row :gutter="24">
         <el-col :span="24">
@@ -112,6 +127,8 @@
 
         /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
         form: {
+          gsid:'',
+          yldwid:'',
           //ID
           id:'',
           //演练名称

src/views/contingency/contingencystudy/index.vue

@@ -32,7 +32,7 @@
         <AttachFileShow :delButton='false' :addButton='false' :app='app'></AttachFileShow>
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
-        <WorkFlowButton  :app='this'></WorkFlowButton>
+       <!-- <WorkFlowButton  :app='this'></WorkFlowButton>-->
         <!-- 额外按钮-->
         <!-- 表头设置 -->
 
@@ -101,7 +101,11 @@
         tableTitle: [
           {label: "年度", prop: "year", fieldType: "int"},
           //{label: "季度", prop: "quarter", fieldType: "ftString",width:80},
-          {label: "季度", prop: "quarterName", fieldType: "ftString",width:80},
+          {label: "季度", prop: "quarter", formatter:function(row, column, value, index) {
+              let jdobj=['','第一季度','第二季度','第三季度','第四季度']
+              return jdobj[value]
+
+            },fieldType: "ftString",width:80},
           {label: "演练名称", prop: "name", fieldType: "ftString",width:180},
           {label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180},
           {label: "培训人数", prop: "pxrs", fieldType: "int"},

src/views/contingency/contingencystudy/reportEdit.vue

@@ -8,17 +8,22 @@
             <el-input :readonly="readonly"  v-model="form.name" ></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司"  ref="gsid" prop="gsid">
+            <RelSelect  style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
+          </el-form-item>
+        </el-col>
     <!--    <el-col :span="6">
           <el-form-item label="分公司ID"  ref="gsid" prop="gsid">
             <el-input :readonly="readonly"  v-model="form.gsid" ></el-input>
           </el-form-item>
         </el-col> -->
-        <el-col :span="12">
+       <!-- <el-col :span="12">
           <el-form-item label="演练组织单位"  ref="yldwid" prop="yldwid">
-          <!--  <el-input :readonly="readonly"  v-model="form.yldwid" ></el-input> -->
+          &lt;!&ndash;  <el-input :readonly="readonly"  v-model="form.yldwid" ></el-input> &ndash;&gt;
           <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
           </el-form-item>
-        </el-col>
+        </el-col>-->
 
 
         <!--<el-col :span="6">-->
@@ -28,10 +33,15 @@
         <!--</el-col>-->
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="12">
+        <!--<el-col :span="12">
           <el-form-item label="培训人数"  ref="pxrs" prop="pxrs">
             <el-input type="number" :readonly="readonly"  v-model="form.pxrs" ></el-input>
           </el-form-item>
+        </el-col>-->
+        <el-col :span="12">
+          <el-form-item label="演练组织部门"  ref="yldwid" prop="yldwid">
+            <RelSelect  linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="演练目标"  ref="ylmb" prop="ylmb">
@@ -128,7 +138,7 @@
           //演练名称
           name:'',
           //分公司ID
-          // gsid:'',
+          gsid:'',
           //演练组织单位ID
           yldwid:'',
           //演练计划ID

src/views/daily/maintenanceDuty/edit.vue

@@ -17,10 +17,15 @@
                 </el-col>
             </el-row>
             <el-row :gutter="20">
-              <el-col :span="24">
+              <!--<el-col :span="24">
                 <el-form-item label="岗位"  ref="gwid" prop="gwid">
                   <RelSelect  style="width: 100%;" src='/aqgl/jcsj/scgw/query'   :match="{value:'id',label:'name'}" v-model='form.gwid' ></RelSelect>
                 </el-form-item>
+              </el-col>-->
+              <el-col :span="24">
+                <el-form-item label="岗位"  ref="gwid" prop="gwid">
+                  <RelSelect style="width: 100%;" linkage :linkParams="{gsid:form.gsid}" clearable :readonly="readonly" src='/aqgl/jcsj/scgw/query' :match="{value:'id',label:'name'}" v-model='form.gwid' ></RelSelect>
+                </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">

src/views/daily/performanceReport/index.vue

@@ -38,7 +38,7 @@
         <AttachFileButton :app='app'></AttachFileButton>
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
-        <WorkFlowButton  :app='this'></WorkFlowButton>
+        <!--<WorkFlowButton  :app='this'></WorkFlowButton>-->
         <!-- 额外按钮-->
         <!-- 表头设置 -->
 
@@ -56,7 +56,7 @@
       <!-- tabs -->
       <el-tabs v-model="activeName" @tab-click="handleClick"  >
     <el-tab-pane label="履职报告" name="first" >
-             <Report ref="report"  />
+             <Report :mapp="app" ref="report"  />
     </el-tab-pane>
       </el-tabs>
   </div>
@@ -69,6 +69,7 @@
 	/* 引入需要的接口*/
 	import {
 		doQuery,
+		doQueryOwn,
 		doAdd,
 		doUpdate,
 		doDelete
@@ -126,7 +127,7 @@
         console.log(val,'val')
       },
     /* 基础查询*/
-    query: doQuery,
+    query: doQueryOwn,
     		/* 基础增*/
     		apiAdd: doAdd,
     		/* 基础更新*/

src/views/daily/performanceReport/report.vue

@@ -34,7 +34,10 @@
 			<AttachFileButton  :app='app' ></AttachFileButton>
 			<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton>
+
 			<!-- 额外按钮-->
+      <el-button @click="lzwc" size='mini'  type="primary">履职完成</el-button>
+      <el-button @click="qxwc" size='mini'  type="primary">取消完成</el-button>
 			<!-- 表头设置 -->
 
 			<!-- 权限-->
@@ -56,7 +59,9 @@
 	doQueryDtl,
   doUpdateDtl,
   doDeleteDtl,
-  doAddDtl
+  doAddDtl,
+  lzwc,
+    qxwc,
 	} from  '@/api/daily/performanceReport.js';
 	/* edit页面*/
 	import Edit from './reportEdit'
@@ -71,6 +76,7 @@
 		async mounted() {
 		this.$refs['TablePager'].pageQuery()
 	},
+    props:['mapp'],
 	data() {
 		return {
 			/*需要的额外参数 */
@@ -95,6 +101,72 @@
 		}
 	},
 	methods: {
+    lzwc(){
+      //console.log(this.mapp.singleItem)
+      /*if (this.app.selectOne || this.app.clickOne) {
+        this.$confirm('确定发布该题库吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          publish({id:this.singleItem.id}).then(res=>{
+            if(res.success){
+              this.$success('该题库发布成功!')
+              this.$refs.TablePager.pageQuery()
+            }
+          })
+          // let id=this.singleItem.id
+          // this.$router.push({path: '/paper/'+id,query: { singleItem: this.singleItem}})
+        })
+
+      } else {
+        this.$warning('请选中一行操作');
+      }*/
+
+      if (this.mapp.selectOne || this.mapp.clickOne) {
+        this.$confirm('确认完成履职报告, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          lzwc({id:this.mapp.singleItem.id}).then(res=>{
+            if(res.success){
+              this.$success('履职报告已完成!')
+              //this.$refs.TablePager.pageQuery();
+              this.mapp.$refs.TablePager.pageQuery();
+            }
+          })
+          // let id=this.singleItem.id
+          // this.$router.push({path: '/paper/'+id,query: { singleItem: this.singleItem}})
+        })
+
+      }else {
+        this.$warning('请选中一行操作');
+      }
+    },
+
+    qxwc(){
+      if (this.mapp.selectOne || this.mapp.clickOne) {
+        this.$confirm('取消完成履职报告, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          qxwc({id:this.mapp.singleItem.id}).then(res=>{
+            if(res.success){
+              this.$success('已取消!')
+              //this.$refs.TablePager.pageQuery()
+              this.mapp.$refs.TablePager.pageQuery();
+            }
+          })
+          // let id=this.singleItem.id
+          // this.$router.push({path: '/paper/'+id,query: { singleItem: this.singleItem}})
+        })
+
+      }else {
+        this.$warning('请选中一行操作');
+      }
+    },
 
 		/* 基础查询*/
 		query: doQueryDtl,

src/views/equipment/archives/index.vue

@@ -10,6 +10,12 @@
         		<span class="search-span">设备信息:</span>
         		 	<el-input v-model="queryParams.sbxx"></el-input>
         	</div>
+        </el-col>
+        <el-col :span="4" class="search-col">
+          <div class="search-item">
+            <span class="search-span">公司:</span>
+            <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
+          </div>
         </el-col>
 				<!--<el-col :span="6" class="search-col">-->
 					<!--<div class="search-item">-->
@@ -84,13 +90,14 @@
 				type: '',
 				DialogTitle: '',
 				/* 基础url*/
-				baseUrl: '/aqgl/sbxx',
+				baseUrl: '/aqgl/sbgl/sbxx',
 				/* 查询参数*/
 				queryParams: {
 					dabh: '',
 					sbxx: '',
 					doc:'',
 					xtfl:"0",
+          gsid:""
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [
@@ -110,7 +117,7 @@
           {label: "制造日期", prop: "ccrq", fieldType: "ftDateTime"},
          	// {label: "计量单位", prop: "jldw", fieldType: "ftString",width:120},
          	{label: "启用日期", prop: "qyrq", fieldType: "ftDateTime"},
-         	{label: "检验日期", prop: "scjyrq", fieldType: "ftDateTime"},
+         	{label: "检验日期", prop: "scjyrq", fielNdType: "ftDateTime"},
          	{label: "下次检验日期", prop: "xcjyrq", fieldType: "ftDateTime"},
           {label: "检验周期", prop: "jyzq", fieldType: "ftString"},
          /* 	{label: "停用日期", prop: "tyrq", fieldType: "ftDateTime"}, */

src/views/equipment/equipmentClass/edit.vue

@@ -2,13 +2,13 @@
     <RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
         <!-- 填写表单内容，slot=form必写-->
         <el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
-            <el-row :gutter="20">
-                <el-col :span="24">
-                  <el-form-item label="系统分类"  ref="xtfl" prop="xtfl">
-                       <RelSelect :readonly="readonly" style="width: 100%;"  src='/aqgl/sbgl/sbfl/init/xtfl' clearable :match="{value:'id',label:'name'}" v-model='form.xtfl' ></RelSelect>
-                 </el-form-item>
-               </el-col>
-            </el-row>
+            <!--<el-row :gutter="20">-->
+                <!--<el-col :span="24">-->
+                  <!--<el-form-item label="系统分类"  ref="xtfl" prop="xtfl">-->
+                       <!--<RelSelect :readonly="readonly" style="width: 100%;"  src='/aqgl/sbgl/sbfl/init/xtfl' clearable :match="{value:'id',label:'name'}" v-model='form.xtfl' ></RelSelect>-->
+                 <!--</el-form-item>-->
+               <!--</el-col>-->
+            <!--</el-row>-->
             <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="编码"  ref="code" prop="code">

src/views/equipment/equipmentClass/index.vue

@@ -76,7 +76,7 @@
 			tableTitle: [
 				{label: "编码", prop: "code", fieldType: "ftString",width:140},
 				{label: "名称", prop: "name", fieldType: "ftString",width:200},
-				{label: "系统分类", prop: "xtflName",fieldType: "ftString",width:120},
+				/*{label: "系统分类", prop: "xtflName",fieldType: "ftString",width:120},*/
 				{label: "备注", prop: "bz", fieldType: "ftString",width:260},
 				{label: "维护人", prop: "whr", fieldType: "ftString"},
 				{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},

src/views/equipment/sbbymx/byjl.vue

@@ -78,7 +78,8 @@ import {
 		// {label: "设备ID", prop: "sbid", fieldType: "ftString",width:192},
 		// {label: "保养项目ID", prop: "xmid", fieldType: "ftString",width:192},
 		{label: "保养人员", prop: "byrName", fieldType: "ftString",width:192},
-		{label: "保养时间", prop: "bysj", fieldType: "ftDateTime"},
+		{label: "保养时间起", prop: "bysj", fieldType: "ftDateTime"},
+		{label: "保养时间终", prop: "bysjz", fieldType: "ftDateTime"},
     {label: "保养说明", prop: "bysm", fieldType: "ftString",width:300},
 		// {label: "附件数", prop: "attachcount", fieldType: "int"},
 		{label: "备注", prop: "bz", fieldType: "ftString",width:300},

src/views/equipment/sbbymx/ckxm.vue

@@ -81,18 +81,20 @@
         {label: "名称", prop: "byxmName", fieldType: "ftString",width:300},
         {label: "保养周期-天", prop: "byzq", fieldType: "int",width:252},
 
-        {label: "上次保养日期", prop: "scbyrq", ...this.$common('ftDate'),width:192},
+        {label: "上次保养日期", prop: "scbyrq", ...this.$common('ftDateTime'),width:192},
         {label: "上次保养人", prop: "scbyrName", fieldType: "ftString",width:200},
-        {label: "预计下次保养日期", prop: "xcbyrq", ...this.$common('ftDate'),width:192},
+        {label: "预计下次保养日期", prop: "xcbyrq", ...this.$common('ftDateTime'),width:192},
 
 
         // {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
         // {label: "停用标志", prop: "tybz", fieldType: "ftString",width:100},
         // {label: "停用日期", prop: "tyrq", ...this.$common('ftDateTime'),width:192},
         {label: "标准工时", prop: "bzgs", fieldType: "float",width:192},
+        {label: "责任人", prop: "fzr", fieldType: "ftString",width:192},
         // {label: "附件数", prop: "attachcount", fieldType: "int",width:192},
         // {label: "备注", prop: "bz", fieldType: "ftString",width:300},
         {label: "维护人", prop: "whr", fieldType: "ftString",width:192},
+
         {label: "维护时间", prop: "whsj", ...this.$common('ftDateTime'),width:192},
         // {label: "创建人", prop: "cjr", fieldType: "ftString",width:192},
         // {label: "创建时间", prop: "cjsj", ...this.$common('ftDateTime'),width:192},

src/views/equipment/sbbymx/ckxmEdit.vue

@@ -3,13 +3,20 @@
 
       <el-form slot="form" ref="form" :model="form" label-width="120px" :rules="rules">
           <el-row :gutter="20">
-              <el-col :span="24">
-                  <el-form-item label="保养日期"  ref="bysj" prop="bysj">
+              <el-col :span="12">
+                  <el-form-item label="保养日期起"  ref="bysj" prop="bysj">
                       <el-date-picker  style="width: 100%;" :readonly="readonly" type="datetime"
                                        v-model="form.bysj"  placeholder="选择日期">
                       </el-date-picker>
                   </el-form-item>
               </el-col>
+            <el-col :span="12">
+              <el-form-item label="保养日期终"  ref="bysjz" prop="bysj">
+                <el-date-picker  style="width: 100%;" :readonly="readonly" type="datetime"
+                                 v-model="form.bysjz"  placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
@@ -73,10 +80,11 @@ props:['app'],
                 //序号
                 //保养项目
                 xmid:'',
-                //保养日期
+                //保养日期起
                 bysj:new Date().getTime(),
+                //保养日期终
+                bysjz:new Date().getTime(),
                 //预计下次计划日期
-
                 //备注
                 bz:'',
         },
@@ -103,7 +111,9 @@ props:['app'],
             if(res.success){
               this.$success('反馈成功')
               this.app.showDialog=false
-            }
+              this.app.$refs['TablePager'].pageQuery()
+
+              }
         })
       }
 

src/views/equipment/sbbymx/index.vue

@@ -9,19 +9,19 @@
 		<div class="search" v-condition>
 			<SearchButton :app='app'></SearchButton>
 			<el-row :gutter="20" class="search-row-1">
-        <el-col :span="6" class="search-col">
+        <!--<el-col :span="6" class="search-col">
         	<div class="search-item">
         		<span class="search-span">档案编号:</span>
         		<el-input v-model="queryParams.dabh"></el-input>
         	</div>
-        </el-col>
+        </el-col>-->
         <el-col :span="6" class="search-col">
         	<div class="search-item">
         		<span class="search-span">设备名称:</span>
         		 	<el-input v-model="queryParams.sbxx"></el-input>
         	</div>
         </el-col>
-				<el-col :span="6" class="search-col">
+				<!--<el-col :span="6" class="search-col">
 					<div class="search-item">
 						<span class="search-span">是否已入档:</span>
 						  <el-select v-model="queryParams.doc" placeholder="请选择">
@@ -33,7 +33,13 @@
 							</el-option>
 						</el-select>
 					</div>
-				</el-col>
+				</el-col>-->
+        <!--<el-col :span="4" class="search-col">
+          <div class="search-item">
+            <span class="search-span">公司:</span>
+            <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
+          </div>
+        </el-col>-->
 
 			</el-row>
 		</div>

src/views/equipment/sbbymx/selector.vue

@@ -115,6 +115,7 @@ props:['app'],
 				tableTitle: [
         {label: "编码", prop: "code", fieldType: "ftString",width:120},
         {label: "名称", prop: "name", fieldType: "ftString",width:300},
+          {label: "负责人", prop: "fzr", fieldType: "ftString",width:300},
         {label: "保养周期-天", prop: "byzq", fieldType: "int",width:252},
         {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
         {label: "标准工时", prop: "bzgs", fieldType: "float",width:192},
@@ -251,7 +252,7 @@ props:['app'],
         }
         let xmList=[]
         this.selectedList.forEach(row=>{
-          xmList.push({xmid:row.id})
+          xmList.push({xmid:row.id,fzrid:row.fzrid})
           // delete row.id
         })
         let params={

src/views/equipment/sbbyxm/edit.vue

@@ -50,7 +50,20 @@
 
             </el-row>
             <el-row :gutter="20">
-               <el-col :span="24">
+              <!--<el-col :span="12">
+                <el-form-item label="责任人"  ref="bz" prop="bz">
+                  <el-input :readonly="readonly"  v-model="form.fzr" ></el-input>
+                </el-form-item>
+              </el-col>-->
+
+              <el-col :span="12">
+                <el-form-item label="责任人"  ref="fzrid" prop="fzrid">
+                  <!--   <el-input :readonly="readonly"  v-model="form.userid" ></el-input> -->
+                  <personSelector :label="form.fzr||form.fzrid||'暂无'" @selected='userSelected' ></personSelector>
+                </el-form-item>
+              </el-col>
+
+               <el-col :span="12">
                    <el-form-item label="备注"  ref="bz" prop="bz">
                        <el-input :readonly="readonly"  v-model="form.bz" ></el-input>
                    </el-form-item>
@@ -91,6 +104,8 @@
                         code:'',
                         //名称
                         name:'',
+                        fzr:'',
+                        fzrid:'',
                         //停用标志
                         // tybz:'',
                         // //停用日期
@@ -127,7 +142,9 @@
             }
         },
         methods: {
-
+          userSelected(row){
+            this.form.fzrid=row.id
+          }
         }
     }
 </script>

src/views/equipment/sbbyxm/index.vue

@@ -10,6 +10,12 @@
 						<el-input v-model="queryParams.info"></el-input>
 					</div>
 				</el-col>
+        <el-col :span="4" class="search-col">
+          <div class="search-item">
+            <span class="search-span">公司:</span>
+            <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
+          </div>
+        </el-col>
 			</el-row>
 		</div>
 		<!-- 按钮操作-->
@@ -70,7 +76,8 @@
 			baseUrl: '/aqgl/sbgl/sbbyxm',
 			/* 查询参数*/
 			queryParams: {
-				info: ''
+				info: '',
+        gsid:''
 			},
 			/* 表格标题对应参数*/
 			tableTitle: [
@@ -78,6 +85,7 @@
 				{label: "名称", prop: "name", fieldType: "ftString",width:300},
         {label: "保养周期（天）", prop: "byzq", fieldType: "int",width:192},
         {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
+        {label: "负责人", prop: "fzr", fieldType: "ftString",width:192},
 				{label: "停用标志", prop: "tybz", fieldType: "ftString",width:100},
 				{label: "停用日期", prop: "tyrq", fieldType: "ftDateTime",width:192},
 				{label: "标准工时", prop: "bzgs", fieldType: "float",width:192},
@@ -87,7 +95,7 @@
 				{label: "维护时间", prop: "whsj", fieldType: "ftDateTime",width:192},
 				{label: "创建人", prop: "cjr", fieldType: "ftString",width:192},
 				{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime",width:192},
-			
+
 			]
 		}
 	},