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

src/api/daily/queryPerformanceReport.js

+import request from 'common/src/utils/request'
+
+/* 查询 */
+export function doQuery(query) {
+  return request({
+    url: '/aqgl/rcgl/lzbg/queryPerformanceReport',
+    method: 'post',
+    data: query||{}
+  })
+}
+/* 更新 */
+/*export function doUpdate(query) {
+  return request({
+    url: '/aqgl/rcgl/lzrw/update',
+    method: 'post',
+    data: query||{}
+  })
+}*/
+
+/**
+ * 查询履职明细
+ * in:mid
+ * @param query
+ */
+/*
+export function doQueryDtl(query) {
+  return request({
+    url: 'aqgl/rcgl/lzbg/query',
+    method: 'post',
+    data: query||{}
+  })
+}
+export function doUpdateDtl(query) {
+  return request({
+    url: 'aqgl/rcgl/lzbg/update',
+    method: 'post',
+    data: query||{}
+  })
+}
+export function doDeleteDtl(query) {
+  return request({
+    url: 'aqgl/rcgl/lzbg/delete',
+    method: 'post',
+    data: query||{}
+  })
+}
+export function doAddDtl(query) {
+  return request({
+    url: 'aqgl/rcgl/lzbg/add',
+    method: 'post',
+    data: 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||{}
+  })
+}
+*/
+
+export function doInitZt(query) {
+  return request({
+    url: '/qgl/rcgl/lzbg/init/zt',
+    method: 'post',
+    data: query||{}
+  })
+}
+
+
+

src/router/index.js

@@ -752,6 +752,19 @@ export const powerRoutes=[
         name:'performanceReportSet',
         path:"performanceReportSet"
       },
+      {
+        component:'daily/queryPerformanceReport/index',
+        hidden:false,
+        meta:{
+          "title": "履职记录查询",
+          "icon": "",
+          "noCache": false,
+          "link": null,
+          "mkid":905200600,
+        },
+        name:'queryPerformanceReport',
+        path:"queryPerformanceReport"
+      },
 
 
     ]

src/views/daily/maintenanceDuty/edit.vue

@@ -9,6 +9,13 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="频次"  ref="pc" prop="pc">
+                <RelSelect  style="width: 100%;" src='/aqgl/rcgl/lzbg/init/pc' :match="{value:'id',label:'name'}" v-model='form.pc' ></RelSelect>
+              </el-form-item>
+            </el-col>
+          </el-row>
             <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="分类"  ref="flid" prop="flid">
@@ -71,6 +78,7 @@
                         content:'',
                         //维护人编码
                         whrid:'',
+                        pc:'',
                         //维护人
                         whr:'',
                         //维护时间
@@ -83,6 +91,7 @@
                         cjsj:new Date().getTime(),
                         //系统版本
                         sysversion:'',
+
                 },
                 /* form提交时的规则,具体规则参考官网*/
                 rules: {

src/views/daily/maintenanceDuty/index.vue

@@ -91,6 +91,7 @@
 				{label: "分类", prop: "flName", fieldType: "ftString",width:200},
         		{label: "岗位", prop: "scgwName", fieldType: "ftString",width:100},
 				{label: "履职内容", prop: "content", fieldType: "ftString",width:300},
+				{label: "频次", prop: "rwlxName", fieldType: "ftString",width:200},
 				{label: "维护人", prop: "whr", fieldType: "ftString",width:100},
 				{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}
 			]

src/views/daily/performanceReportSet/edit.vue

@@ -196,6 +196,7 @@
                {label: "分类", prop: "flName", fieldType: "ftString",width:200},
                		{label: "岗位", prop: "scgwName", fieldType: "ftString",width:180},
                {label: "履职内容", prop: "content", fieldType: "ftString",width:300},
+                  {label: "频次", prop: "rwlxName", fieldType: "ftString",width:200},
                {label: "维护人", prop: "whr", fieldType: "ftString",width:100},
                {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}
                 ]

src/views/daily/performanceReportSet/selecter.vue

