页面调整

src/views/daily/activityRecord/index.vue

@@ -2,22 +2,28 @@
 	<div class="min_full">
 
 		<!-- 查询条件-->
-		<div class="search" v-condition>
-			<SearchButton :app='app'></SearchButton>
+	<div class="search" v-condition>
+  		<SearchButton :app='app'></SearchButton>
 			<el-row :gutter="20" class="search-row-1">
-				<el-col :span="8" class="search-col">
-					<div class="search-item">
-						<span class="search-span">日期:</span>
-						 <el-date-picker v-model="queryParams.date" ></el-date-picker>
-					</div>
-				</el-col>
-        <el-col :span="8" class="search-col">
-        	<div class="search-item">
-        		<span class="search-span">部门:</span>
-        		 <RelSelect  src='kzzx/bm/query'  clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
-        	</div>
-        </el-col>
-			</el-row>
+          <el-col :span="6" class="search-col">
+              <div class="search-item">
+                <span class="search-span">开始日期:</span>
+                <el-date-picker 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 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  src='kzzx/bm/query'  clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
+            </div>
+          </el-col>
+      </el-row>
 		</div>
 		<!-- 按钮操作-->
 		<el-row class="tool-bar">
@@ -45,7 +51,6 @@
 </template>
 
 <script>
-	/* 引入需要的接口*/
 	/* 引入需要的接口*/
 	import {
 		doQuery,
@@ -78,48 +83,45 @@
 				baseUrl: '/aqgl/rcgl/aqhd',
 				/* 查询参数*/
 				queryParams: {
-					date: new Date().getTime(),
+					ksrq: '',
+					jsrq: '',
 					bmid: ''
 				},
 			/* 表格标题对应参数*/
 			tableTitle: [
 				{label: "活动日期", prop: "hdrq", fieldType: "ftDateTime"},
-				{label: "频次记录", prop: "pcjl", fieldType: "ftString",width:180},
-				// {label: "组织部门", prop: "bmid", fieldType: "ftString",width:192},
-				{label: "组织部门", prop: "bmName", fieldType: "ftString",width:192},
-				{label: "活动名称", prop: "name", fieldType: "ftString",width:600},
-				{label: "活动内容", prop: "content", fieldType: "ftString",width:600},
-				{label: "活动结论", prop: "hdjl", fieldType: "ftString",width:600},
-				// {label: "备注", prop: "bz", fieldType: "ftString",width:300},
-				// {label: "维护人", prop: "whr", fieldType: "ftString"},
-				// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
-				// {label: "创建人", prop: "cjr", fieldType: "ftString"},
-				// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
+				{label: "频次记录", prop: "pcjl", fieldType: "ftString",width:120},
+				// {label: "组织部门", prop: "bmid", fieldType: "ftString",width:160},
+				{label: "组织部门", prop: "bmName", fieldType: "ftString",width:160},
+				{label: "活动名称", prop: "name", fieldType: "ftString",width:300},
+				{label: "活动内容", prop: "content", fieldType: "ftString",width:300},
+				{label: "活动结论", prop: "hdjl", fieldType: "ftString",width:300},
+			  {label: "备注", prop: "bz", fieldType: "ftString",width:300},
+				{label: "维护人", prop: "whr", fieldType: "ftString"},
+				{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
+				{label: "创建人", prop: "cjr", fieldType: "ftString"},
+				{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
 			]
 		}},
 		methods: {
-      tybz(a) {
-      	let nTy = false
-      	nTy = (a.row.tybz == 'N' ? true : false)
-      	return nTy
-      },
-		query: doQuery,
-				/* 基础增*/
-				apiAdd: doAdd,
-				/* 基础更新*/
-				apiUpdate: doUpdate,
-				/* 删除操作*/
-				apiDelete: doDelete,
-			/* 初始化赋值操作*/
-			init() {
 
-			}
+    		/* 基础查询*/
+    		query: doQuery,
+    				/* 基础增*/
+    				apiAdd: doAdd,
+    				/* 基础更新*/
+    				apiUpdate: doUpdate,
+    				/* 删除操作*/
+    				apiDelete: doDelete,
+    				/* 初始化赋值操作*/
+    				init() {
 
+    		}
+    	},
+    	components: {
+    		Edit,
+    	}
 
-		},
-		components: {
-			Edit,
-		}
 
 
 	}

src/views/daily/holdCertificate/index.vue

@@ -20,7 +20,7 @@
       	<el-col :span="6" class="search-col">
       		<div class="search-item">
       			<span class="search-span">证书状态:</span>
-      			 <RelSelect  src='aqgl/rcgl/ygczxx/init/zt'  clearable :match="{value:'id',label:'name'}" v-model='queryParams.zszt' ></RelSelect>
+      			 <RelSelect  src='aqgl/rcgl/ygczxx/init/zt'  clearable :match="{value:'id',label:'name'}" v-model='queryParams.zt' ></RelSelect>
       		</div>
       	</el-col>
         <el-col :span="6" class="search-col">
@@ -91,11 +91,10 @@ import {
 				baseUrl: '/aqgl/rcgl/ygczxx',
 				/* 查询参数*/
 				queryParams: {
-					zsbh:'',
-          zggh:'',
-          xm:'',
+					code:'',
+          user:'',
           syfw:'',
-          zszt:''
+          zt:''
 
 				},
 				/* 表格标题对应参数*/