完善

src/views/sb/guige/SbGuige.vue

@@ -1,67 +1,70 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item :label="$t('m.common.search_keyword')">
-              <a-input v-model="queryParam.keyword" :placeholder="$t('m.common.search_placeholder')"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8 || 24" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">{{$t('m.common.search')}}</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">{{$t('m.common.search_reset')}}</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <div v-show="visible">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline">
+          <a-row :gutter="48">
+            <a-col :md="8" :sm="24">
+              <a-form-item :label="$t('m.common.search_keyword')">
+                <a-input v-model="queryParam.keyword" :placeholder="$t('m.common.search_placeholder')"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="8 || 24" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="$refs.table.refresh(true)">{{ $t('m.common.search') }}</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm">{{ $t('m.common.search_reset') }}</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
 
-    <div class="table-operator">
-      <a-button v-if="$auth('sb-guiges-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">{{$t('m.common.add')}}</a-button>
-      <a-button style="margin-left: 8px" v-if="$auth('sb-guiges-export')" type="primary" icon="download" @click="doExport">{{$t('m.common.export')}}</a-button>
-      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-guiges-del')">
-        <a-menu slot="overlay">
-          <a-popconfirm :title="$t('m.common.deleteConfirmTips')" @confirm="batchDelete()">
-            <a-menu-item key="1"><a-icon type="delete" /><a>{{$t('m.common.delete')}}</a></a-menu-item>
-          </a-popconfirm>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          {{$t('m.common.batchAction')}} <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
+      <div class="table-operator">
+        <a-button v-if="$auth('sb-guiges-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">{{ $t('m.common.add') }}</a-button>
+        <a-button style="margin-left: 8px" v-if="$auth('sb-guiges-export')" type="primary" icon="download" @click="doExport">{{ $t('m.common.export') }}</a-button>
+        <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-guiges-del')">
+          <a-menu slot="overlay">
+            <a-popconfirm :title="$t('m.common.deleteConfirmTips')" @confirm="batchDelete()">
+              <a-menu-item key="1"><a-icon type="delete" /><a>{{ $t('m.common.delete') }}</a></a-menu-item>
+            </a-popconfirm>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            {{ $t('m.common.batchAction') }} <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
 
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
-      <span slot="action" slot-scope="record">
-        <template>
-          <a @click="handleView(record)"> {{$t('m.common.detail')}}</a>
-          <a-divider type="vertical" />
-          <a v-if="$auth('sb-guiges-edit')" @click="handleEdit(record)"> {{$t('m.common.edit')}}</a>
-          <a-divider type="vertical" />
-          <a-popconfirm v-if="$auth('sb-guiges-del')" :title="$t('m.common.deleteConfirmTips')" @confirm="batchDelete(record.id)">
-            <a>{{$t('m.common.delete')}}</a>
-          </a-popconfirm>
-        </template>
-      </span>
-      <span slot="delFlag" slot-scope="text">
-        <badge
-          :status="DictCache.COLOR.DELFLAG[text]"
-          :text="delFlagMap[text]" />
-      </span>
-    </s-table>
+      <s-table
+        ref="table"
+        size="default"
+        rowKey="id"
+        :columns="columns"
+        :data="loadData"
+        :alert="options.alert"
+        :rowSelection="options.rowSelection"
+        showPagination="auto"
+      >
+        <span slot="action" slot-scope="record">
+          <template>
+            <a @click="handleView(record)"> {{ $t('m.common.detail') }}</a>
+            <a-divider type="vertical" />
+            <a @click="handleEdit(record)"> {{ $t('m.common.edit') }}</a>
+            <a-divider type="vertical" />
+            <a-popconfirm v-if="$auth('s' +
+             'b-guiges-del')" :title="$t('m.common.deleteConfirmTips')" @confirm="batchDelete(record.id)">
+              <a>{{ $t('m.common.delete') }}</a>
+            </a-popconfirm>
+          </template>
+        </span>
+        <span slot="delFlag" slot-scope="text">
+          <badge
+            :status="DictCache.COLOR.DELFLAG[text]"
+            :text="delFlagMap[text]" />
+        </span>
+      </s-table>
+    </div>
     <base-form ref="baseModal" @ok="handleOk"/>
-    <detail ref="detailModal"/>
+    <detail ref="detailModal" @ok="handleOk"/>
   </a-card>
 </template>
 