@@ -105,6 +105,7 @@
           // info: ''
         },
       tableTitle:  [
+        {label: "频次", prop: "rwlxName", fieldType: "ftString",width:200},
       {label: "公司", prop: "gsName", fieldType: "ftString",width: 150},
       {label: "分类", prop: "flName", fieldType: "ftString",width:200},
       		{label: "岗位", prop: "scgwName", fieldType: "ftString",width:180},

src/views/daily/queryPerformanceReport/index.vue

@@ -5,28 +5,34 @@
 		<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></el-select>
-					</div>
-				</el-col>
+        <el-col :span="6" class="search-col">
+          <div class="search-item">
+            <span class="search-span">人员信息:</span>
+            <el-input v-model='queryParams.ryxx' ></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>
+        		 <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-date-picker></el-date-picker>
+        		 <el-date-picker value-format="timestamp" v-model='queryParams.jsrq'></el-date-picker>
         	</div>
         </el-col>
+        <el-col :span="6" 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">
         		<span class="search-span">状态:</span>
-        		 <el-select></el-select>
+        		 <RelSelect src='aqgl/rcgl/lzbg/init/zt' clearable :match="{value:'id',label:'name'}" v-model='queryParams.zt'></RelSelect>
         	</div>
         </el-col>
 			</el-row>
@@ -34,13 +40,13 @@
 		<!-- 按钮操作-->
 		<el-row class="tool-bar">
 			<PrintButton :app='app'></PrintButton>
-			<ViewButton ref="view" :app='app'></ViewButton>
-			<AddButton ref="add" :app='app'></AddButton>
+		<!--	<ViewButton ref="view" :app='app'></ViewButton>-->
+			<!--<AddButton ref="add" :app='app'></AddButton>
 			<CopyButton ref="copy" :app='app'></CopyButton>
 			<EditButton ref="edit" :app='app'></EditButton>
-      <AttachFileButton  :app='app' ></AttachFileButton>
+      <AttachFileShow :delButton='false' :addButton='false' :app='app'></AttachFileShow>
 			<FieldButton  :app='app'></FieldButton>
-			<ExcelButton :app='app'></ExcelButton>
+			<ExcelButton :app='app'></ExcelButton>-->
 			<!-- 额外按钮-->
 			<!-- 表头设置 -->
 
@@ -49,8 +55,8 @@
 		<!-- 表格-->
 		<div class="tablePagers">
 			<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
-				@getRow='getRow'>
-        <template slot="tabCustom">
+				@getRow='getRow' :del-button="false">
+        <!--<template slot="tabCustom">
         	<el-table-column label="启用/停用" width="90" header-align="center" >
         		<template slot-scope="scope">
         			<el-switch @click.native="setEnable(scope.row.id)" :value='tybz(scope)' style="width: 80px;justify-content: center;"
@@ -58,7 +64,7 @@
         			</el-switch>
         		</template>
         	</el-table-column>
-        </template>
+        </template>-->
 
 			</TablePager>
 		</div>
@@ -68,15 +74,10 @@
 <script>
 	/* 引入需要的接口*/
 	import {
-		QueryKzzxRole,
-		QueryApptype,
-		AddKzzxRole,
-		DeleteKzzxRole,
-		UpdateKzzxRole,
-		QtKzzxRole
-	} from "common/src/api/system/dmgSystem.js";
+    doQuery
+	} from "/src/api/daily/queryPerformanceReport.js";
 	/* edit页面*/
-	import Edit from './edit'
+	/*import Edit from './edit'*/
 	import {
 		tableMixin
 	} from 'common'
@@ -97,77 +98,51 @@
 				type: '',
 				DialogTitle: '',
 				/* 基础url*/
-				baseUrl: 'kzzx/role',
+				baseUrl: '/aqgl/rcgl/lzbg',
 				/* 查询参数*/
 				queryParams: {
-					ksrq: '',
-					jsrq: ''
+          ksrq: new Date().getTime()-1000*60*60*24*30,
+          jsrq: new Date().getTime(),
+          gsid:'',
+          zt:'',
+          ryxx:''
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [
-          {
-						prop: 'whsj',
-						label: '分类',
-						...this.$common('ftDateTime')
-					},
-					{
-						prop: 'whsj',
-						label: '履职标准',
-						...this.$common('ftDateTime')
-					},
-          {
-          	prop: 'whsj',
-          	label: '履职内容',
-          	...this.$common('ftDateTime')
-          },
-          {
-          	prop: 'whsj',
-          	label: '人员',
-          	...this.$common('ftDateTime')
-          },
-          {
-          	prop: 'whsj',
-          	label: '推送时间',
-          	...this.$common('ftDateTime')
-          },
-          {
-          	prop: 'whsj',
-          	label: '生成方式',
-          	...this.$common('ftDateTime')
-          },
-          {
-          	prop: 'whsj',
-          	label: '状态',
-          	...this.$common('ftDateTime')
-          },
-          {
-          	prop: 'whsj',
-          	label: '完成时间',
-          	...this.$common('ftDateTime')
-          }
+          {label: "履职分类", prop: "flName", fieldType: "ftString",width:192},
+          {label: "履职内容", prop: "content", fieldType: "ftString",width:300},
+          {label: "履职人员", prop: "ryName", fieldType: "ftString",width:192},
+          {label: "履职日期", prop: "lzrq", fieldType: "ftDateTime"},
+          {label: "履职信息", prop: "lzxx", fieldType: "ftString"},
+          {label: "单据来源", prop: "lyName", fieldType: "ftString",width:148},
+          {label: "公司", prop: "gsName", fieldType: "ftString",width:148},
+          {label: "状态", prop: "ztName", fieldType: "ftString",width:80},
+          {label: "备注", prop: "bz", fieldType: "ftString"},
+          {label: "维护人", prop: "whr", fieldType: "ftString"},
+          {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
 				]
 			}
 		},
 		methods: {
-      tybz(a) {
+     /* tybz(a) {
       	let nTy = false
       	nTy = (a.row.tybz == 'N' ? true : false)
       	return nTy
-      },
+      },*/
 			/* 基础查询*/
-			query: QueryKzzxRole,
+			query: doQuery,
 			/* 基础增*/
-			apiAdd: AddKzzxRole,
-			/* 基础更新*/
+		/*	apiAdd: AddKzzxRole,
+			/!* 基础更新*!/
 			apiUpdate: UpdateKzzxRole,
-			/* 删除操作*/
-			apiDelete: DeleteKzzxRole,
+			/!* 删除操作*!/
+			apiDelete: DeleteKzzxRole,*/
 			/* 初始化赋值操作*/
 			init() {
 
 			},
 			/* 启用停用*/
-			setEnable(id) {
+			/*setEnable(id) {
 				this.$confirm('是否启用/停用该角色, 是否继续?', '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
@@ -186,18 +161,17 @@
 					})
 				})
 
-			}
+			}*/
 
 
 		},
 		components: {
-			Edit,
-		}
+			/*Edit,*/
+		},
 
 
 	}
 </script>
 
 <style scoped>
-
 </style>