大溪沟调整

src/views/contingency/contingencystudy/index.vue

@@ -26,6 +26,13 @@
                 :match="{value:'id',label:'name'}" v-model='queryParams.yldj'></RelSelect>
             </div>
           </el-col>
+          <el-col :span="6" class="search-col">
+            <div class="search-item">
+              <span class="search-span">年度:</span>
+              <RelYearSelect style="width: 100%;"
+                 v-model='queryParams.year'></RelYearSelect>
+            </div>
+          </el-col>
 
         </el-row>
       </div>
@@ -85,7 +92,15 @@
     name: 'appVersion',
 
     /* 初始额外赋值*/
+    created() {
+      this.queryParams={
+            ...this.queryParams,
+            ...this.$route.query
+          }
+    },
     async mounted() {
+
+
       this.$refs['TablePager'].pageQuery({
         setFirstCurrent: true
       })
@@ -102,6 +117,7 @@
         baseUrl: '/aqgl/yjgl/yjyljh',
         /* 查询参数*/
         queryParams: {
+          year:'',
           yldj: '',
           info: '',
           ksrq: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,

src/views/contingency/contingencystudy/report.vue

 <template>
 	<div class="min_full" style="height: 72vh;overflow: auto;" v-show='queryParams.yljhid' >
 		<!-- 查询条件-->
-   <!-- <div class="search" v-condition>
+   <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>
-            <el-input></el-input>
-          </div>
-        </el-col>
-        <el-col :span="6" class="search-col">
-          <div class="search-item">
-            <span class="search-span">开始日期:</span>
-            <el-date-picker></el-date-picker>
-          </div>
-        </el-col>
-        <el-col :span="6" class="search-col">
-          <div class="search-item">
-            <span class="search-span">结束日期:</span>
-            <el-date-picker></el-date-picker>
+            <span class="search-span">月份:</span>
+            <el-select style="width: 100%;" clearable v-model="queryParams.month" placeholder="请选择">
+              <el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
+              </el-option>
+            </el-select>
           </div>
         </el-col>
       </el-row>
-    </div> -->
+    </div>
 		<!-- 按钮操作-->
 		<el-row class="tool-bar">
 			<PrintButton :app='app'></PrintButton>
@@ -41,7 +32,7 @@
 		</el-row>
 		<!-- 表格-->
 		<div class="tablePagers">
-			<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
+			<TablePager @getData='getData' :ref="'TablePager'"   :rowClass='rowClass' :app='app' :query='query' @selectItem='selectItem'
 						@getRow='getRow'>
 
 			</TablePager>
@@ -69,10 +60,13 @@
 
 		/* 初始额外赋值*/
 		async mounted() {
-		this.$refs['TablePager'].pageQuery()
+    this.queryParams.month=this.$route.query.month
+
+		// this.$refs['TablePager'].pageQuery()
 	},
 	data() {
 		return {
+
 			/*需要的额外参数 */
 			showDialog: false,
 			DialogName: '',
@@ -82,10 +76,19 @@
 			baseUrl: 'aqgl/yjgl/yjyl',
 			/* 查询参数*/
 			queryParams: {
-        yljhid: ''
+        yljhid: '',
+        month:''
 			},
 			/* 表格标题对应参数*/
       tableTitle: [
+        {label:"状态", prop: "zt",width:80,formatter(row,c,v){
+          if( row.attachcount>0){
+            return '完成'
+          }else{
+            return '未完成'
+          }
+        }},
+         {label: "月份", prop: "month",width:80},
         {label: "演练名称", prop: "name", fieldType: "ftString",width:300},
         {label: "分公司", prop: "gsName", fieldType: "ftString",width:192},
         {label: "演练组织单位", prop: "yldwName", fieldType: "ftString",width:192},
@@ -117,7 +120,13 @@
 		}
 	},
 	methods: {
-
+rowClass({ row, rowIndex }) {
+        if (row.attachcount == 0) {
+          return "warning-row";
+        } else {
+          return "success-row";
+        }
+      },
 		/* 基础查询*/
 		query: doQuery,
 				/* 基础增*/

src/views/train/aqpx/index.vue

@@ -26,6 +26,13 @@
                 :match="{value:'id',label:'name'}" v-model='queryParams.pxdj'></RelSelect>
             </div>
           </el-col>
+          <el-col :span="6" class="search-col">
+            <div class="search-item">
+              <span class="search-span">年度:</span>
+              <RelYearSelect style="width: 100%;"
+                 v-model='queryParams.year'></RelYearSelect>
+            </div>
+          </el-col>
 
         </el-row>
       </div>
@@ -85,6 +92,12 @@
     name: 'aqpx',
 
     /* 初始额外赋值*/
+    created() {
+      this.queryParams={
+            ...this.queryParams,
+            ...this.$route.query
+          }
+    },
     async mounted() {
       this.$refs['TablePager'].pageQuery({
         setFirstCurrent: true

src/views/train/aqpx/report.vue

 <template>
 	<div class="min_full" style="height: 72vh;overflow: auto;" v-show='queryParams.pxjhid' >
 		<!-- 查询条件-->
-   <!-- <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>
-            <el-input></el-input>
-          </div>
-        </el-col>
-        <el-col :span="6" class="search-col">
-          <div class="search-item">
-            <span class="search-span">开始日期:</span>
-            <el-date-picker></el-date-picker>
-          </div>
-        </el-col>
-        <el-col :span="6" class="search-col">
-          <div class="search-item">
-            <span class="search-span">结束日期:</span>
-            <el-date-picker></el-date-picker>
-          </div>
-        </el-col>
-      </el-row>
-    </div> -->
+  <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>
+           <el-select style="width: 100%;" clearable v-model="queryParams.month" placeholder="请选择">
+             <el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
+             </el-option>
+           </el-select>
+         </div>
+       </el-col>
+     </el-row>
+   </div>
 		<!-- 按钮操作-->
 		<el-row class="tool-bar">
 			<PrintButton :app='app'></PrintButton>
@@ -41,7 +32,7 @@
 		</el-row>
 		<!-- 表格-->
 		<div class="tablePagers">
-			<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
+			<TablePager @getData='getData'  :rowClass='rowClass'  :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
 						@getRow='getRow'>
 
 			</TablePager>
@@ -69,7 +60,11 @@
 
 		/* 初始额外赋值*/
 		async mounted() {
-		this.$refs['TablePager'].pageQuery()
+      this.queryParams={
+            ...this.queryParams,
+            ...this.$route.query
+          }
+		// this.$refs['TablePager'].pageQuery()
 	},
 	data() {
 		return {
@@ -82,10 +77,19 @@
 			baseUrl: 'aqgl/pxgl/uaqpx',
 			/* 查询参数*/
 			queryParams: {
-        pxjhid: ''
+        pxjhid: '',
+        month:''
 			},
 			/* 表格标题对应参数*/
       tableTitle: [
+        {label:"状态", prop: "zt",width:80,formatter(row,c,v){
+          if( row.attachcount>0){
+            return '完成'
+          }else{
+            return '未完成'
+          }
+        }},
+        {label: "月份", prop: "month",width:80},
         {label: "培训名称", prop: "name", fieldType: "ftString",width:300},
         {label: "分公司", prop: "gsName", fieldType: "ftString",width:192},
         {label: "培训组织单位", prop: "pxdwName", fieldType: "ftString",width:192},
@@ -117,6 +121,13 @@
 		}
 	},
 	methods: {
+    rowClass({ row, rowIndex }) {
+            if (row.attachcount == 0) {
+              return "warning-row";
+            } else {
+              return "success-row";
+            }
+          },
 
 		/* 基础查询*/
 		query: doQuery,

src/views/train/aqpx/reportEdit.vue

@@ -90,7 +90,18 @@
 
       </el-row>
       <el-row :gutter="20">
-
+        <el-col :span="12">
+        <el-form-item v-rule="{
+              	required: true,
+              	rules:rules
+              }" label="月份" ref="month" prop="month">
+          <!--  <el-input  type="number" :readonly="readonly"  v-model="form.month" ></el-input> -->
+          <el-select style="width: 100%;" v-model="form.month" placeholder="请选择">
+            <el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+         </el-col>
         <el-col :span="12">
           <el-form-item label="培训人数"  ref="pxrs" prop="pxrs">
             <el-input  :readonly="readonly"  v-model="form.pxrs" ></el-input>
@@ -132,6 +143,7 @@
 
         /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
         form: {
+          month:'',
           pxrs:'',
           pxdj:'',
           //ID