@@ -82,6 +85,7 @@ export default {
   },
   data () {
     return {
+      visible: true,
       // 查询参数
       queryParam: {
       },
@@ -95,10 +99,10 @@ export default {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
-        //{
-         // title: '编号',
-         // dataIndex: 'no'
-        //},
+        // {
+        // title: '编号',
+        // dataIndex: 'no'
+        // },
         {
           title: '名称',
           dataIndex: 'name'
@@ -107,14 +111,14 @@ export default {
           title: '排序',
           dataIndex: 'sort'
         },
-       // {
+        // {
         //  title: '备注',
         //  dataIndex: 'remark'
-       // },
-        //{
-         // title: '创建时间',
-          //dataIndex: 'createdTime'
-        //},
+        // },
+        // {
+        // title: '创建时间',
+        // dataIndex: 'createdTime'
+        // },
         {
           title: '是否删除',
           dataIndex: 'delFlag',
@@ -204,18 +208,21 @@ export default {
       })
     },
     handleEdit (record) {
+      this.visible = false
       fetchSbGuige({ id: record.id }).then(res => {
         const modal = this.$refs.baseModal
         modal.base(res.data)
       })
     },
     handleView (record) {
+      this.visible = false
       fetchSbGuige({ id: record.id }).then(res => {
         const modal = this.$refs.detailModal
         modal.base(res.data)
       })
     },
     handleOk () {
+      this.visible = true
       this.$refs.table.refresh()
     },
     onSelectChange (selectedRowKeys, selectedRows) {

src/views/sb/guige/modules/BaseForm.vue

@@ -1,17 +1,9 @@
 <template>
-  <a-modal
-    :title="modalTitle"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @cancel="handleCancel"
-  >
+  <a-card v-show="visible" :title="modalTitle">
     <a-form :form="form">
-
       <a-form-item v-show="false" >
         <a-input v-decorator="['id']" type="hidden"/>
       </a-form-item>
-
       <a-form-item
         label="编码"
         :labelCol="BaseTool.Constant.labelCol"
@@ -61,11 +53,16 @@
         <a-input
           v-decorator="['remark', {rules: [{required: false, message: '备注不能为空'}]}]" />
       </a-form-item>
+      <a-form-item :wrapper-col="{ span: 12, offset: 11 }">
+        <a-button type="primary" @click="save()">
+          保存
+        </a-button>
+        <a-button type="default" @click="handleCancel()">
+          返回
+        </a-button>
+      </a-form-item>
     </a-form>
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-    </template>
-  </a-modal>
+  </a-card>
 </template>
 
 <script>

src/views/sb/guige/modules/Detail.vue

@@ -1,25 +1,19 @@
 <template>
-  <a-modal
-    :title="modalTitle"
-    :width="850"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @cancel="handleCancel"
-  >
-    <detail-list title="" :col="2">
-      <detail-list-item term="编码">{{ model.no }}</detail-list-item>
-      <detail-list-item term="名称">{{ model.name }}</detail-list-item>
-      <detail-list-item term="排序">{{ model.sort }}</detail-list-item>
-      <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
-      <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
-      <detail-list-item term="是否删除"><badge :status="DictCache.COLOR.DELFLAG[model.delFlag]" :text="delFlagMap[model.delFlag]"></badge></detail-list-item>
-      <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-    </detail-list>
-
-    <template slot="footer">
-      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
-    </template>
-  </a-modal>
+  <a-card v-show="visible" :title="modalTitle">
+    <a slot="extra" @click="handleCancel()">返回</a>
+    <div>
+      <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>基本信息</b></div>
+      <a-descriptions bordered :column="3">
+        <a-descriptions-item label="编码">{{ model.no }}</a-descriptions-item>
+        <a-descriptions-item label="名称">{{ model.name }}</a-descriptions-item>
+        <a-descriptions-item label="排序">{{ model.sort }}</a-descriptions-item>
+        <a-descriptions-item label="备注">{{ model.remark }}</a-descriptions-item>
+        <a-descriptions-item label="创建人">{{ model.createdUserName }}</a-descriptions-item>
+        <a-descriptions-item label="是否删除"><badge :status="DictCache.COLOR.DELFLAG[model.delFlag]" :text="delFlagMap[model.delFlag]"></badge></a-descriptions-item>
+        <a-descriptions-item label="更新日期">{{ model.updateTime }}</a-descriptions-item>
+      </a-descriptions>
+    </div>
+  </a-card>
 </template>
 
 <script>
@@ -63,8 +57,12 @@ export default {
     handleCancel () {
       this.visible = false
       this.confirmLoading = false
+      this.$emit("ok")
     }
 
   }
 }
 </script>
+<style scoped>
+
+</style>