修复

src/views/basicData/scgw/gwryglAdd.vue

@@ -3,7 +3,7 @@
 		<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'
+				<TablePager  showSelection @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem'
 					:delButton='false' @getRow='getRow'>
 				</TablePager>
 			</div>

src/views/riskPrecontrol/maintenanceRisk/index.vue

@@ -28,7 +28,7 @@
 			<AddButton ref="add" :app='app'></AddButton>
 			<CopyButton ref="copy" :app='app'></CopyButton>
 			<EditButton ref="edit" :app='app'></EditButton>
-      <AttachFileButton  :app='app'></AttachFileButton>
+    
 			<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton>
 			<!-- 额外按钮-->

src/views/riskPrecontrol/maintenanceRiskTask/edit.vue

@@ -29,6 +29,11 @@
                           <RelSelect :readonly="readonly" style="width: 100%;"  src='/aqgl/jcsj/scgw/query' clearable :match="{value:'id',label:'name'}" v-model='form.gwid' ></RelSelect>
                     </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                  <el-form-item label="任务类型"  ref="rwlx" prop="rwlx">
+                  <RelSelect style="width: 100%;" clearable :readonly="readonly" src='aqgl/fxyk/fxpc/init/rwlx' :match="{value:'id',label:'name'}" v-model='form.rwlx' ></RelSelect>
+                  </el-form-item>
+                </el-col>
             </el-row>
             <el-row :gutter="20">
 
