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

src/api/daily/lzsz.js

+import request from 'common/src/utils/request'
+
+export function doQuery(query) {
+  return request({
+    url: '/aqgl/rcgl/lzsz/query',
+    method: 'post',
+    data: query||{}
+  })
+}
+/* 更新 */
+export function doUpdate(query) {
+  return request({
+    url: '/aqgl/rcgl/lzsz/update',
+    method: 'post',
+    data: query||{}
+  })
+}
+export function doAdd(query) {
+  return request({
+    url: '/aqgl/rcgl/lzsz/add',
+    method: 'post',
+    data: query||{}
+  })
+}
+export function doDelete(query) {
+  return request({
+    url: '/aqgl/rcgl/lzsz/delete',
+    method: 'post',
+    data: query||{}
+  })
+}
+// 细节
+export function doQueryDetail(query) {
+  return request({
+    url: '/aqgl/rcgl/lzsz/query/detail',
+    method: 'post',
+    data: query||{}
+  })
+}
+/* 启动 */
+export function start(query) {
+  return request({
+    url: `aqgl/rcgl/lzsz/start/${query}`,
+    method: 'post',
+    data: {}
+  })
+}
+
+
+/* 停止 */
+export function stop(query) {
+  return request({
+    url: `aqgl/rcgl/lzsz/stop/${query}`,
+    method: 'post',
+    data:{}
+  })
+}
+
+
+/* 立即执行 */
+export function excute(query) {
+  return request({
+    url: `aqgl/rcgl/lzsz/execute/${query}`,
+    method: 'post',
+    data:{}
+  })
+}

src/views/daily/fcghd/edit.vue

@@ -4,17 +4,11 @@
         <el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
             <el-row :gutter="20">
                 <el-col :span="12">
-                    <el-form-item label="分类ID"  ref="flid" prop="flid">
-                        <el-input :readonly="readonly"  v-model="form.flid" ></el-input>
+                    <el-form-item label="分类"  ref="flid" prop="flid">
+                       <!-- <el-input :readonly="readonly"  v-model="form.flid" ></el-input> -->
+                       <RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/fcghd/init/zylx' :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
-                    <el-form-item label="活动内容"  ref="hdnr" prop="hdnr">
-                        <el-input :readonly="readonly"  v-model="form.hdnr" ></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="20">
                 <el-col :span="12">
                     <el-form-item label="活动日期"  ref="hdrq" prop="hdrq">
                         <el-date-picker  style="width: 100%;" :readonly="readonly" type="date"
@@ -22,23 +16,38 @@
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                 <el-col :span="24">
+                <el-form-item label="公司"  ref="gsid" prop="gsid">
+                   <!-- <el-input :readonly="readonly"  v-model="form.flid" ></el-input> -->
+                   <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
+                </el-form-item>
+                </el-col>
+               
+
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                  <el-form-item label="活动内容"  ref="hdnr" prop="hdnr">
+                      <el-input type="textarea" :readonly="readonly"  v-model="form.hdnr" ></el-input>
+                  </el-form-item>
+              </el-col>
+               <!-- <el-col :span="12">
                     <el-form-item label="附件数"  ref="attachcount" prop="attachcount">
                         <el-input :readonly="readonly"  v-model="form.attachcount" ></el-input>
                     </el-form-item>
-                </el-col>
+                </el-col> -->
             </el-row>
             <el-row :gutter="20">
-                <el-col :span="12">
+                <el-col :span="24">
                     <el-form-item label="备注"  ref="bz" prop="bz">
                         <el-input :readonly="readonly"  v-model="form.bz" ></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+              <!--  <el-col :span="12">
                     <el-form-item label="系统版本"  ref="sysversion" prop="sysversion">
                         <el-input :readonly="readonly"  v-model="form.sysversion" ></el-input>
                     </el-form-item>
-                </el-col>
+                </el-col> -->
             </el-row>
         </el-form>
     </RelDialog>
@@ -65,6 +74,7 @@
 
                 /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
                 form: {
+                  gsid:'',
                         //ID
                         id:'',
                         //分类ID
@@ -107,5 +117,3 @@
 <style scoped lang="scss">
 
 </style>
-
-

src/views/daily/fcghd/index.vue

 <template>
-	<div class="min_full">
+  <div style="display: flex;">
+    <div class="min_full" style="width: 200px;border-right: 0px;">
+    			<TreeBase :app='app' :dgtype='4' @selected='selectedTree'></TreeBase>
+    </div>
+	<div class="min_full" style="width: calc(100% - 200px)"  >
 		<!-- 查询条件-->
 		<div class="search" v-condition>
 			<SearchButton :app='app'></SearchButton>
@@ -10,6 +14,12 @@
 						<el-input v-model="queryParams.info"></el-input>
 					</div>
 				</el-col>
+        <el-col :span="12" class="search-col">
+        	<div class="search-item">
+        		<span class="search-span">分类:</span>
+        		<RelSelect  style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/fcghd/init/zylx' :match="{value:'id',label:'name'}" v-model='queryParams.flid' ></RelSelect>
+        	</div>
+        </el-col>
 			</el-row>
 		</div>
 		<!-- 按钮操作-->
@@ -35,11 +45,15 @@
 			</TablePager>
 		</div>
 	</div>
+  </div>
 </template>
 
 
 <script>
 	/* 引入需要的接口*/
+    import {
+     queryGsTree
+    } from "@/api/train/planning.js";
 	import {
 		doQuery,
 		doAdd,
@@ -57,10 +71,16 @@
 
 		/* 初始额外赋值*/
 		async mounted() {
-		this.$refs['TablePager'].pageQuery()
+
 	},
 	data() {
 		return {
+      	/* 树的标题 */
+      				treeTitle: '公司列表',
+      				treeDefaultProps: {
+      					children: 'children',
+      					label: 'bmmc'
+      				},
 			/*需要的额外参数 */
 			showDialog: false,
 			DialogName: '',
@@ -70,11 +90,12 @@
 			baseUrl: '/aqgl/rcgl/fcghd',
 			/* 查询参数*/
 			queryParams: {
-				info: ''
+				info: '',
+        flid:''
 			},
 			/* 表格标题对应参数*/
 			tableTitle: [
-				{label: "分类ID", prop: "flid", fieldType: "ftString",width:60},
+				{label: "分类", prop: "flName", fieldType: "ftString",width:60},
 				{label: "活动内容", prop: "hdnr", fieldType: "ftString",width:300},
 				{label: "活动日期", prop: "hdrq", fieldType: "ftDateTime"},
 				{label: "附件数", prop: "attachcount", fieldType: "int"},
@@ -87,7 +108,11 @@
 		}
 	},
 	methods: {
-
+    selectedTree(e){
+    				this.queryParams.gsid=e.id||'root'
+    				this.$refs['TablePager'].pageQuery()
+    			},
+    apiTreeQuery: queryGsTree,
 		/* 基础查询*/
 		query: doQuery,
 				/* 基础增*/
@@ -112,4 +137,3 @@
 <style scoped>
 
 </style>
-