瀏覽代碼

新建分支:样式改造

chengbeibei 9 月之前
父節點
當前提交
2147c54c36

+ 1 - 1
src/components/layouts/TabLayout.vue

@@ -18,7 +18,7 @@
         <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
       </a-tab-pane>
     </a-tabs>
-    <div style="margin: 12px 12px 0; height: calc(100% - 85px); overflow-y: auto;">
+    <div :style="{margin: '12px 12px 0', height: multipage ? 'calc(100% - 85px)' : 'calc(100% - 25px)', 'overflow-y': 'auto'}">
       <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
       <keep-alive v-if="multipage">
         <router-view v-if="reloadFlag"/>

+ 2 - 1
src/store/index.js

@@ -7,6 +7,7 @@ import permission from './modules/permission'
 import enhance from './modules/enhance'
 import online from './modules/online'
 import getters from './getters'
+import menu from './menuChild'
 
 Vue.use(Vuex)
 
@@ -17,9 +18,9 @@ export default new Vuex.Store({
     permission,
     enhance,
     online,
+    menu
   },
   state: {
-
   },
   mutations: {
 

+ 0 - 0
src/store/menu


+ 22 - 0
src/store/menuChild.js

@@ -0,0 +1,22 @@
+const menu =  {
+  state: {
+    menuList: {},
+  },
+  mutations: {
+    setMenu(state, item) {
+      console.log("setMenu");
+      state.menuList[item.name.split('-')[0]] = item.children;
+      console.log("state.menuList", state.menuList);
+    },
+  },
+  getter: {
+    // 获取
+    getMenuList: (state) => (key) => {
+      return state.menuList[key];
+    },
+  }
+
+
+}
+
+export default menu;

+ 10 - 2
src/utils/util.js

@@ -3,6 +3,7 @@ import * as api from '@/api/api'
 import { isURL } from '@/utils/validate'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import onlineCommons from '@jeecg/antd-online-mini'
+import store from '../store'
 
 export function timeFix() {
   const time = new Date()
@@ -107,7 +108,7 @@ function  generateChildRouters (data) {
     let component = "";
     if(item.component.indexOf("layouts")>=0){
       component = "components/"+item.component;
-    }else{
+    } else {
       component = "views/"+item.component;
     }
 
@@ -164,8 +165,14 @@ function  generateChildRouters (data) {
       menu.alwaysShow = true;
       menu.redirect = menu.path;
     }
-    if (item.children && item.children.length > 0) {
+    /*if (item.children && item.children.length > 0) {
       menu.children = [...generateChildRouters( item.children)];
+    }*/
+    if (item.children && item.children.length > 0) {
+        menu.children = [...generateChildRouters( item.children)];
+      if (item.path.indexOf('hideChildren') > -1) {
+        store.commit('setMenu', item);
+      }
     }
     //--update-begin----author:scott---date:20190320------for:根据后台菜单配置,判断是否路由菜单字段,动态选择是否生成路由(为了支持参数URL菜单)------
     //判断是否生成路由
@@ -174,6 +181,7 @@ function  generateChildRouters (data) {
       //console.log(' 不生成路由 item.path:  '+item.path);
     }else{
       routers.push(menu);
+      // console.log("store.menu", this.$store.menu.menuList);
     }
     //--update-end----author:scott---date:20190320------for:根据后台菜单配置,判断是否路由菜单字段,动态选择是否生成路由(为了支持参数URL菜单)------
   }

+ 349 - 0
src/views/enterpriseInfo/components/enterInfoSubmit.vue

@@ -0,0 +1,349 @@
+  <template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row v-has="'cont:cxl'"  :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="单位名称">
+              <a-input placeholder="请输入单位名称" v-model="queryParam.qymc"></a-input>
+            </a-form-item>
+          </a-col>
+         <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="企业类型">
+              <j-dict-select-tag placeholder="请输入企业类型" dict-code="qylx" v-model="queryParam.qylx" ></j-dict-select-tag>
+              &lt;!&ndash;<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>&ndash;&gt;
+            </a-form-item>
+          </a-col>-->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否涉及省内土地资产">
+              <j-dict-select-tag placeholder="请选择是否涉及省内土地资产" v-model="queryParam.sfsjtdzc" dictCode="sfsjtdzc"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否上报">
+              <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+             <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>-->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button v-has="'cont:add'" v-if='!this.dataSource.length>0' @click="handleAdd" type="primary" icon="plus">补充单位信息</a-button>
+    <a-button type="primary" icon="download" @click="handleExportXls('单位信息')">导出</a-button>
+      <!--  <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      &lt;!&ndash; 高级查询区域 &ndash;&gt;
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>-->
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+        <template>
+          <span slot="tags" slot-scope="text,record">
+            <a-tag v-if="record.sfsb_dictText === '未上报'" color="#ddd">
+              {{ record.sfsb_dictText }}
+            </a-tag>
+            <a-tag v-else-if="record.sfsb_dictText === '已上报未审核'" color="#2db7f5">
+              {{ record.sfsb_dictText }}
+            </a-tag>
+            <a-tag v-else-if="record.sfsb_dictText === '审核中'" color="green">
+              {{ record.sfsb_dictText }}
+            </a-tag>
+            <a-tag v-else-if="record.sfsb_dictText === '已审核'" color="#87d068">
+              {{ record.sfsb_dictText }}
+            </a-tag>
+            <a-tag v-else="record.sfsb_dictText === '错误退回'" color="#f50">
+              {{ record.sfsb_dictText }}
+            </a-tag>
+          </span>
+        </template>
+        <span slot="action" slot-scope="text, record">
+                        <a-space>
+                          <a-button v-has="'cont:bj'"  v-if="record.sfsb===0" @click="handleEdit(record)">编辑</a-button>
+                               <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
+                          <a-popconfirm title="上报后将不可修改,是否确认上报?" @confirm="() => handleSB(record.id)">
+                    <a-button v-has="'cont:sb'"   v-if="record.sfsb===0">上报</a-button>
+                          </a-popconfirm>
+                          <a-popconfirm title="是否撤回?" @confirm="() => handleCH(record.id)">
+                  <a-button v-has="'cont:ch'"  v-if="record.sfsb===1" >撤回</a-button>
+                          </a-popconfirm>
+                          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a-button  v-has="'cont:sc'" v-if="record.sfsb===0" type='danger'>删除</a-button>
+                </a-popconfirm>
+
+                        </a-space>
+        </span>
+
+       <!-- <span slot="action" slot-scope="text, record">
+          <a-space>
+            <a-button @click="handleEdit(record)">编辑</a-button>
+            <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
+          </a-space>-->
+         <!-- <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+               &lt;!&ndash; <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>&ndash;&gt;
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>-->
+        <!--  </span>-->
+
+      </a-table>
+    </div>
+
+    <qc-qyxx-modal ref="modalForm" @ok="modalFormOk"></qc-qyxx-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import QcQyxxModal from '../../modules/QcQyxxModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import {getAction} from "../../../api/manage";
+
+  export default {
+    name: 'QcQyxxList',
+    mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      //是否是省属企业;默认是,false为省直单位
+      isCompany: {
+        type: Boolean,
+        default: true,
+        required: true
+      }
+
+    },
+    components: {
+      QcQyxxModal
+    },
+    data () {
+      return {
+        description: '单位信息填报',
+        isShow: true,
+        // 表头
+        dl:false,
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'企业编码',
+            align:"center",
+            dataIndex: 'qybm',
+            hidden: isShow
+          },
+          {
+            title:'单位名称',
+            align:"center",
+            dataIndex: 'qymc'
+          },
+          {
+            title:'统一社会信用编码',
+            align:"center",
+            dataIndex: 'tyshxybm'
+          },
+          {
+            title:'企业类型',
+            align:"center",
+            dataIndex: 'qylx_dictText',
+            hidden: isShow
+          },
+          {
+            title:'国有资产持股比例',
+            align:"center",
+            dataIndex: 'gyzccgbl',
+            hidden: isShow
+          },
+          {
+            title:'是否涉及省内土地资产',
+            align:"center",
+            dataIndex: 'sfsjtdzc'
+          },
+          {
+            title:'联系人',
+            align:"center",
+            dataIndex: 'tbr'
+          },
+          {
+            title:'联系人手机号',
+            align:"center",
+            dataIndex: 'sjh'
+          },
+          {
+            title:'是否上报',
+            align:"center",
+            dataIndex: 'sfsb_dictText',
+            scopedSlots: { customRender: 'tags' },
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+
+        url: {
+          list: isShow ? "/qcsb.qyxx/qcQyxx/list" : "/qcsb.qyxx/qcQyxx/list5",
+          delete: "/qcsb.qyxx/qcQyxx/delete",
+          deleteBatch: "/qcsb.qyxx/qcQyxx/deleteBatch",
+          exportXlsUrl: "/qcsb.qyxx/qcQyxx/exportXls",
+          importExcelUrl: isShow ? "/qcsb.qyxx/qcQyxx/exportXls" : "/qcsb.qyxx/qcQyxx/exportXls2",
+          sfsb:"/qcsb.qyxx/qcQyxx/sfsb",
+          sfch:"/qcsb.qyxx/qcQyxx/sfch"
+
+        },
+        dl:'',
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    beforeCreate() {
+      console.log("isShow", this.isShow);
+      console.log("isCompany", this.isCompany);
+      this.isShow = this.isCompany;
+      console.log("isShow", this.isShow);
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    mounted() {
+      this.show()
+    },
+    methods: {
+      show(){
+        getAction("/qcsb.qyxx/qcQyxx/dlr").then(res => {
+          if (res.success) {
+            if(res.result=='gzw'){
+              this.dl=true
+            }
+          }
+        })
+      }
+      ,
+      handleSB(id){
+        getAction(this.url.sfsb,{id:id}).then(res => {
+          if (res.success) {
+            this.$message.success('上报成功');
+            this.loadData();
+          }
+        })
+
+      },
+      handleCH(id){
+        getAction(this.url.sfch,{id:id}).then(res => {
+          if (res.success) {
+            this.$message.success('撤回成功');
+            this.loadData();
+          }
+        })
+
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+          fieldList.push({type:'string',value:'qybm',text:'企业编码'})
+        fieldList.push({type:'sel_depart',value:'qymc',text:'用地单位名称'})
+        fieldList.push({type:'string',value:'tyshxybm',text:'统一社会信用编码',dictCode:''})
+        fieldList.push({type:'string',value:'qylx',text:'企业类型',dictCode:'qylx'})
+        fieldList.push({type:'double',value:'gyzccgbl',text:'国有资产持股比例',dictCode:''})
+          fieldList.push({type:'string',value:'sfsjtdzc',text:'是否涉及省内土地资产',dictCode:'sfsjtdzc'})
+          fieldList.push({type:'string',value:'tbr',text:'填报人'})
+          fieldList.push({type:'string',value:'lxdh',text:'固定电话'})
+          fieldList.push({type:'string',value:'fgld',text:'分管领导',dictCode:''})
+          fieldList.push({type:'string',value:'fgldsjh',text:'分管领导手机号',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

+ 105 - 0
src/views/enterpriseInfo/enterAudit.vue

@@ -0,0 +1,105 @@
+<!--单位审核-->
+<template>
+  <div class="content-div">
+    <a-card class="info-submit" :bordered="false">
+        <a-radio-group v-model="defaultValue" button-style="solid" @change="changeContent">
+          <a-radio-button v-for="(item, index) in menus" :key="item.id" :value="item.component" :name="item.name">
+            {{ item.meta.title }}
+          </a-radio-button>
+        </a-radio-group>
+    </a-card>
+    <a-card :bordered="false">
+      <!--省属企业信息待审核-->
+      <company-audit v-show="'qcsb/qyxx/QcQyxxList1' == defaultValue"></company-audit>
+      <!--省直单位信息待审核-->
+      <depart-audit v-show="'sydwqcsb/sydwxx/QcQyxxList1' == defaultValue"></depart-audit>
+      <!--省属企业信息已审核-->
+      <company-approved v-show="'qcsb/qyxx/QcQyxxList2' == defaultValue"></company-approved>
+      <!--省直单位信息已审核-->
+      <depart-approved v-show="'sydwqcsb/sydwxx/QcQyxxList2' == defaultValue"></depart-approved>
+
+    </a-card>
+  </div>
+</template>
+
+
+<script>
+import companyAudit from '../qcsb/qyxx/QcQyxxList1.vue'
+import departAudit from '../sydwqcsb/sydwxx/QcQyxxList1.vue'
+import companyApproved from '../qcsb/qyxx/QcQyxxList2.vue'
+import departApproved from '../sydwqcsb/sydwxx/QcQyxxList2.vue'
+
+
+export default {
+  name: 'enterAudit',
+  components: {
+    companyAudit,
+    departAudit,
+    companyApproved,
+    departApproved,
+
+
+  },
+  data() {
+    return {
+      defaultValue: '',
+      menus: [],
+
+    }
+  },
+  created() {
+    this.menus = this.$store.state.menu.menuList['dwsh'];
+    this.defaultValue = this.menus.length > 0 ? this.menus[0].component : '';
+    console.log("landInfo...", this.menus);
+  },
+  methods: {
+    changeContent(key) {
+      console.log(key);
+    },
+  }
+
+}
+</script>
+
+<style scoped>
+.content-div {
+  height: 100%;
+}
+.ant-card:not(:last-child) {
+  margin-bottom: 10px;
+}
+.ant-card:last-child {
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+</style>
+<style lang="less" scoped>
+.info-submit {
+  & ::v-deep > .ant-card-body {
+    padding: 14px 24px;
+  }
+  &::v-deep .ant-radio-button-wrapper {
+    //border: 1px solid ;
+    border-radius: 4px;
+    padding-left: 25px;
+    padding-right: 25px;
+    //border-left: 1px;
+    border: 1px solid @primary-color;
+    margin-left: 15px;
+    color: @primary-color;
+  }
+  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
+    width: 0px;
+  }
+  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    color: #fff;
+  }
+}
+.content-div {
+  &::v-deep .ant-card:last-child .ant-card-body {
+    padding: 10px 24px 0;
+  }
+
+}
+
+</style>

+ 110 - 0
src/views/enterpriseInfo/infoSubmit.vue

@@ -0,0 +1,110 @@
+<!--单位信息填报-->
+<template>
+  <div class="content-div">
+    <a-card class="info-submit" :bordered="false">
+        <a-radio-group v-model="defaultValue" button-style="solid" @change="changeContent">
+          <a-radio-button v-for="(item, index) in menus" :key="item.id" :value="item.component" :name="item.name">
+            {{ item.meta.title }}
+          </a-radio-button>
+        </a-radio-group>
+    </a-card>
+    <a-card :bordered="false">
+      <!--省直单位信息填报-->
+<!--      <enter-info-submit v-show="'sydwqcsb/sydwxx/QcQyxxList' == defaultValue" :is-company="false"></enter-info-submit>-->
+      <dwxxtb v-show="'sydwqcsb/sydwxx/QcQyxxList' == defaultValue"></dwxxtb>
+      <!--省属企业信息填报-->
+<!--      <enter-info-submit v-show="'qcsb/qyxx/QcQyxxList' == defaultValue" :is-company="true"></enter-info-submit>-->
+      <yddwxxtb v-show="'qcsb/qyxx/QcQyxxList' == defaultValue"></yddwxxtb>
+      <!--退回省属企业信息填报-->
+      <thssqyxx v-show="'qcsb/qyxx/QcQyxxList4' == defaultValue"></thssqyxx>
+      <!--退回省直单位信息填报-->
+      <thszdwxx v-show="'sydwqcsb/sydwxx/QcQyxxList4' == defaultValue"></thszdwxx>
+
+    </a-card>
+  </div>
+</template>
+
+
+<script>
+import dwxxtb from '../sydwqcsb/sydwxx/QcQyxxList.vue'
+import yddwxxtb from '../qcsb/qyxx/QcQyxxList.vue'
+import thssqyxx from '../qcsb/qyxx/QcQyxxList4.vue'
+import thszdwxx from '../sydwqcsb/sydwxx/QcQyxxList4.vue'
+
+import enterInfoSubmit from './components/enterInfoSubmit.vue'
+
+
+export default {
+  name: 'infoSubmit',
+  components: {
+    dwxxtb,
+    yddwxxtb,
+    thssqyxx,
+    thszdwxx,
+
+    enterInfoSubmit,
+
+  },
+  data() {
+    return {
+      defaultValue: '',
+      menus: [],
+
+    }
+  },
+  created() {
+    this.menus = this.$store.state.menu.menuList['dwxx'];
+    this.defaultValue = this.menus.length > 0 ? this.menus[0].component : '';
+    console.log("infoSubmit...", this.menus);
+  },
+  methods: {
+    changeContent(key) {
+      console.log(key);
+    },
+  }
+
+}
+</script>
+
+<style scoped>
+.content-div {
+  height: 100%;
+}
+.ant-card:not(:last-child) {
+  margin-bottom: 10px;
+}
+.ant-card:last-child {
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+</style>
+<style lang="less" scoped>
+.info-submit {
+  & ::v-deep > .ant-card-body {
+    padding: 14px 24px;
+  }
+  &::v-deep .ant-radio-button-wrapper {
+    //border: 1px solid ;
+    border-radius: 4px;
+    padding-left: 25px;
+    padding-right: 25px;
+    //border-left: 1px;
+    border: 1px solid @primary-color;
+    margin-left: 15px;
+    color: @primary-color;
+  }
+  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
+    width: 0px;
+  }
+  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    color: #fff;
+  }
+}
+.content-div {
+  &::v-deep .ant-card:last-child .ant-card-body {
+    padding: 10px 24px 0;
+  }
+
+}
+
+</style>

+ 118 - 0
src/views/infoSearch/infoFeedBack.vue

@@ -0,0 +1,118 @@
+<!--地块信息填报-->
+<template>
+  <div class="content-div">
+    <a-card class="info-submit" :bordered="false">
+        <a-radio-group v-model="defaultValue" button-style="solid" @change="changeContent">
+          <a-radio-button v-for="(item, index) in menus" :key="item.id" :value="item.component" :name="item.name">
+            {{ item.meta.title }}
+          </a-radio-button>
+        </a-radio-group>
+    </a-card>
+    <a-card :bordered="false">
+      <!--企业问题反馈-->
+      <problem-feed-back v-show="'qcsb/qywtfk/QcQywtfkList' == defaultValue"></problem-feed-back>
+      <!--企业相关问题待审核-->
+      <problem-audit v-show="'qcsb/qywtfk/QcQywtfkList1' == defaultValue"></problem-audit>
+      <!--企业相关问题已审核-->
+      <problem-approved v-show="'qcsb/qywtfk/QcQywtfkList2' == defaultValue"></problem-approved>
+      <!--退回企业问题-->
+      <back-problem v-show="'qcsb/qywtfk/QcQywtfkList4' == defaultValue"></back-problem>
+      <!--企业注册待审核-->
+      <register-audit v-show="'qcsb/qywtfk/QcQywtfkList_qyzc' == defaultValue"></register-audit>
+      <!--企业注册已审核-->
+      <register-approved v-show="'qcsb/qywtfk/QcQywtfkList_qyzc2' == defaultValue"></register-approved>
+      <!--退回企业注册-->
+      <back-register v-show="'qcsb/qywtfk/QcQywtfkList_qyzc4' == defaultValue"></back-register>
+
+    </a-card>
+  </div>
+</template>
+
+
+<script>
+import problemFeedBack from '../qcsb/qywtfk/QcQywtfkList.vue'
+import problemAudit from '../qcsb/qywtfk/QcQywtfkList1.vue'
+import problemApproved from '../qcsb/qywtfk/QcQywtfkList2.vue'
+import backProblem from '../qcsb/qywtfk/QcQywtfkList4.vue'
+import registerAudit from '../qcsb/qywtfk/QcQywtfkList_qyzc.vue'
+import registerApproved from '../qcsb/qywtfk/QcQywtfkList_qyzc2.vue'
+import backRegister from '../qcsb/qywtfk/QcQywtfkList_qyzc4.vue'
+
+
+
+export default {
+  name: 'landInfo',
+  components: {
+    problemFeedBack,
+    problemAudit,
+    problemApproved,
+    backProblem,
+    registerAudit,
+    registerApproved,
+    backRegister,
+
+
+  },
+  data() {
+    return {
+      defaultValue: '',
+      menus: [],
+
+    }
+  },
+  created() {
+    this.menus = this.$store.state.menu.menuList['qyxgwt'];
+    this.defaultValue = this.menus.length > 0 ? this.menus[0].component : '';
+    console.log("landInfo...", this.menus);
+  },
+  methods: {
+    changeContent(key) {
+      console.log(key);
+    },
+  }
+
+}
+</script>
+
+<style scoped>
+.content-div {
+  height: 100%;
+}
+.ant-card:not(:last-child) {
+  margin-bottom: 10px;
+}
+.ant-card:last-child {
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+</style>
+<style lang="less" scoped>
+.info-submit {
+  & ::v-deep > .ant-card-body {
+    padding: 14px 24px;
+  }
+  &::v-deep .ant-radio-button-wrapper {
+    //border: 1px solid ;
+    border-radius: 4px;
+    padding-left: 25px;
+    padding-right: 25px;
+    //border-left: 1px;
+    border: 1px solid @primary-color;
+    margin-left: 15px;
+    color: @primary-color;
+  }
+  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
+    width: 0px;
+  }
+  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    color: #fff;
+  }
+}
+.content-div {
+  &::v-deep .ant-card:last-child .ant-card-body {
+    padding: 10px 24px 0;
+  }
+
+}
+
+</style>

+ 106 - 0
src/views/infoSearch/infoSearch.vue

@@ -0,0 +1,106 @@
+<!--地块信息填报-->
+<template>
+  <div class="content-div">
+    <a-card class="info-submit" :bordered="false">
+        <a-radio-group v-model="defaultValue" button-style="solid" @change="changeContent">
+          <a-radio-button v-for="(item, index) in menus" :key="item.id" :value="item.component" :name="item.name">
+            {{ item.meta.title }}
+          </a-radio-button>
+        </a-radio-group>
+    </a-card>
+    <a-card :bordered="false">
+      <!--省属企业信息管理-->
+      <company-info v-show="'qcsb/qyxx/QcQyxxList_gly' == defaultValue"></company-info>
+      <!--省直单位信息管理-->
+      <depart-info v-show="'sydwqcsb/sydwxx/QcQyxxList_glyy' == defaultValue"></depart-info>
+      <!--省属企业地块管理-->
+      <company-land v-show="'qcsb/QcSsgqzysytdqkList_gly' == defaultValue"></company-land>
+      <!--省直单位地块管理-->
+      <depart-land v-show="'sydwqcsb/QcSsgqzysytdqkList_glyy' == defaultValue"></depart-land>
+
+    </a-card>
+  </div>
+</template>
+
+
+<script>
+import companyInfo from '../qcsb/qyxx/QcQyxxList_gly.vue'
+import departInfo from '../sydwqcsb/sydwxx/QcQyxxList_glyy.vue'
+import companyLand from '../qcsb/QcSsgqzysytdqkList_gly.vue'
+import departLand from '../sydwqcsb/QcSsgqzysytdqkList_glyy.vue'
+
+
+
+export default {
+  name: 'landInfo',
+  components: {
+    companyInfo,
+    departInfo,
+    companyLand,
+    departLand,
+
+
+  },
+  data() {
+    return {
+      defaultValue: '',
+      menus: [],
+
+    }
+  },
+  created() {
+    this.menus = this.$store.state.menu.menuList['xxcx'];
+    this.defaultValue = this.menus.length > 0 ? this.menus[0].component : '';
+    console.log("landInfo...", this.menus);
+  },
+  methods: {
+    changeContent(key) {
+      console.log(key);
+    },
+  }
+
+}
+</script>
+
+<style scoped>
+.content-div {
+  height: 100%;
+}
+.ant-card:not(:last-child) {
+  margin-bottom: 10px;
+}
+.ant-card:last-child {
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+</style>
+<style lang="less" scoped>
+.info-submit {
+  & ::v-deep > .ant-card-body {
+    padding: 14px 24px;
+  }
+  &::v-deep .ant-radio-button-wrapper {
+    //border: 1px solid ;
+    border-radius: 4px;
+    padding-left: 25px;
+    padding-right: 25px;
+    //border-left: 1px;
+    border: 1px solid @primary-color;
+    margin-left: 15px;
+    color: @primary-color;
+  }
+  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
+    width: 0px;
+  }
+  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    color: #fff;
+  }
+}
+.content-div {
+  &::v-deep .ant-card:last-child .ant-card-body {
+    padding: 10px 24px 0;
+  }
+
+}
+
+</style>

+ 106 - 0
src/views/land/landAudit.vue

@@ -0,0 +1,106 @@
+<!--地块信息填报-->
+<template>
+  <div class="content-div">
+    <a-card class="info-submit" :bordered="false">
+        <a-radio-group v-model="defaultValue" button-style="solid" @change="changeContent">
+          <a-radio-button v-for="(item, index) in menus" :key="item.id" :value="item.component" :name="item.name">
+            {{ item.meta.title }}
+          </a-radio-button>
+        </a-radio-group>
+    </a-card>
+    <a-card :bordered="false">
+      <!--省属企业地块待审核-->
+      <company-land-audit v-show="'qcsb/QcSsgqzysytdqkList1' == defaultValue"></company-land-audit>
+      <!--省直单位地块待审核-->
+      <depart-land-audit v-show="'sydwqcsb/QcSsgqzysytdqkList1' == defaultValue"></depart-land-audit>
+      <!--省属企业地块已审核-->
+      <company-land-approved v-show="'qcsb/QcSsgqzysytdqkList2' == defaultValue"></company-land-approved>
+      <!--省直单位地块已审核-->
+      <depart-land-approved v-show="'sydwqcsb/QcSsgqzysytdqkList2' == defaultValue"></depart-land-approved>
+
+    </a-card>
+  </div>
+</template>
+
+
+<script>
+import companyLandAudit from '../qcsb/QcSsgqzysytdqkList1.vue'
+import departLandAudit from '../sydwqcsb/QcSsgqzysytdqkList1.vue'
+import companyLandApproved from '../qcsb/QcSsgqzysytdqkList2.vue'
+import departLandApproved from '../sydwqcsb/QcSsgqzysytdqkList2.vue'
+
+
+
+export default {
+  name: 'landAudit',
+  components: {
+    companyLandAudit,
+    departLandAudit,
+    companyLandApproved,
+    departLandApproved,
+
+
+  },
+  data() {
+    return {
+      defaultValue: '',
+      menus: [],
+
+    }
+  },
+  created() {
+    this.menus = this.$store.state.menu.menuList['dksh'];
+    this.defaultValue = this.menus.length > 0 ? this.menus[0].component : '';
+    console.log("landInfo...", this.menus);
+  },
+  methods: {
+    changeContent(key) {
+      console.log(key);
+    },
+  }
+
+}
+</script>
+
+<style scoped>
+.content-div {
+  height: 100%;
+}
+.ant-card:not(:last-child) {
+  margin-bottom: 10px;
+}
+.ant-card:last-child {
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+</style>
+<style lang="less" scoped>
+.info-submit {
+  & ::v-deep > .ant-card-body {
+    padding: 14px 24px;
+  }
+  &::v-deep .ant-radio-button-wrapper {
+    //border: 1px solid ;
+    border-radius: 4px;
+    padding-left: 25px;
+    padding-right: 25px;
+    //border-left: 1px;
+    border: 1px solid @primary-color;
+    margin-left: 15px;
+    color: @primary-color;
+  }
+  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
+    width: 0px;
+  }
+  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    color: #fff;
+  }
+}
+.content-div {
+  &::v-deep .ant-card:last-child .ant-card-body {
+    padding: 10px 24px 0;
+  }
+
+}
+
+</style>

+ 106 - 0
src/views/land/landInfo.vue

@@ -0,0 +1,106 @@
+<!--地块信息填报-->
+<template>
+  <div class="content-div">
+    <a-card class="info-submit" :bordered="false">
+        <a-radio-group v-model="defaultValue" button-style="solid" @change="changeContent">
+          <a-radio-button v-for="(item, index) in menus" :key="item.id" :value="item.component" :name="item.name">
+            {{ item.meta.title }}
+          </a-radio-button>
+        </a-radio-group>
+    </a-card>
+    <a-card :bordered="false">
+      <!--省属企业地块信息填报-->
+      <company-land v-show="'qcsb/QcSsgqzysytdqkList' == defaultValue"></company-land>
+      <!--省直单位信息填报-->
+      <depart-land v-show="'sydwqcsb/QcSsgqzysytdqkList' == defaultValue"></depart-land>
+      <!--退回省属企业地块信息填报-->
+      <company-back v-show="'qcsb/QcSsgqzysytdqkList4' == defaultValue"></company-back>
+      <!--退回省直单位地块信息填报-->
+      <depart-back v-show="'sydwqcsb/QcSsgqzysytdqkList4' == defaultValue"></depart-back>
+
+    </a-card>
+  </div>
+</template>
+
+
+<script>
+import companyLand from '../qcsb/QcSsgqzysytdqkList.vue'
+import departLand from '../sydwqcsb/QcSsgqzysytdqkList.vue'
+import companyBack from '../qcsb/QcSsgqzysytdqkList4.vue'
+import departBack from '../sydwqcsb/QcSsgqzysytdqkList4.vue'
+
+
+
+export default {
+  name: 'landInfo',
+  components: {
+    companyLand,
+    departLand,
+    companyBack,
+    departBack,
+
+
+  },
+  data() {
+    return {
+      defaultValue: '',
+      menus: [],
+
+    }
+  },
+  created() {
+    this.menus = this.$store.state.menu.menuList['dkxx'];
+    this.defaultValue = this.menus.length > 0 ? this.menus[0].component : '';
+    console.log("landInfo...", this.menus);
+  },
+  methods: {
+    changeContent(key) {
+      console.log(key);
+    },
+  }
+
+}
+</script>
+
+<style scoped>
+.content-div {
+  height: 100%;
+}
+.ant-card:not(:last-child) {
+  margin-bottom: 10px;
+}
+.ant-card:last-child {
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+</style>
+<style lang="less" scoped>
+.info-submit {
+  & ::v-deep > .ant-card-body {
+    padding: 14px 24px;
+  }
+  &::v-deep .ant-radio-button-wrapper {
+    //border: 1px solid ;
+    border-radius: 4px;
+    padding-left: 25px;
+    padding-right: 25px;
+    //border-left: 1px;
+    border: 1px solid @primary-color;
+    margin-left: 15px;
+    color: @primary-color;
+  }
+  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
+    width: 0px;
+  }
+  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    color: #fff;
+  }
+}
+.content-div {
+  &::v-deep .ant-card:last-child .ant-card-body {
+    padding: 10px 24px 0;
+  }
+
+}
+
+</style>

+ 16 - 14
src/views/qcsb/QcSsgqzysytdqkList.vue

@@ -5,39 +5,41 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
 
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="地块">
-              <a-input placeholder="请输入地块" v-model="queryParam.dk"></a-input>
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="地块名称">
+              <a-input placeholder="请输入地块名称" v-model="queryParam.dk"></a-input>
             </a-form-item>
           </a-col>
-          <a-col v-has="'Query:xzqh'" :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col v-has="'Query:xzqh'" :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="行政区划">
               <j-area-linkage type="cascader" v-model="queryParam.xzqh" placeholder="请输入省市区"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="证书/合同/文件编号">
-              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="土地使用现状">
-                <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状' />
+              <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状' />
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用权人">
                 <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="证书/合同/文件编号">
+              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>
             </a-col>
           </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
 
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>

+ 16 - 17
src/views/qcsb/QcSsgqzysytdqkList4.vue

@@ -4,35 +4,34 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="地块">
-              <a-input placeholder="请输入地块" v-model="queryParam.dk"></a-input>
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-form-item label="地块名称">
+              <a-input placeholder="请输入地块名称" v-model="queryParam.dk"></a-input>
             </a-form-item>
           </a-col>
-          <a-col v-has="'Query:xzqh'" :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col v-has="'Query:xzqh'" :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="行政区划">
               <j-area-linkage type="cascader" v-model="queryParam.xzqh" placeholder="请输入省市区"/>
             </a-form-item>
           </a-col>
-          <a-col  :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="证书/合同/文件编号">
-              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
-            </a-form-item>
-          </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="土地使用权人">
-                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>
             </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="土地使用权人">
+                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
+              </a-form-item>
+            </a-col>
           </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col  :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="证书/合同/文件编号">
+              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>

+ 4 - 4
src/views/qcsb/qyxx/QcQyxxList1.vue

@@ -4,19 +4,19 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业名称">
               <a-input placeholder="请输入企业名称" dict-code="qymc" v-model="queryParam.qymc" ></a-input>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业类型">
               <j-dict-select-tag placeholder="请输入企业类型" dict-code="qylx" v-model="queryParam.qylx" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业级别">
               <j-dict-select-tag placeholder="请输入企业级别" dict-code="qyjb" v-model="queryParam.orgType" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
@@ -27,7 +27,7 @@
               <j-dict-select-tag placeholder="请选择是否涉及省内土地资产" v-model="queryParam.sfsjtdzc" dictCode="sfsjtdzc"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
 
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>

+ 6 - 6
src/views/qcsb/qyxx/QcQyxxList2.vue

@@ -4,18 +4,18 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="用地单位名称">
-              <a-input placeholder="请输入用地单位名称" v-model="queryParam.qymc"></a-input>
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-form-item label="单位名称">
+              <a-input placeholder="请输入单位名称" v-model="queryParam.qymc"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业类型">
               <j-dict-select-tag placeholder="请输入企业类型" dict-code="qylx" v-model="queryParam.qylx" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业级别">
               <j-dict-select-tag placeholder="请输入企业级别" dict-code="qyjb" v-model="queryParam.orgType" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
@@ -26,7 +26,7 @@
               <j-dict-select-tag placeholder="请选择是否涉及省内土地资产" v-model="queryParam.sfsjtdzc" dictCode="sfsjtdzc"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
 
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>

+ 8 - 8
src/views/qcsb/qyxx/QcQyxxList4.vue

@@ -4,26 +4,26 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="用地单位名称">
-              <a-input placeholder="请输入用地单位名称" v-model="queryParam.qymc"></a-input>
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="单位名称">
+              <a-input placeholder="请输入单位名称" v-model="queryParam.qymc"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业类型">
               <j-dict-select-tag placeholder="请输入企业类型" dict-code="qylx" v-model="queryParam.qylx" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
 
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -35,7 +35,7 @@
     <div class="table-operator">
 
       <!--<a-button v-if='!this.dataSource.length>0' @click="handleAdd" type="primary" icon="plus">补充用地单位信息</a-button>-->
-    <a-button type="primary" icon="download" @click="handleExportXls('用地单位信息')">导出</a-button>
+    <a-button type="primary" icon="download" @click="handleExportXls('省属企业单位信息')">导出</a-button>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>

+ 19 - 17
src/views/sydwqcsb/QcSsgqzysytdqkList.vue

@@ -4,44 +4,46 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="地块名称">
               <a-input placeholder="请输入地块名称" v-model="queryParam.dk"></a-input>
             </a-form-item>
           </a-col>
-          <a-col v-has="'query:createBy'" :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col v-has="'query:createBy'" :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="单位名称">
               <a-input placeholder="请输入单位名称" v-model="queryParam.createBy"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="证书/合同/文件编号">
-              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="土地使用现状">
+                <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状' />
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="取得方式">
+              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='qdfs' placeholder='请选择取得方式' />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="取得方式">
-              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='qdfs' placeholder='请选择取得方式' />
+            <a-form-item label="证书/合同/文件编号">
+              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="土地使用现状">
-                <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状' />
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="是否上报">
+                <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt" />
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用权人">
                 <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="是否上报">
-                <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt" />
-              </a-form-item>
-            </a-col>
           </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
 
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>

+ 14 - 14
src/views/sydwqcsb/QcSsgqzysytdqkList4.vue

@@ -4,34 +4,34 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="地块名称">
               <a-input placeholder="请输入地块名称" v-model="queryParam.dk"></a-input>
             </a-form-item>
           </a-col>
-          <a-col v-has="'query::createBy'" :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col v-has="'query::createBy'" :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="单位名称">
               <a-input placeholder="请输入单位名称" v-model="queryParam.createBy"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="证书/合同/文件编号">
-              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
-            </a-form-item>
-          </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="土地使用权人">
-                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>
             </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="土地使用权人">
+                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
+              </a-form-item>
+            </a-col>
           </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="6" :lg="4" :md="8" :sm="24">
+            <a-form-item label="证书/合同/文件编号">
+              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>

+ 3 - 3
src/views/sydwqcsb/sydwxx/QcQyxxList1.vue

@@ -4,19 +4,19 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业名称">
               <a-input placeholder="请输入企业名称" dict-code="qymc" v-model="queryParam.qymc" ></a-input>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业类型">
               <j-dict-select-tag placeholder="请输入企业类型" dict-code="qylx" v-model="queryParam.qylx" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业级别">
               <j-dict-select-tag placeholder="请输入企业级别" dict-code="qyjb" v-model="queryParam.orgType" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->

+ 6 - 6
src/views/sydwqcsb/sydwxx/QcQyxxList2.vue

@@ -4,18 +4,18 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="用地单位名称">
-              <a-input placeholder="请输入用地单位名称" v-model="queryParam.qymc"></a-input>
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-form-item label="单位名称">
+              <a-input placeholder="请输入单位名称" v-model="queryParam.qymc"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业类型">
               <j-dict-select-tag placeholder="请输入企业类型" dict-code="qylx" v-model="queryParam.qylx" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业级别">
               <j-dict-select-tag placeholder="请输入企业级别" dict-code="qyjb" v-model="queryParam.orgType" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
@@ -26,7 +26,7 @@
               <j-dict-select-tag placeholder="请选择是否涉及省内土地资产" v-model="queryParam.sfsjtdzc" dictCode="sfsjtdzc"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
 
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>

+ 8 - 8
src/views/sydwqcsb/sydwxx/QcQyxxList4.vue

@@ -4,26 +4,26 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="用地单位名称">
-              <a-input placeholder="请输入用地单位名称" v-model="queryParam.qymc"></a-input>
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="单位名称">
+              <a-input placeholder="请输入单位名称" v-model="queryParam.qymc"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业类型">
               <j-dict-select-tag placeholder="请输入企业类型" dict-code="qylx" v-model="queryParam.qylx"></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
 
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -35,7 +35,7 @@
     <div class="table-operator">
 
       <!--<a-button v-if='!this.dataSource.length>0' @click="handleAdd" type="primary" icon="plus">补充用地单位信息</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('用地单位信息')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('/**/单位信息')">导出</a-button>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>

+ 4 - 2
vue.config.js

@@ -80,8 +80,10 @@ module.exports = {
       less: {
         modifyVars: {
           /* less 变量覆盖,用于自定义 ant design 主题 */
-          'primary-color': '#3264ff',
-          'link-color': '#3264ff',
+          // 'primary-color': '#3264ff',
+          'primary-color': '#1882ff',
+          // 'link-color': '#3264ff',
+          'link-color': '#1882ff',
           'border-radius-base': '4px'
         },
         javascriptEnabled: true