@@ -107,6 +112,7 @@
 
                 /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
                 form: {
+                  rwlx:'',
                   fxpcdd:'',
                   fxd:'',
                   cjName:'',

src/views/riskPrecontrol/maintenanceRiskTask/index.vue

@@ -48,6 +48,12 @@
                   <RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
                </div>
            </el-col>
+           <el-col :span="6" class="search-col">
+               <div class="search-item">
+                 <span class="search-span">任务类型:</span>
+                   <RelSelect   style="width: 100%;"  src='aqgl/fxyk/fxpc/init/rwlx' clearable :match="{value:'id',label:'name'}" v-model='queryParams.rwlx' ></RelSelect>
+               </div>
+           </el-col>
          </el-row>
       </div>
       <!-- 按钮操作-->
@@ -57,7 +63,7 @@
         <!-- <AddButton ref="add" :app='app'></AddButton>
         <CopyButton ref="copy" :app='app'></CopyButton>
         <EditButton ref="edit" :app='app'></EditButton> -->
-        <AttachFileButton :app='app'></AttachFileButton>
+         <AttachFileShow :app='app'></AttachFileShow>
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
         <el-button size='mini' @click="zdzrr" type="primary">指定责任人</el-button>
@@ -150,6 +156,7 @@ import Zdzrr from './zdzrr'
         baseUrl: '/aqgl/fxyk/fxpc',
         /* 查询参数*/
         queryParams: {
+          rwlx:'',
           queryType:'history',
           gsid:'',
           bmid:'',
@@ -164,6 +171,7 @@ import Zdzrr from './zdzrr'
        	// {label: "单据来源", prop: "djly", fieldType: "ftString",width:60},
        	// {label: "风险排查标准编码", prop: "fxbzid", fieldType: "ftString",width:192},
        	{label: "状态", prop: "ztName", fieldType: "ftString",width:50},
+        	{label: "任务类型", prop: "rwlxName", fieldType: "ftString",width:100},
        	{label: "下达日期", prop: "xdrq", fieldType: "ftDate"},
        	// {label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
        	{label: "检查时间", prop: "sjjcsj", fieldType: "ftDateTime"},

src/views/riskPrecontrol/queryRisk/index.vue

@@ -28,7 +28,7 @@
 		<!-- 	<AddButton ref="add" :app='app'></AddButton>
 			<CopyButton ref="copy" :app='app'></CopyButton>
 			<EditButton ref="edit" :app='app'></EditButton> -->
-      <AttachFileButton  :app='app'></AttachFileButton>
+ 
 		<!-- 	<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton> -->
 			<!-- 额外按钮-->

src/views/riskPrecontrol/queryRiskTask/edit.vue

@@ -29,6 +29,11 @@
                           <RelSelect :readonly="readonly" style="width: 100%;"  src='/aqgl/jcsj/scgw/query' clearable :match="{value:'id',label:'name'}" v-model='form.gwid' ></RelSelect>
                     </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                  <el-form-item label="任务类型"  ref="rwlx" prop="rwlx">
+                  <RelSelect style="width: 100%;" clearable :readonly="readonly" src='aqgl/fxyk/fxpc/init/rwlx' :match="{value:'id',label:'name'}" v-model='form.rwlx' ></RelSelect>
+                  </el-form-item>
+                </el-col>
             </el-row>
             <el-row :gutter="20">
 

src/views/riskPrecontrol/queryRiskTask/index.vue

@@ -54,13 +54,19 @@
                   <RelSelect style="width: 100%;"  src='aqgl/fxyk/fxpc/init/jcjg'  filterable clearable :match="{value:'id',label:'name'}" v-model='queryParams.jcjg' ></RelSelect>
                </div>
            </el-col>
+           <el-col :span="6" class="search-col">
+               <div class="search-item">
+                 <span class="search-span">任务类型:</span>
+                   <RelSelect   style="width: 100%;"  src='aqgl/fxyk/fxpc/init/rwlx' clearable :match="{value:'id',label:'name'}" v-model='queryParams.rwlx' ></RelSelect>
+               </div>
+           </el-col>
          </el-row>
       </div>
       <!-- 按钮操作-->
       <el-row class="tool-bar">
         <PrintButton :app='app'></PrintButton>
         <ViewButton ref="view" :app='app'></ViewButton>
-        <AttachFileButton :app='app'></AttachFileButton>
+        <AttachFileShow :app='app'></AttachFileShow>
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
         <!-- 额外按钮-->
@@ -137,6 +143,7 @@
         baseUrl: '/aqgl/fxyk/fxpc',
         /* 查询参数*/
         queryParams: {
+          rwlx:'',
           jcjg:'',
           gsid:'',
           bmid:'',
@@ -151,6 +158,7 @@
        	// {label: "单据来源", prop: "djly", fieldType: "ftString",width:60},
        	// {label: "风险排查标准编码", prop: "fxbzid", fieldType: "ftString",width:192},
        	{label: "状态", prop: "ztName", fieldType: "ftString",width:50},
+        	{label: "任务类型", prop: "rwlxName", fieldType: "ftString",width:100},
        	{label: "下达日期", prop: "xdrq", fieldType: "ftDate"},
        	// {label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
        	{label: "检查时间", prop: "sjjcsj", fieldType: "ftDateTime"},

src/views/riskPrecontrol/riskAnalysis/index.vue

@@ -7,24 +7,23 @@
       <div class="search" v-condition>
         <SearchButton :app='app'></SearchButton>
         <el-row :gutter="20" class="search-row-1">
+       <el-col :span="6" class="search-col">
+           <div class="search-item">
+             <span class="search-span">任务类型:</span>
+               <RelSelect   style="width: 100%;"  src='aqgl/fxyk/fxpc/init/rwlx' clearable :match="{value:'id',label:'name'}" v-model='queryParams.rwlx' ></RelSelect>
+           </div>
+       </el-col>
           <el-col :span="6" class="search-col">
-            <div class="search-item">
-              <span class="search-span">岗位:</span>
-                <el-select v-model="queryParams.gwid" clearable placeholder="请选择">
-                  <el-option
-                    v-for="item in doQueryScgw"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-            </div>
+          	<div class="search-item">
+          		<span class="search-span">开始日期:</span>
+          		<el-date-picker value-format="timestamp" v-model="queryParams.ksrq"></el-date-picker>
+          	</div>
           </el-col>
           <el-col :span="6" class="search-col">
-            <div class="search-item">
-              <span class="search-span">风险点:</span>
-             <el-input v-model="queryParams.fxd"></el-input>
-            </div>
+          	<div class="search-item">
+          		<span class="search-span">结束日期:</span>
+          		<el-date-picker value-format="timestamp" v-model="queryParams.jsrq" ></el-date-picker>
+          	</div>
           </el-col>
 
         </el-row>
@@ -102,14 +101,6 @@
 
     /* 初始额外赋值*/
     async mounted() {
-      await this.$asRun(
-        [doQueryScgw(),
-        res => {
-          var data = res['data']['records'];
-          this.doQueryScgw = data
-          }
-        ]
-        )
       this.$refs['TablePager'].pageQuery()
     },
     data() {
@@ -125,8 +116,11 @@
         baseUrl: 'kzzx/role',
         /* 查询参数*/
         queryParams: {
-          gwid: '',
-          fxd: ''
+          rwlx: '',
+          ksrq: new Date().getTime()-1000*60*60*24*30,
+          jsrq: new Date().getTime()
+          
+         
         },
         /* 表格标题对应参数*/
         tableTitle: [

src/views/riskPrecontrol/riskSet/edit.vue

@@ -75,7 +75,18 @@
                   <div style="display: flex;transform: translateY(-10px);">
                   	<el-button @click.native='showDialog=true' size='mini' type="primary">添加指标</el-button>
                   </div>
-                  <EditTable :editTableData='formDetail' staticHeader :app='this' ></EditTable>
+                  <EditTable :editTableData='formDetail' staticHeader :app='this' >
+                     <template slot="tabCustom">
+                    <el-table-column style="border-right: 0px;" fixed="right" label="操作" header-align="center">
+                    	<template slot-scope="scope">
+                    		<el-button style="text-align: center;color: red;width: 100%;"
+                    			@click.native.prevent="del(scope.$index, tableData,scope)" type="text" size="small">
+                    			<i class="el-icon-delete"></i>删除
+                    		</el-button>
+                    	</template>
+                    </el-table-column>
+                    </template>
+                  </EditTable>
                 </div>
 
               </el-form-item>
@@ -102,6 +113,14 @@
         }
         },
         watch:{
+          formDetail(val){
+            if(val.length){
+              this.notInIds=[]
+              val.forEach(e=>{
+                this.notInIds.push(e.jcnrid)
+              })
+            }
+          },
           jldw(val){
             if(val=='week'){
               this.days=7
@@ -116,6 +135,7 @@
 
         data() {
             return {
+              notInIds:[],
               formDetail:[],
               showDialog:false,
               DialogTitle:'排查标准',
@@ -172,13 +192,20 @@
                 },
                 /* 多表表头*/
                 editTableTitle:[
-                {label: "检查内容", prop: "nr", fieldType: "ftString",width:300},
-                {label: "岗位", prop: "scgwName", fieldType: "ftString",width:300},
-                {label: "检查人", prop: "fzrName", fieldType: "ftString",width:300},
+               {label: "检查内容", prop: "nr", fieldType: "ftString",width:300},
+               {label: "岗位", prop: "scgwName", fieldType: "ftString",width:150},
+               {label: "任务类型", prop: "rwlxName", fieldType: "ftString",width:150},
+               {label: "检查人", prop: "fzrName", fieldType: "ftString",width:150},
                 ]
             }
         },
         methods: {
+          del(index){
+            if(this.type=='view'){
+              return
+            }
+           this.formDetail.splice(index,1)
+          },
           numberChange (val,maxNum,str) {
                //转换数字类型
                this.form[str] = Number(val)

src/views/riskPrecontrol/riskSet/index.vue

@@ -21,7 +21,7 @@
 			<AddButton ref="add" :app='app'></AddButton>
 			<CopyButton ref="copy" :app='app'></CopyButton>
 			<EditButton ref="edit" :app='app'></EditButton>
-      <AttachFileButton  :app='app'></AttachFileButton>
+
 			<!-- <FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton> -->
       <el-button @click="doStart" size='mini'type="primary">启动</el-button>

src/views/riskPrecontrol/riskSet/selecter.vue

@@ -2,11 +2,31 @@
    <DefaultDialog :app='app'>
      <div slot="form" style="height: 70vh;">
        <!-- 按钮-->
-       <div style='height:100%;width: 100%;'>
+       <div class="min_full" style='height:100%;width: 100%;'>
+         <div class="search" v-condition>
+           <SearchButton :app='this'></SearchButton>
+           <el-row :gutter="20" class="search-row-1">
+             <el-col :span="12" class="search-col">
+                 <div class="search-item">
+                   <span class="search-span">任务类型:</span>
+                     <RelSelect   style="width: 100%;"  src='aqgl/fxyk/fxpc/init/rwlx' clearable :match="{value:'id',label:'name'}" v-model='queryParams.rwlx' ></RelSelect>
+                 </div>
+             </el-col>
+             <el-col :span="12" class="search-col">
+                 <div class="search-item">
+                   <span class="search-span">人员:&nbsp;&nbsp;</span>
+                    <el-input v-model='queryParams.condition' ></el-input>
+                 </div>
+             </el-col>
+
+           </el-row>
+         </div>
+         <div class="tablePagers">
          <TablePager showSelection :delButton='false' @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem'
            @getRow='getRow'>
 
          </TablePager>
+         </div>
        </div>
        <!-- 表格-->
      </div>
@@ -45,6 +65,7 @@
      async mounted() {
        this.$nextTick(()=>{
          this.queryParams.gsid=this.app.form.gsid
+         this.queryParams.notInIds=this.app.notInIds
          // this.queryParams.bmid=this.app.form.bmid
          this.$refs['TablePager'].pageQuery()
        })
@@ -88,12 +109,16 @@
      data() {
        return {
         queryParams:{
-          gwid:''
+          gwid:'',
+          condition:'',
+          rwlx:'',
+          notInIds:[]
         },
       tableTitle:  [
       {label: "检查内容", prop: "nr", fieldType: "ftString",width:300},
-      {label: "岗位", prop: "scgwName", fieldType: "ftString",width:300},
-      {label: "检查人", prop: "fzrName", fieldType: "ftString",width:300},
+      {label: "岗位", prop: "scgwName", fieldType: "ftString",width:150},
+      {label: "任务类型", prop: "rwlxName", fieldType: "ftString",width:150},
+      {label: "检查人", prop: "fzrName", fieldType: "ftString",width:150},
       ],
        baseUrl: '/aqgl/fxyk/fxbz',
        }

src/views/riskPrecontrol/screeningCriteria/content.vue

 <template>
   <div v-show="queryParams.mid" class="min_full" style="height: calc(84vh - 75px);">
+      <div class="search" v-condition>
+        <SearchButton :app='this'></SearchButton>
+        <el-row :gutter="20" class="search-row-1">
+          <el-col :span="6" class="search-col">
+              <div class="search-item">
+                <span class="search-span">任务类型:</span>
+                  <RelSelect   style="width: 100%;"  src='aqgl/fxyk/fxpc/init/rwlx' clearable :match="{value:'id',label:'name'}" v-model='queryParams.rwlx' ></RelSelect>
+              </div>
+          </el-col>
+
+        </el-row>
+      </div>
     <Fp ref='fp' :app='this' v-if='showDialog'></Fp>
     <!-- 分配弹框-->
     <!-- 按钮操作-->
@@ -67,13 +79,15 @@
         baseUrl: '/aqgl/fxyk/fxjcnr',
         /* 查询参数*/
         queryParams: {
-          mid:''
+          mid:'',
+          rwlx:''
         },
         /* 表格标题对应参数*/
         tableTitle: [
         // {label: "标准ID", prop: "mid", fieldType: "ftString",width:192},
 				{label: "检查内容", prop: "nr", fieldType: "ftString",width:300},
-        {label: "岗位", prop: "scgwName", fieldType: "ftString",width:300},
+        {label: "岗位", prop: "scgwName", fieldType: "ftString",width:150},
+         {label: "任务类型", prop: "rwlxName", fieldType: "ftString",width:150},
         {label: "检查人", prop: "fzrName", fieldType: "ftString",width:300},
 				// {label: "检查分值", prop: "jcfz", fieldType: "float"},
 				// {label: "备注", prop: "bz", fieldType: "ftString",width:300},

src/views/riskPrecontrol/screeningCriteria/contentEdit.vue

@@ -18,6 +18,11 @@
             </el-row>
 
             <el-row :gutter="20">
+              <el-col :span="24">
+                  <el-form-item label="任务类型"  ref="rwlx" prop="rwlx">
+                  <RelSelect style="width: 100%;" clearable :readonly="readonly" src='aqgl/fxyk/fxpc/init/rwlx' :match="{value:'id',label:'name'}" v-model='form.rwlx' ></RelSelect>
+                  </el-form-item>
+              </el-col>
               <el-col :span="24">
                   <el-form-item label="岗位"  ref="gwid" prop="gwid">
                   <RelSelect style="width: 100%;" :params="{gsid:app.vMain.rowItem.gsid}" clearable :readonly="readonly" src='/aqgl/jcsj/scgw/query' :match="{value:'id',label:'name'}" v-model='form.gwid' ></RelSelect>
@@ -25,7 +30,7 @@
               </el-col>
                 <el-col :span="24">
                     <el-form-item label="检查人"  ref="fzrid" prop="fzrid">
-                       <RelSelect  linkage :linkParams="{scgwid:form.gwid}" filterable style="width: 100%;" :params="{bmid:app.vMain.rowItem.gsid}" clearable :readonly="readonly" src='aqgl/jcsj/scgwry/queryScgwry' :match="{value:'id',label:'username'}" v-model='form.fzrid' ></RelSelect>
+                       <RelSelect  linkage :linkParams="{scgwid:form.gwid}" filterable style="width: 100%;"  clearable :readonly="readonly" src='aqgl/jcsj/scgwry/queryScgwry' :match="{value:'id',label:'username'}" v-model='form.fzrid' ></RelSelect>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -55,6 +60,7 @@
 
                 /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
                 form: {
+                  rwlx:'',
                   gwid:'',
                   fzrid:'',
                             id:'',

src/views/riskPrecontrol/screeningCriteria/index.vue

@@ -21,18 +21,9 @@
               <div class="search-item">
                 <span class="search-span">岗位:</span>
                   <RelSelect  linkage :linkParams="{gsid:queryParams.gsid}" style="width: 100%;"  src='/aqgl/jcsj/scgw/query' clearable :match="{value:'id',label:'name'}" v-model='queryParams.gwid' ></RelSelect>
-         <!--         <el-select v-model="queryParams.gwid" clearable placeholder="请选择">
-                    <el-option
-                      v-for="item in doQueryScgw"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id">
-                    </el-option>
-                  </el-select> -->
               </div>
           </el-col>
 
-
         </el-row>
       </div>
       <!-- 按钮操作-->
@@ -42,7 +33,6 @@
         <AddButton ref="add" :app='app'></AddButton>
         <CopyButton ref="copy" :app='app'></CopyButton>
         <EditButton ref="edit" :app='app'></EditButton>
-        <AttachFileButton :app='app'></AttachFileButton>
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
         <!-- 额外按钮-->

src/views/riskPrecontrol/shlx/index.vue

@@ -19,7 +19,7 @@
 			<AddButton ref="add" :app='app'></AddButton>
 			<CopyButton ref="copy" :app='app'></CopyButton>
 			<EditButton ref="edit" :app='app'></EditButton>
-			<AttachFileButton  :app='app' ></AttachFileButton>
+			
 			<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton>
 			<!-- 额外按钮-->