sugb hai 6 días
pai
achega
05429ddf2e

+ 7 - 4
src/components/OneMap/BasicMap.vue

@@ -185,8 +185,9 @@ export default {
       overwriteActions: true,
       outFields: ['*'],
       title: ({ graphic: { attributes, layer } }) => {
-        const dkmc = layer.title
-        return `<div>${dkmc || ''}</div>`
+        const dkmc = '地块信息'
+        //const dkmc = layer.title
+        return `<div>${dkmc|| ''}</div>`
       },
       content: this.selectChange,
       actions: [
@@ -477,7 +478,9 @@ export default {
               overwriteActions: true,
               outFields: ['*'],
               title: ({ graphic: { attributes, layer } }) => {
-                const dkmc = layer.title
+                
+                //const dkmc = layer.title
+                const dkmc = '地块信息'
                 return `<div>${dkmc || ''}</div>`
               },
               content: this.selectChange,
@@ -689,7 +692,7 @@ export default {
           })
         }).then(res => {
           console.log('获取的地块信息')
-          // console.log(JSON.stringify(this.resData))
+          //console.log(JSON.stringify(this.resData))
           if (res.sysOrgCode.slice(0, 3) == 'A04') {
             var dwmc = res.createBy
             var dkmc = res.dk

+ 2 - 3
src/components/OneMap/widgets/BaseMap.vue

@@ -63,9 +63,8 @@ export default {
         },
       });
       let tmsLayer = new TMSLayer({
-        urlTemplate: "/sd_dom/sd/{z}/{x}/{y}.png"
-        // urlTemplate: "http://218.59.194.82:12682/sd_dom/sd/{z}/{x}/{y}.png"
-        //urlTemplate: "http://218.59.194.82:13480/sddltbtiles01/{z}/{x}/{y}.png"
+        //urlTemplate: "/sd_dom/sd/{z}/{x}/{y}.png"
+        urlTemplate: "http://218.59.194.82:12682/sd_dom/sd/{z}/{x}/{y}.png"
       });
 
       this.localMap=new Basemap({

+ 0 - 10
src/views/dkjz/QcSsgqzysytdqkGzvList.vue

@@ -188,11 +188,6 @@
             align: "center",
             dataIndex: 'sjyt_dictText'
           },
-          // {
-          //   title: '数据来源',
-          //   align: "center",
-          //   dataIndex: 'source'
-          // },
           {
             title: '地块编号',
             align: "center",
@@ -265,11 +260,6 @@
           value: 'sjyt',
           text: '实际用途'
         })
-        // fieldList.push({
-        //   type: 'string',
-        //   value: 'source',
-        //   text: '数据来源'
-        // })
         fieldList.push({
           type: 'string',
           value: 'dkbh',

+ 1 - 1
src/views/qcsb/QcSsgqzysytdqkList.vue

@@ -204,7 +204,7 @@
           {
             title:'使用权使用方式',
             align:"center",
-            dataIndex: 'syqsyfs_dictText'
+            dataIndex: 'syqsyfsCode_dictText'
           },
           {
             title:'实际用途',

+ 11 - 6
src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -19,7 +19,7 @@
               <a-input placeholder="请输入地块编号" v-model="queryParam.dkbh"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="24">
+         <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="文件类型">
               <j-multi-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx" />
             </a-form-item>
@@ -55,7 +55,7 @@
                 <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-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否存在矢量">
                 <j-dict-select-tag placeholder="请选择是否存在矢量" v-model="queryParam.sfczslsj" dictCode="sfgyz" />
               </a-form-item>
@@ -76,7 +76,7 @@
                 <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw" />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :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="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt" />
               </a-form-item>
@@ -91,7 +91,7 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :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>
@@ -287,9 +287,9 @@ export default {
           dataIndex: 'dk'
         },
         {
-          title: '文件类型',
+          title: '证书类型',
           align: 'center',
-          dataIndex: 'wjlx_dictText'
+          dataIndex: 'zslx_dictText'
         },
         {
           title: '证书/合同/文件编号',
@@ -313,6 +313,11 @@ export default {
           customRender: text => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
         },
         {
+          title: '土地价值/元',
+          align: "center",
+          dataIndex: 'worth'
+        },
+        {
           title: '是否上报',
           align: 'center',
           dataIndex: 'sfsb_dictText'

+ 266 - 232
src/views/qcsb/qyxx/QcQyxxList_gly.vue

@@ -1,51 +1,51 @@
   <template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <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="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="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-form-item label="是否涉及省内土地资产">
-              <j-dict-select-tag placeholder="请选择是否涉及省内土地资产" v-model="queryParam.sfsjtdzc" dictCode="sfsjtdzc"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="3" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+    <a-card :bordered="false">
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <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="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="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-form-item label="是否涉及省内土地资产">
+                <j-dict-select-tag placeholder="请选择是否涉及省内土地资产" v-model="queryParam.sfsjtdzc" dictCode="sfsjtdzc" />
+              </a-form-item>
+            </a-col>
+            <a-col :xl="3" :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 -->
+                <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">
+      <!-- 操作按钮区域 -->
+      <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;
@@ -56,66 +56,53 @@
          </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">
+      <!-- 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>
 
-        <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>
-        <span slot="action" slot-scope="text, record">
-                        <a-space>
-                          <a-button  v-if="record.sfsb<3"  @click="handleEdit(record)">编辑</a-button>
-                            <a-button v-if="record.sfsb==3" @click="handleEdit(record)">重新审核</a-button>
-                          <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
-<!--                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">完成审核</a-button>-->
-                          <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
-                            <a-button v-if="record.sfsb===4">恢复为已审核</a-button>
-                             </a-popconfirm>
-                        </a-space>
-        </span>
+        <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">
 
-       <!-- <span slot="action" slot-scope="text, record">
+          <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>
+          <span slot="action" slot-scope="text, record">
+            <a-space>
+              <a-button v-if="record.sfsb<3" @click="handleEdit(record)">编辑</a-button>
+              <a-button v-if="record.sfsb==3" @click="handleEdit(record)">重新审核</a-button>
+              <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
+              <!--                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">完成审核</a-button>-->
+              <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
+                <a-button v-if="record.sfsb===4">恢复为已审核</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 @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
           <a-dropdown>
@@ -131,162 +118,209 @@
               </a-menu-item>
             </a-menu>
           </a-dropdown>-->
-        <!--  </span>-->
-
-      </a-table>
-    </div>
+          <!--  </span>-->
 
-    <qc-qyxx-modal ref="modalForm" @ok="modalFormOk"></qc-qyxx-modal>
-  </a-card>
-</template>
+        </a-table>
+      </div>
 
-<script>
+      <qc-qyxx-modal ref="modalForm" @ok="modalFormOk"></qc-qyxx-modal>
+    </a-card>
+  </template>
 
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import QcQyxxModal from './modules/QcQyxxModal2'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import {getAction} from "../../../api/manage";
+  <script>
+    import '@/assets/less/TableExpand.less'
+    import {
+      mixinDevice
+    } from '@/utils/mixin'
+    import {
+      JeecgListMixin
+    } from '@/mixins/JeecgListMixin'
+    import QcQyxxModal from './modules/QcQyxxModal2'
+    import {
+      filterMultiDictText
+    } from '@/components/dict/JDictSelectUtil'
+    import {
+      getAction
+    } from "../../../api/manage";
 
-  export default {
-    name: 'QcQyxxList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      QcQyxxModal
-    },
-    data () {
-      return {
-        description: '用地单位信息管理页面',
-        // 表头
-        dl:false,
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
+    export default {
+      name: 'QcQyxxList',
+      mixins: [JeecgListMixin, mixinDevice],
+      components: {
+        QcQyxxModal
+      },
+      data() {
+        return {
+          description: '用地单位信息管理页面',
+          // 表头
+          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'
+              title: '企业编码',
+              align: "center",
+              dataIndex: 'qybm'
             },
             {
-                title:'用地单位名称',
-                align:"center",
-                dataIndex: 'sysOrgCode_dictText'
+              title: '用地单位名称',
+              align: "center",
+              dataIndex: 'sysOrgCode_dictText'
             },
-          {
-            title:'统一社会信用编码',
-            align:"center",
-            dataIndex: 'tyshxybm'
-          },
-          {
-            title:'企业类型',
-            align:"center",
-            dataIndex: 'qylx_dictText'
-          },
-          {
-            title:'国有资产持股比例',
-            align:"center",
-            dataIndex: 'gyzccgbl'
-          },
             {
-                title:'是否涉及省内土地资产',
-                align:"center",
-                dataIndex: 'sfsjtdzc'
+              title: '统一社会信用编码',
+              align: "center",
+              dataIndex: 'tyshxybm'
             },
             {
-                title:'联系人',
-                align:"center",
-                dataIndex: 'tbr'
+              title: '企业类型',
+              align: "center",
+              dataIndex: 'qylx_dictText'
             },
             {
-                title:'联系人手机号',
-                align:"center",
-                dataIndex: 'sjh'
+              title: '国有资产持股比例',
+              align: "center",
+              dataIndex: 'gyzccgbl'
             },
-          {
-            title:'是否上报',
-            align:"center",
-            dataIndex: 'sfsb_dictText'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
+            {
+              title: '是否涉及省内土地资产',
+              align: "center",
+              dataIndex: 'sfsjtdzc'
+            },
+            {
+              title: '联系人',
+              align: "center",
+              dataIndex: 'tbr'
+            },
+            {
+              title: '联系人手机号',
+              align: "center",
+              dataIndex: 'sjh'
+            },
+            {
+              title: '是否上报',
+              align: "center",
+              dataIndex: 'sfsb_dictText'
+            },
+            {
+              title: '操作',
+              dataIndex: 'action',
+              align: "center",
+              fixed: "right",
+              width: 147,
+              scopedSlots: {
+                customRender: 'action'
+              }
+            }
+          ],
 
-        url: {
-          list: "/qcsb.qyxx/qcQyxx/listBygly",
-          delete: "/qcsb.qyxx/qcQyxx/delete",
-          deleteBatch: "/qcsb.qyxx/qcQyxx/deleteBatch",
-          exportXlsUrl: "/qcsb.qyxx/qcQyxx/exportXls",
-          importExcelUrl: "qcsb.qyxx/qcQyxx/importExcel",
-            wcsh:"/qcsb.qyxx/qcQyxx/wcsh",
-            hfysh:"/qcsb.qyxx/qcQyxx/hfysh",
+          url: {
+            list: "/qcsb.qyxx/qcQyxx/listBygly",
+            delete: "/qcsb.qyxx/qcQyxx/delete",
+            deleteBatch: "/qcsb.qyxx/qcQyxx/deleteBatch",
+            exportXlsUrl: "/qcsb.qyxx/qcQyxx/exportXls",
+            importExcelUrl: "qcsb.qyxx/qcQyxx/importExcel",
+            wcsh: "/qcsb.qyxx/qcQyxx/wcsh",
+            hfysh: "/qcsb.qyxx/qcQyxx/hfysh",
+          },
+          dl: '',
+          dictOptions: {},
+          superFieldList: [],
+        }
+      },
+      created() {
+        this.getSuperFieldList();
+      },
+      computed: {
+        importExcelUrl: function() {
+          return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
         },
-        dl:'',
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       },
-    },
-    mounted() {
+      mounted() {
 
-    },
-    methods: {
-        handleWCSH(id){
-            getAction(this.url.wcsh,{id:id}).then(res => {
-                if (res.success) {
-                    this.$message.success('审核完成');
-                    this.loadData();
-                }
-            })
+      },
+      methods: {
+        handleWCSH(id) {
+          getAction(this.url.wcsh, {
+            id: id
+          }).then(res => {
+            if (res.success) {
+              this.$message.success('审核完成');
+              this.loadData();
+            }
+          })
 
         },
-        handleHFYSH(id){
-            getAction(this.url.hfysh,{id:id}).then(res => {
-                if (res.success) {
-                    this.$message.success('恢复为已审核');
-                    this.loadData();
-                }
-            })
+        handleHFYSH(id) {
+          getAction(this.url.hfysh, {
+            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:'联系电话'})
-        this.superFieldList = fieldList
+        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: '联系电话'
+          })
+          this.superFieldList = fieldList
+        }
       }
     }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
+  </script>
+  <style scoped>
+    @import '~@assets/less/common.less';
+  </style>

+ 265 - 231
src/views/qcsb/qyxx/QcQyxxList_glyy.vue

@@ -1,51 +1,51 @@
   <template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <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-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>
-              <!--<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="请选择是否涉及省内土地资产" 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-card :bordered="false">
+      <!-- 查询区域 -->
+      <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-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>
+                <!--<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="请选择是否涉及省内土地资产" 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 -->
+                <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">
+      <!-- 操作按钮区域 -->
+      <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;
@@ -56,65 +56,52 @@
          </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">
+      <!-- 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>
 
-        <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>
-        <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-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">重新审核</a-button>
-                          <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
-                            <a-button v-if="record.sfsb===4">恢复为已审核</a-button>
-                             </a-popconfirm>
-                        </a-space>
-        </span>
+        <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">
 
-       <!-- <span slot="action" slot-scope="text, record">
+          <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>
+          <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-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">重新审核</a-button>
+              <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
+                <a-button v-if="record.sfsb===4">恢复为已审核</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 @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
           <a-dropdown>
@@ -130,162 +117,209 @@
               </a-menu-item>
             </a-menu>
           </a-dropdown>-->
-        <!--  </span>-->
-
-      </a-table>
-    </div>
+          <!--  </span>-->
 
-    <qc-qyxx-modal ref="modalForm" @ok="modalFormOk"></qc-qyxx-modal>
-  </a-card>
-</template>
+        </a-table>
+      </div>
 
-<script>
+      <qc-qyxx-modal ref="modalForm" @ok="modalFormOk"></qc-qyxx-modal>
+    </a-card>
+  </template>
 
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import QcQyxxModal from './modules/QcQyxxModal2'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import {getAction} from "../../../api/manage";
+  <script>
+    import '@/assets/less/TableExpand.less'
+    import {
+      mixinDevice
+    } from '@/utils/mixin'
+    import {
+      JeecgListMixin
+    } from '@/mixins/JeecgListMixin'
+    import QcQyxxModal from './modules/QcQyxxModal2'
+    import {
+      filterMultiDictText
+    } from '@/components/dict/JDictSelectUtil'
+    import {
+      getAction
+    } from "../../../api/manage";
 
-  export default {
-    name: 'QcQyxxList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      QcQyxxModal
-    },
-    data () {
-      return {
-        description: '用地单位信息管理页面',
-        // 表头
-        dl:false,
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
+    export default {
+      name: 'QcQyxxList',
+      mixins: [JeecgListMixin, mixinDevice],
+      components: {
+        QcQyxxModal
+      },
+      data() {
+        return {
+          description: '用地单位信息管理页面',
+          // 表头
+          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'
+              title: '企业编码',
+              align: "center",
+              dataIndex: 'qybm'
             },
             {
-                title:'用地单位名称',
-                align:"center",
-                dataIndex: 'sysOrgCode_dictText'
+              title: '用地单位名称',
+              align: "center",
+              dataIndex: 'sysOrgCode_dictText'
             },
-          {
-            title:'统一社会信用编码',
-            align:"center",
-            dataIndex: 'tyshxybm'
-          },
-          {
-            title:'企业类型',
-            align:"center",
-            dataIndex: 'qylx_dictText'
-          },
-          {
-            title:'国有资产持股比例',
-            align:"center",
-            dataIndex: 'gyzccgbl'
-          },
             {
-                title:'是否涉及省内土地资产',
-                align:"center",
-                dataIndex: 'sfsjtdzc'
+              title: '统一社会信用编码',
+              align: "center",
+              dataIndex: 'tyshxybm'
             },
             {
-                title:'联系人',
-                align:"center",
-                dataIndex: 'tbr'
+              title: '企业类型',
+              align: "center",
+              dataIndex: 'qylx_dictText'
             },
             {
-                title:'联系人手机号',
-                align:"center",
-                dataIndex: 'sjh'
+              title: '国有资产持股比例',
+              align: "center",
+              dataIndex: 'gyzccgbl'
             },
-          {
-            title:'是否上报',
-            align:"center",
-            dataIndex: 'sfsb_dictText'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
+            {
+              title: '是否涉及省内土地资产',
+              align: "center",
+              dataIndex: 'sfsjtdzc'
+            },
+            {
+              title: '联系人',
+              align: "center",
+              dataIndex: 'tbr'
+            },
+            {
+              title: '联系人手机号',
+              align: "center",
+              dataIndex: 'sjh'
+            },
+            {
+              title: '是否上报',
+              align: "center",
+              dataIndex: 'sfsb_dictText'
+            },
+            {
+              title: '操作',
+              dataIndex: 'action',
+              align: "center",
+              fixed: "right",
+              width: 147,
+              scopedSlots: {
+                customRender: 'action'
+              }
+            }
+          ],
 
-        url: {
-          list: "/qcsb.qyxx/qcQyxx/listByglyy",
-          delete: "/qcsb.qyxx/qcQyxx/delete",
-          deleteBatch: "/qcsb.qyxx/qcQyxx/deleteBatch",
-          exportXlsUrl: "/qcsb.qyxx/qcQyxx/exportXls",
-          importExcelUrl: "qcsb.qyxx/qcQyxx/importExcel",
-            wcsh:"/qcsb.qyxx/qcQyxx/wcsh",
-            hfysh:"/qcsb.qyxx/qcQyxx/hfysh",
+          url: {
+            list: "/qcsb.qyxx/qcQyxx/listByglyy",
+            delete: "/qcsb.qyxx/qcQyxx/delete",
+            deleteBatch: "/qcsb.qyxx/qcQyxx/deleteBatch",
+            exportXlsUrl: "/qcsb.qyxx/qcQyxx/exportXls",
+            importExcelUrl: "qcsb.qyxx/qcQyxx/importExcel",
+            wcsh: "/qcsb.qyxx/qcQyxx/wcsh",
+            hfysh: "/qcsb.qyxx/qcQyxx/hfysh",
+          },
+          dl: '',
+          dictOptions: {},
+          superFieldList: [],
+        }
+      },
+      created() {
+        this.getSuperFieldList();
+      },
+      computed: {
+        importExcelUrl: function() {
+          return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
         },
-        dl:'',
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       },
-    },
-    mounted() {
+      mounted() {
 
-    },
-    methods: {
-        handleWCSH(id){
-            getAction(this.url.wcsh,{id:id}).then(res => {
-                if (res.success) {
-                    this.$message.success('审核完成');
-                    this.loadData();
-                }
-            })
+      },
+      methods: {
+        handleWCSH(id) {
+          getAction(this.url.wcsh, {
+            id: id
+          }).then(res => {
+            if (res.success) {
+              this.$message.success('审核完成');
+              this.loadData();
+            }
+          })
 
         },
-        handleHFYSH(id){
-            getAction(this.url.hfysh,{id:id}).then(res => {
-                if (res.success) {
-                    this.$message.success('恢复为已审核');
-                    this.loadData();
-                }
-            })
+        handleHFYSH(id) {
+          getAction(this.url.hfysh, {
+            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:'联系电话'})
-        this.superFieldList = fieldList
+        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: '联系电话'
+          })
+          this.superFieldList = fieldList
+        }
       }
     }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
+  </script>
+  <style scoped>
+    @import '~@assets/less/common.less';
+  </style>

+ 5 - 0
src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -307,6 +307,11 @@ export default {
           customRender: text => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
         },
         {
+          title: '土地价值/元',
+          align: "center",
+          dataIndex: 'worth'
+        },
+        {
           title: '是否上报',
           align: 'center',
           dataIndex: 'sfsb_dictText'