Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/js-web-jianguan

任超
Showing 16 changed files with 162 additions and 168 deletions
.env.development
src/api/business.js
src/api/ruleConfig.js
src/api/sbbwcx.js
src/api/user.js
src/components/business/boundaryLine.vue
src/components/business/boundaryPoint.vue
src/components/business/landBuildingInfo.vue
src/components/business/parcelBaseInfo.vue
src/components/dataDetails/edit-dialog.vue
src/mixins/ruleMixin.js
src/views/sbbwcx/data/index.js
src/views/sbbwcx/index.vue
src/views/system/dictionaries/components/editDialog.vue
src/views/system/dictionaries/dictionaries.js
src/views/system/dictionaries/dictionaries.vue
--- a/.env.development
View file @5f8e7d8
+++ b/.env.development
View file @5f8e7d8
@@ -5,4 +5,4 @@ NODE_ENV=development
 VUE_APP_BASE_API = '/api'
 # 开发环境
-VUE_APP_API_BASE_URL = 'http://192.168.2.38:8008'
+VUE_APP_API_BASE_URL = 'http://192.168.2.95:8027'
--- a/src/api/business.js
View file @5f8e7d8
+++ b/src/api/business.js
View file @5f8e7d8
@@ -278,7 +278,7 @@ class business {
  //建设用地、宅基地使用权
  async getQlfQlJsydsyqById (bsmSjsb) {
    return request({
-      url: '/QlfQlJsydsyq/getQlfQlJsydsyqById',
+      url: '/reg/QlfQlJsydsyq/detail',
      method: 'get',
      params: {
        bsmSjsb: bsmSjsb
@@ -288,8 +288,8 @@ class business {
  //修改建设用地、宅基地使用权
  async updateQlfQlJsydsyq (data) {
    return request({
-      url: '/QlfQlJsydsyq/updateQlfQlJsydsyq',
+      url: '/reg/QlfQlJsydsyq/edit',
-      method: 'put',
+      method: 'post',
      data
    })
  }
@@ -512,7 +512,7 @@ class business {
  //界址点
  async getKttGyJzdById (bsmSjsb) {
    return request({
-      url: '/KttGyJzd/getKttGyJzdById',
+      url: '/reg/KttGyJzd/detail',
      method: 'get',
      params: {
        bsmSjsb: bsmSjsb
@@ -522,15 +522,15 @@ class business {
  //修改界址点
  async updateKttGyJzd (data) {
    return request({
-      url: '/KttGyJzd/updateKttGyJzd',
+      url: '/reg/KttGyJzd/edit',
-      method: 'put',
+      method: 'post',
      data
    })
  }
  //界址线信息
  async getKttGyJzxById (bsmSjsb) {
    return request({
-      url: '/KttGyJzx/getKttGyJzxById',
+      url: '/reg/KttGyJzx/detail',
      method: 'get',
      params: {
        bsmSjsb: bsmSjsb
@@ -540,8 +540,8 @@ class business {
  //修改界址线信息
  async updateKttGyJzx (data) {
    return request({
-      url: '/KttGyJzx/updateKttGyJzx',
+      url: '/reg/KttGyJzx/edit',
-      method: 'put',
+      method: 'post',
      data
    })
  }
@@ -926,9 +926,9 @@ class business {
    })
  }
  // 宗地基本信息
-  async getKttZdjbxxById (bsmSjsb) {
+  async kttZdjbxxDetail (bsmSjsb) {
    return request({
-      url: '/KttZdjbxx/getKttZdjbxxById',
+      url: '/reg/KttZdjbxx/detail',
      method: 'get',
      params: {
        bsmSjsb: bsmSjsb
@@ -938,8 +938,8 @@ class business {
  // 宗地基本信息-修改
  async updateKttZdjbxx (data) {
    return request({
-      url: '/KttZdjbxx/updateKttZdjbxx',
+      url: '/KttZdjbxx/edit',
-      method: 'put',
+      method: 'post',
      data
    })
  }
--- a/src/api/ruleConfig.js
View file @5f8e7d8
+++ b/src/api/ruleConfig.js
View file @5f8e7d8
@@ -38,12 +38,12 @@ class ruleConfig {
    })
  }
  // 编辑界面列表查询----根据数据表名查询
-  async getRuleList (dataTable) {
+  async getRuleList (bsmYwsjb) {
    return request({
-      url: '/SysYwsjb/getSysYwsjbWithSysYwsjbFieldByDataTable',
+      url: '/sjsb/DataReport/getTableColumn',
      method: 'get',
      params: {
-        dataTable: dataTable
+        bsmYwsjb: bsmYwsjb
      }
    })
  }
--- a/src/api/sbbwcx.js
View file @5f8e7d8
+++ b/src/api/sbbwcx.js
View file @5f8e7d8
 import request from '@/utils/request'
+import SERVER from './config'
-class sbbwcx {
+// 数据上报分页
-  // 定时任务查询接口
+export function getDataReportPage (data) {
-  async getDataReportPage (data) {
  return request({
-      url: '/sjsb/DataReport/getDataReportPage',
+    url: SERVER.SERVERAPI + '/sjsb/DataReport/getDataReportPage',
    method: 'post',
    data
  })
-  }
+}
+// 数据上报分页
+export function getDetail (params) {
+  return request({
+    url: SERVER.SERVERAPI + '/sjsb/DataReport/getDetail',
+    method: 'get',
+    params
+  })
 }
-export default new sbbwcx()
\ No newline at end of file
--- a/src/api/user.js
View file @5f8e7d8
+++ b/src/api/user.js
View file @5f8e7d8
@@ -26,7 +26,7 @@ export function getAllDict () {
 }
 export function getQlxxDictList (data) {
  return request({
-    url: SERVER.SERVERAPI + '/rest/sys/dict/getQlxxDictList',
+    url: SERVER.SERVERAPI + '/rest/sys/dict/getDictList',
    method: 'post',
    data
  })
--- a/src/components/business/boundaryLine.vue
View file @5f8e7d8
+++ b/src/components/business/boundaryLine.vue
View file @5f8e7d8
@@ -53,7 +53,7 @@
              </el-form-item>
            </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
              <el-form-item :prop="'ruleForm.' + index + '.JZXLB'" :rules="rules.JZXLB">
                <span slot="label">
                  界址线类别： <br />
@@ -65,9 +65,9 @@
                  </el-option>
                </el-select>
              </el-form-item>
-            </el-col>
+            </el-col> -->
-            <el-col :span="8">
+            <!-- <el-col :span="8">
              <el-form-item :prop="'ruleForm.' + index + '.JZXWZ'" :rules="rules.JZXWZ">
                <span slot="label">
                  界址线位置： <br />
@@ -79,11 +79,11 @@
                  </el-option>
                </el-select>
              </el-form-item>
-            </el-col>
+            </el-col> -->
          </el-row>
          <el-row>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
              <el-form-item :prop="'ruleForm.' + index + '.JXXZ'" class="borderTopNone" :rules="rules.JXXZ">
                <span slot="label">
                  界线性质： <br />
@@ -95,7 +95,7 @@
                  </el-option>
                </el-select>
              </el-form-item>
-            </el-col>
+            </el-col> -->
            <el-col :span="8">
              <el-form-item :prop="'ruleForm.' + index + '.QSJXXYSBH'" class="borderTopNone" :rules="rules.QSJXXYSBH">
@@ -161,7 +161,7 @@ export default {
      type: String,
      default: ''
    },
-    dataTable: {
+    bsmYwsjb: {
      type: String,
      default: ''
    }
--- a/src/components/business/boundaryPoint.vue
View file @5f8e7d8
+++ b/src/components/business/boundaryPoint.vue
View file @5f8e7d8
@@ -63,7 +63,7 @@
              </el-form-item>
            </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
              <el-form-item :prop="'ruleForm.' + index + '.JBLX'" :rules="rules.JBLX">
                <span slot="label">
                  界标类型： <br />
@@ -75,11 +75,11 @@
                  </el-option>
                </el-select>
              </el-form-item>
-            </el-col>
+            </el-col> -->
          </el-row>
          <el-row>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
              <el-form-item :prop="'ruleForm.' + index + '.JZDLX'" :rules="rules.JZDLX">
                <span slot="label">
                  界址点类型： <br />
@@ -91,7 +91,7 @@
                  </el-option>
                </el-select>
              </el-form-item>
-            </el-col>
+            </el-col> -->
            <el-col :span="8">
              <el-form-item :prop="'ruleForm.' + index + '.XZBZ'" :rules="{ ...rules.XZBZ, ...typeNum }">
@@ -134,7 +134,7 @@ export default {
      type: String,
      default: ''
    },
-    dataTable: {
+    bsmYwsjb: {
      type: String,
      default: ''
    }
--- a/src/components/business/landBuildingInfo.vue
View file @5f8e7d8
+++ b/src/components/business/landBuildingInfo.vue
View file @5f8e7d8
@@ -44,7 +44,7 @@
          </el-form-item>
        </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
          <el-form-item prop="QLLX">
            <span slot="label">
              权利类型： <br />
@@ -55,9 +55,9 @@
              </el-option>
            </el-select>
          </el-form-item>
-        </el-col>
+        </el-col> -->
-        <el-col :span="8">
+        <!-- <el-col :span="8">
          <el-form-item prop="DJLX">
            <span slot="label">
              登记类型： <br />
@@ -68,7 +68,7 @@
              </el-option>
            </el-select>
          </el-form-item>
-        </el-col>
+        </el-col> -->
      </el-row>
      <el-row>
@@ -195,7 +195,7 @@
          </el-form-item>
        </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
          <el-form-item prop="QSZT">
            <span slot="label">
              权属状态： <br />
@@ -206,7 +206,7 @@
              </el-option>
            </el-select>
          </el-form-item>
-        </el-col>
+        </el-col> -->
      </el-row>
    </el-form>
    <message-tips ref="msg" />
@@ -223,7 +223,7 @@ export default {
      type: String,
      default: ''
    },
-    dataTable: {
+    bsmYwsjb: {
      type: String,
      default: ''
    }
--- a/src/components/business/parcelBaseInfo.vue
View file @5f8e7d8
+++ b/src/components/business/parcelBaseInfo.vue
View file @5f8e7d8
@@ -80,7 +80,7 @@
          </el-form-item>
        </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
          <el-form-item prop="MJDW">
            <span slot="label">
              面积单位： <br />
@@ -91,7 +91,7 @@
              </el-option>
            </el-select>
          </el-form-item>
-        </el-col>
+        </el-col> -->
        <el-col :span="8">
          <el-form-item prop="YT">
@@ -105,7 +105,7 @@
      </el-row>
      <el-row>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
          <el-form-item prop="DJ">
            <span slot="label">
              等级： <br />
@@ -116,7 +116,7 @@
              </el-option>
            </el-select>
          </el-form-item>
-        </el-col>
+        </el-col> -->
        <el-col :span="8">
          <el-form-item prop="JG" :rules="{ type: 'number' }">
@@ -129,7 +129,7 @@
          </el-form-item>
        </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
          <el-form-item prop="QLLX">
            <span slot="label">
              权利类型： <br />
@@ -140,11 +140,11 @@
              </el-option>
            </el-select>
          </el-form-item>
-        </el-col>
+        </el-col> -->
      </el-row>
      <el-row>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
          <el-form-item prop="QLXZ">
            <span slot="label">
              权利性质： <br />
@@ -153,9 +153,9 @@
            <tree-select :disabled="$store.state.business.Edit" :options="dicData['A9']" v-model="ruleForm.QLXZ"
              placeholder="权利性质" />
          </el-form-item>
-        </el-col>
+        </el-col> -->
-        <el-col :span="8">
+        <!-- <el-col :span="8">
          <el-form-item prop="QLSDFS">
            <span slot="label">
              权利设定方式： <br />
@@ -166,7 +166,7 @@
              </el-option>
            </el-select>
          </el-form-item>
-        </el-col>
+        </el-col> -->
        <el-col :span="8">
          <el-form-item prop="RJL">
@@ -310,7 +310,7 @@
          </el-form-item>
        </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
          <el-form-item prop="ZT" class="borderTopNone">
            <span slot="label">
              状态： <br />
@@ -321,7 +321,7 @@
              </el-option>
            </el-select>
          </el-form-item>
-        </el-col>
+        </el-col> -->
      </el-row>
      <el-row>
@@ -448,7 +448,7 @@ export default {
      type: String,
      default: ''
    },
-    dataTable: {
+    bsmYwsjb: {
      type: String,
      default: ''
    }
@@ -498,7 +498,7 @@ export default {
  methods: {
    async featchData () {
      try {
-        let { result: res } = await business.getKttZdjbxxById(this.bsmSjsb)
+        let { result: res } = await business.kttZdjbxxDetail(this.bsmSjsb)
        this.ruleForm = res
        this.featchRule()
      } catch (error) {
--- a/src/components/dataDetails/edit-dialog.vue
View file @5f8e7d8
+++ b/src/components/dataDetails/edit-dialog.vue
View file @5f8e7d8
@@ -9,83 +9,88 @@
      <el-row>
        <el-col :span="6">
          <span>业务报文ID：</span>
-          <p>{{ ruleFormList.bizMsgID }}</p>
+          <p>{{ dataReport.bizmsgid }}</p>
        </el-col>
        <el-col :span="6">
          <span>接入报文ID：</span>
-          <p>{{ ruleFormList.asid }}</p>
+          <p>{{ dataReport.asid }}</p>
        </el-col>
        <el-col :span="6">
          <span>行政区划编码：</span>
-          <p>{{ ruleFormList.areaCode }}</p>
+          <p>{{ dataReport.areacode }}</p>
        </el-col>
        <el-col :span="6">
          <span>上次不动产单元号：</span>
-          <p>{{ ruleFormList.preestateNum }}</p>
+          <p>{{ dataReport.preestatenum }}</p>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="6">
          <span>业务编码：</span>
-          <p>{{ ruleFormList.recType }}</p>
+          <p>{{ dataReport.rectype }}</p>
        </el-col>
        <el-col :span="6">
          <span>权利类型：</span>
-          <p>{{ ruleFormList.rightType }}</p>
+          <p>{{ dataReport.righttype }}</p>
        </el-col>
        <el-col :span="6">
          <span>登记类型：</span>
-          <p>{{ ruleFormList.regType }}</p>
+          <p>{{ dataReport.regtype }}</p>
        </el-col>
        <el-col :span="6">
          <span>不动产权证书数量：</span>
-          <p>{{ ruleFormList.certCount }}</p>
+          <p>{{ dataReport.certcount }}</p>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="6">
          <span>创建时间：</span>
-          <p>{{ ruleFormList.createDate }}</p>
+          <p>{{ dataReport.syscreatedate }}</p>
        </el-col>
        <el-col :span="6">
          <span>业务流水号：</span>
-          <p>{{ ruleFormList.recFlowID }}</p>
+          <p>{{ dataReport.recflowid }}</p>
        </el-col>
        <el-col :span="6">
          <span>登记机构：</span>
-          <p>{{ ruleFormList.regOrgID }}</p>
+          <p>{{ dataReport.regorgid }}</p>
        </el-col>
        <el-col :span="6">
          <span>证明数量：</span>
-          <p>{{ ruleFormList.prllfCount }}</p>
+          <p>{{ dataReport.proofcount }}</p>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="6">
          <span>宗地/宗海代码：</span>
-          <p>{{ ruleFormList.parcelID }}</p>
+          <p>{{ dataReport.parcelid }}</p>
        </el-col>
-        <el-col :span="10">
+        <el-col :span="6">
          <span>不动产单元号：</span>
-          <p>{{ ruleFormList.estateNum }}</p>
+          <p>{{ dataReport.estatenum }}</p>
        </el-col>
-        <el-col :span="7">
+        <el-col :span="10">
          <span>上次不动产权证号/不动产登记证明：</span>
-          <p>{{ ruleFormList.preCertID }}</p>
+          <p>{{ dataReport.precertid }}</p>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <span>数字签名：</span>
+          <p>{{ dataReport.digitalsign }}</p>
        </el-col>
      </el-row>
    </div>
    <el-tabs v-model="activeName" ref="elTabs" type="card" @tab-click="changeList">
-      <el-tab-pane :name="item.soleUrl" v-for="item in headerList" :key="item.soleUrl">
+      <el-tab-pane :name="item.soleurl" v-for="item in headerList" :key="item.soleurl">
        <div slot="label" class="tab-pane-item">
-          <p class="name">{{ item.chineseTable }}</p>
+          <p class="name">{{ item.chinesetable }}</p>
-          <p class="soleUrl" :data-name="item.soleUrl">({{ item.dataTable }})</p>
+          <p class="soleurl" :data-name="item.soleurl">({{ item.datatable }})</p>
        </div>
      </el-tab-pane>
    </el-tabs>
    <div class="edit-content">
-      <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" :bsmSjsb="bsmSjsb"
+      <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bizmsgid"/>
-        :dataTable="dataTable" />
    </div>
    <div slot="footer" class="dialog_footer" ref="dialogFooter">
      <div class="dialog_button">
@@ -101,21 +106,19 @@
 <script>
 import { mapGetters } from 'vuex'
 import dataReporting from '@/api/dataReporting'
+import { getDetail } from '@/api/sbbwcx.js'
 import { MessageBox } from 'element-ui'
 export default {
  computed: {
-    ...mapGetters(['Edit'])
+    ...mapGetters(['dictData'])
  },
  props: {
-    diaData: Object,
-    bsmSjsb: {
-      type: String,
-      default: ''
-    }
  },
  data () {
    return {
+      dataReport: {},
      index: 0,
+      bsmYwsjb: '',
      ruleFormList: {
        bizMsgID: '',
        asid: '',
@@ -145,35 +148,26 @@ export default {
    }
  },
  methods: {
-    async getFormList (id) {
+    isShow (item) {
-      let { result: res } = await dataReporting.searchTaskInfoByMsgid(id)
+      this.dataReport = item;
-      this.ruleFormList = res
-    },
-    isShow () {
-      setTimeout(() => {
-        if (this.diaData && this.diaData.list) {
-          this.getFormList(this.diaData.msgId)
-          this.headerList = this.diaData.list
-          this.activeName = this.diaData.list[0].soleUrl
-          this.dataTable = this.diaData.list[0].dataTable
-          this.title = this.diaData.jrywmc
-        }
      this.dialogVisible = true
-        if (this.activeName) {
+      //获取表头列表
-          this.editItem = this.loadView(this.activeName)
+      getDetail({bizmsgid: this.dataReport.bizmsgid}).then(res => {
+        if(res.code == 200){
+          this.headerList = res.result 
        }
-      }, 0)
+      })
    },
    changeList (val) {
-      console.log(this.$refs.elTabs,)
      let _index = val.index
      if (_index > this.index) {
      }
      this.index = _index
+      this.bsmYwsjb = this.headerList[val.index].bsmYwsjb
      this.editItem = this.loadView(this.activeName)
      this.diaData.list.forEach((item) => {
-        if (item.soleUrl == this.activeName) {
+        if (item.soleurl == this.activeName) {
          this.dataTable = item.dataTable
        }
      });
--- a/src/mixins/ruleMixin.js
View file @5f8e7d8
+++ b/src/mixins/ruleMixin.js
View file @5f8e7d8
@@ -34,7 +34,7 @@ let mixin = {
    },
    async featchRule () {
      try {
-        let { result: { sysywsjbfieldlist } } = await ruleConfig.getRuleList(this.dataTable)
+        let { result: { sysywsjbfieldlist } } = await ruleConfig.getRuleList(this.bsmYwsjb)
        sysywsjbfieldlist.forEach((item) => {
          this.subRules[item.FIELD] = [
            {
--- a/src/views/sbbwcx/data/index.js
View file @5f8e7d8
+++ b/src/views/sbbwcx/data/index.js
View file @5f8e7d8
@@ -9,23 +9,23 @@ class data extends filter {
        type: 'selection'
      },
      {
-        prop: "xzqdm",
+        prop: "pcode",
        label: "行政区代码",
      },
      {
-        prop: "bdcdyh",
+        prop: "estatenum",
        label: "不动产单元号",
      },
      {
-        prop: "xzqmc",
+        prop: "pcode",
        label: "行政区名称",
      },
      {
-        prop: "ywbm",
+        prop: "rectype",
        label: "业务编码",
      },
      {
-        prop: "sbsj",
+        prop: "uploadtime",
        label: "上报时间",
      },
      {
@@ -35,9 +35,7 @@ class data extends filter {
          return (
            <div>
              {
-                scope.row.sbjg
+                 !scope.row.successflag ? '' : scope.row.successflag == '1' ? <el-tag type='success'>成功</el-tag> : <el-tag type='primary'>失败</el-tag>
-                  ? <el-tag type='success'>通过</el-tag>
-                  : <el-tag type='primary'>通过1</el-tag>
              }
            </div>
          )
--- a/src/views/sbbwcx/index.vue
View file @5f8e7d8
+++ b/src/views/sbbwcx/index.vue
View file @5f8e7d8
@@ -6,20 +6,20 @@
      <el-form ref="ruleForm" :model="form" label-width="100px">
        <el-row class="marginbtm5">
          <el-col :span="6">
-            <el-form-item label="不动产单元号" prop="bdcdyh">
+            <el-form-item label="不动产单元号" prop="estatenum">
-              <el-input v-model="form.bdcdyh" class="width100" placeholder="不动产单元号"></el-input>
+              <el-input v-model="form.estatenum" class="width100" placeholder="不动产单元号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item label="开始日期" prop="startTime">
+            <el-form-item label="开始日期" prop="reportStartTime">
              <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
-                clearable v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
+                clearable v-model="form.reportStartTime" value-format="yyyy-MM-dd"></el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item label="结束日期" prop="endTime">
+            <el-form-item label="结束日期" prop="reportEndTime">
              <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
-                clearable v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker>
+                clearable v-model="form.reportEndTime" value-format="yyyy-MM-dd"></el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="6">
@@ -33,8 +33,8 @@
        </el-row>
        <el-row>
          <el-col :span="6">
-            <el-form-item label="响应结果" prop="status">
+            <el-form-item label="响应结果" prop="state">
-              <el-select v-model="form.status" class="width100" clearable placeholder="响应结果">
+              <el-select v-model="form.state" class="width100" clearable placeholder="响应结果">
                <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
                </el-option>
              </el-select>
@@ -60,14 +60,14 @@
    <!-- 列表 -->
    <div class="from-clues-content">
      <lb-table ref="table" :heightNum="300" @selection-change="handleSelectionChange" :page-size="pageData.size"
-        :current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange"
+        :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
      </lb-table>
    </div>
    <!-- 引入详情组件 -->
    <!-- <detailDialog v-model="isShow" /> -->
    <!-- 编辑 -->
-    <dataDetails ref="editLog" :bsmSjsb="bsmSjsb" :diaData="diaData" />
+    <dataDetails ref="editLog" />
  </div>
 </template>
 <script>
@@ -78,8 +78,7 @@ import data from "./data"
 import tableMixin from '@/mixins/tableMixin.js'
 // 引入详情弹框
 import dataDetails from '@/components/dataDetails/edit-dialog'
-import sbbwcx from "@/api/sbbwcx.js";
+import {getDataReportPage} from "@/api/sbbwcx.js";
-import { getQlxxDictList, getChildDictList, refreshDictCache } from "@/api/user.js"
 export default {
  name: "sbbwcx",
@@ -90,15 +89,13 @@ export default {
  },
  data () {
    return {
-      bsmSjsb: '',
-      diaData: {},
      isShow: false,
      // 开始结束日期限制
      pickerOptionsStart: {
        disabledDate: (time) => {
-          if (this.form.endTime) {
+          if (this.form.reportEndTime) {
            return (
-              time.getTime() >= new Date(this.form.endTime).getTime()
+              time.getTime() >= new Date(this.form.reportEndTime).getTime()
            );
          }
        }
@@ -106,22 +103,21 @@ export default {
      // 结束日期限制
      pickerOptionsEnd: {
        disabledDate: (time) => {
-          if (this.form.startTime) {
+          if (this.form.reportStartTime) {
            return (
-              time.getTime() <= new Date(this.form.startTime).getTime()
+              time.getTime() <= new Date(this.form.reportStartTime).getTime()
            );
          }
        }
      },
      // 头部搜索
      form: {
-        bdcdyh: '',
+        estatenum: '',
-        startTime: '',
+        reportStartTime: '',
-        endTime: '',
+        reportEndTime: '',
        ywmc: '',
-        status: '',
+        state: '',
-        pcode: '',
+        pcode: ''
-        currentPage: 1
      },
      // table数据
      tableData: {
@@ -182,7 +178,7 @@ export default {
    },
    // 初始化数据
    featchData () {
-      sbbwcx.getDataReportPage({ ...this.form, ...this.pageData }).then(res => {
+      getDataReportPage({ ...this.form, ...this.pageData }).then(res => {
        if (res.code === 200) {
          let { total, records } = res.result
          this.tableData.total = total;
@@ -198,8 +194,7 @@ export default {
    handleEscalation () { },
    // 详情
    handleDetail (row) {
-      // this.isShow = true
+      this.$refs.editLog.isShow(row)
-      this.$refs.editLog.isShow()
    }
  }
 }
--- a/src/views/system/dictionaries/components/editDialog.vue
View file @5f8e7d8
+++ b/src/views/system/dictionaries/components/editDialog.vue
View file @5f8e7d8
@@ -17,7 +17,7 @@
      </el-row>
    </el-form>
    <lb-table :column="column" class="loadingtext" :heightNum="420" :key="key" :expand-row-keys="keyList"
-      row-key="bsmDict" :tree-props="{ children: 'children' }" :pagination="false" :data="tableData">
+      row-key="dictid" :tree-props="{ children: 'children' }" :pagination="false" :data="tableData">
    </lb-table>
  </dialogBox>
 </template>
@@ -62,18 +62,18 @@ export default {
          }
        },
        {
-          prop: 'DCODE',
+          prop: 'dcode',
          width: '100',
          label: '字典项编码',
          render: (h, scope) => {
            return (
              <div>
-                <el-input placeholder="字典项编码" disabled={this.details.ISENABLE == 2} v-show={scope.row.codeShow} v-fo value={scope.row[scope.column.property]}
+                <el-input placeholder="字典项编码" disabled={this.details.isenable == 2} v-show={scope.row.codeShow} v-fo value={scope.row[scope.column.property]}
                  onFocus={() => { this.itemShowFalse(); scope.row.codeShow = true; }}
                  onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
-                <el-input placeholder="字典项编码" disabled={this.details.ISENABLE == 2} v-show={!scope.row.codeShow} value={scope.row[scope.column.property]}
+                <el-input placeholder="字典项编码" disabled={this.details.isenable == 2} v-show={!scope.row.codeShow} value={scope.row[scope.column.property]}
                  onFocus={() => { this.itemShowFalse(); scope.row.codeShow = true; }}
                  onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
              </div>
@@ -81,16 +81,16 @@ export default {
          }
        },
        {
-          prop: 'DNAME',
+          prop: 'dname',
          label: '字典项名称',
          render: (h, scope) => {
            return (
              <div>
-                <el-input placeholder="字典项编码" disabled={this.details.ISENABLE == 2} v-show={scope.row.nameShow} v-fo value={scope.row[scope.column.property]}
+                <el-input placeholder="字典项编码" disabled={this.details.isenable == 2} v-show={scope.row.nameShow} v-fo value={scope.row[scope.column.property]}
                  onFocus={() => { this.itemShowFalse(); scope.row.nameShow = true; }}
                  onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }}></el-input>
-                <el-input placeholder="字典项名称" disabled={this.details.ISENABLE == 2} v-show={!scope.row.nameShow} value={scope.row[scope.column.property]}
+                <el-input placeholder="字典项名称" disabled={this.details.isenable == 2} v-show={!scope.row.nameShow} value={scope.row[scope.column.property]}
                  onFocus={() => { this.itemShowFalse(); scope.row.nameShow = true; }}
                  onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }}></el-input>
              </div>
@@ -98,17 +98,17 @@ export default {
          }
        },
        {
-          prop: 'NORMCODE',
+          prop: 'normcode',
          label: '部标编码',
          width: '100',
          render: (h, scope) => {
            return (
              <div>
-                <el-input placeholder="部标编码" disabled={this.details.ISENABLE == 2} v-show={scope.row.normcodeShow} v-fo value={scope.row[scope.column.property]}
+                <el-input placeholder="部标编码" disabled={this.details.isenable == 2} v-show={scope.row.normcodeShow} v-fo value={scope.row[scope.column.property]}
                  onFocus={() => { this.itemShowFalse(); scope.row.normcodeShow = true; }}
                  onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
-                <el-input placeholder="部标编码" disabled={this.details.ISENABLE == 2} v-show={!scope.row.normcodeShow} value={scope.row[scope.column.property]}
+                <el-input placeholder="部标编码" disabled={this.details.isenable == 2} v-show={!scope.row.normcodeShow} value={scope.row[scope.column.property]}
                  onFocus={() => { this.itemShowFalse(); scope.row.normcodeShow = true; }}
                  onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
              </div>
@@ -116,16 +116,16 @@ export default {
          }
        },
        {
-          prop: 'NORMNAME',
+          prop: 'normname',
          label: '部标名称',
          render: (h, scope) => {
            return (
              <div>
-                <el-input placeholder="部标名称" disabled={this.details.ISENABLE == 2} v-show={scope.row.normnameShow} v-fo value={scope.row[scope.column.property]}
+                <el-input placeholder="部标名称" disabled={this.details.isenable == 2} v-show={scope.row.normnameShow} v-fo value={scope.row[scope.column.property]}
                  onFocus={() => { this.itemShowFalse(); scope.row.normnameShow = true; }}
                  onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }}></el-input>
-                <el-input placeholder="部标名称" disabled={this.details.ISENABLE == 2} v-show={!scope.row.normnameShow} value={scope.row[scope.column.property]}
+                <el-input placeholder="部标名称" disabled={this.details.isenable == 2} v-show={!scope.row.normnameShow} value={scope.row[scope.column.property]}
                  onFocus={() => { this.itemShowFalse(); scope.row.normnameShow = true; }}
                  onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }}></el-input>
              </div>
@@ -133,12 +133,12 @@ export default {
          }
        },
        {
-          prop: 'ISENABLE',
+          prop: 'isenable',
          width: '160',
          label: '是否禁用',
          render: (h, scope) => {
            return (
-              <el-radio-group disabled={this.details.ISENABLE == 2} v-model={scope.row.ISENABLE}>
+              <el-radio-group disabled={this.details.isenable == 2} v-model={scope.row.isenable}>
                <el-radio label="1">启用</el-radio>
                <el-radio label="0">禁用</el-radio>
              </el-radio-group>
@@ -177,7 +177,7 @@ export default {
    value (val) {
      this.myValue = val
    },
-    'details.bsmDict': {
+    'details.dictid': {
      handler: function (newValue) {
        if (!this.value) return
        this.$startLoading();
@@ -243,7 +243,7 @@ export default {
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
-        removeTreeListItem(this.tableData, row.bsmDict)
+        removeTreeListItem(this.tableData, row.dictid)
        this.$message({
          type: 'success',
          message: '删除成功!'
@@ -257,7 +257,7 @@ export default {
    },
    handleSubmit () {
      editDictNode({
-        bsmDict: this.details.rowData.bsmDict,
+        dictid: this.details.rowData.dictid,
        typeid: this.details.rowData.typeid,
        children: this.tableData
      }).then(res => {
@@ -285,12 +285,12 @@ export default {
          ISENABLE: '1',
          NORMCODE: '',
          NORMNAME: '',
-          bsmDict: getUuid(32),
+          dictid: getUuid(32),
          typeid: row.typeid,
        }
      )
      this.keyList = [];
-      this.keyList.push(row.bsmDict)
+      this.keyList.push(row.dictid)
    },
    // 增加
    handleAdd () {
@@ -305,7 +305,7 @@ export default {
          ISENABLE: '1',
          normcode: '',
          normname: '',
-          bsmDict: getUuid(32),
+          dictid: getUuid(32),
          typeid: this.ruleForm.typeid,
        }
      )
@@ -314,15 +314,15 @@ export default {
    },
    // 上移下移
    moveUpward (index, row) {
-      realMove(row.bsmDict, 'UP', this.tableData)
+      realMove(row.dictid, 'UP', this.tableData)
      this.key++
-      let id = findParents(this.tableData, row.bsmDict)
+      let id = findParents(this.tableData, row.dictid)
      this.keyList = id
    },
    moveDown (index, row) {
-      realMove(row.bsmDict, 'DOWN', this.tableData)
+      realMove(row.dictid, 'DOWN', this.tableData)
      this.key++
-      let id = findParents(this.tableData, row.bsmDict)
+      let id = findParents(this.tableData, row.dictid)
      this.keyList = id
    }
  }
--- a/src/views/system/dictionaries/dictionaries.js
View file @5f8e7d8
+++ b/src/views/system/dictionaries/dictionaries.js
View file @5f8e7d8
@@ -23,11 +23,11 @@ class data extends filter {
        }
      },
      {
-        prop: "DCODE",
+        prop: "dcode",
        label: "字典类型编码",
      },
      {
-        prop: "DNAME",
+        prop: "dname",
        label: "字典类型名称",
      },
      {
--- a/src/views/system/dictionaries/dictionaries.vue
View file @5f8e7d8
+++ b/src/views/system/dictionaries/dictionaries.vue
View file @5f8e7d8
@@ -52,7 +52,7 @@ export default {
    return {
      isDialog: false,
      details: {
-        bsmDict: '',
+        dictid: '',
        isenable: 1,
        rowData: {}
      },
@@ -107,7 +107,7 @@ export default {
    editClick (row, val) {
      this.details.rowData = row
      this.details.isenable = val
-      this.details.bsmDict = row.bsmDict
+      this.details.dictid = row.dictid
      this.isDialog = true
    }
  }