@@ -15,7 +15,7 @@ try { | |||||
Vue.use(Router) | Vue.use(Router) | ||||
export default new Router({ | export default new Router({ | ||||
mode: 'history', | |||||
mode: 'hash', | |||||
base: process.env.BASE_URL, | base: process.env.BASE_URL, | ||||
scrollBehavior: () => ({ y: 0 }), | scrollBehavior: () => ({ y: 0 }), | ||||
routes: constantRouterMap | routes: constantRouterMap |
@@ -71,7 +71,6 @@ | |||||
</a-table> | </a-table> | ||||
</div> | </div> | ||||
<basCustomer-modal ref="modalForm" @ok="modalFormOk"></basCustomer-modal> | <basCustomer-modal ref="modalForm" @ok="modalFormOk"></basCustomer-modal> | ||||
</a-card> | </a-card> | ||||
</template> | </template> | ||||
@@ -98,6 +97,7 @@ | |||||
dataIndex: '', | dataIndex: '', | ||||
key:'rowIndex', | key:'rowIndex', | ||||
width:40, | width:40, | ||||
fixed: 'left', | |||||
align:"center", | align:"center", | ||||
customRender:function (t,r,index) { | customRender:function (t,r,index) { | ||||
return parseInt(index)+1; | return parseInt(index)+1; | ||||
@@ -118,19 +118,21 @@ | |||||
{ | { | ||||
title:'简称', | title:'简称', | ||||
width:160, | width:160, | ||||
ellipsis: true, | |||||
align:"center", | align:"center", | ||||
dataIndex: 'shortName' | dataIndex: 'shortName' | ||||
}, | }, | ||||
{ | { | ||||
title:'等级', | title:'等级', | ||||
width:60, | |||||
width:80, | |||||
align:"center", | align:"center", | ||||
dataIndex: 'customerLevelId_dictText' | dataIndex: 'customerLevelId_dictText' | ||||
}, | }, | ||||
{ | { | ||||
title:'纳税规模', | title:'纳税规模', | ||||
width:100, | |||||
width:150, | |||||
align:"center", | align:"center", | ||||
ellipsis: true, | |||||
dataIndex: 'taxScale' | dataIndex: 'taxScale' | ||||
}, | }, | ||||
{ | { | ||||
@@ -161,6 +163,7 @@ | |||||
title: '操作', | title: '操作', | ||||
dataIndex: 'action', | dataIndex: 'action', | ||||
width:120, | width:120, | ||||
fixed:"right", | |||||
align:"center", | align:"center", | ||||
scopedSlots: { customRender: 'action' } | scopedSlots: { customRender: 'action' } | ||||
} | } | ||||
@@ -183,7 +186,6 @@ | |||||
methods: { | methods: { | ||||
initDictConfig(){ | initDictConfig(){ | ||||
}, | }, | ||||
myHandleAdd(){ | myHandleAdd(){ | ||||
this.$refs.modalForm.action = "add"; | this.$refs.modalForm.action = "add"; | ||||
this.handleAdd(); | this.handleAdd(); | ||||
@@ -195,8 +197,7 @@ | |||||
myHandleDetail(record){ | myHandleDetail(record){ | ||||
this.$refs.modalForm.action = "detail"; | this.$refs.modalForm.action = "detail"; | ||||
this.handleDetail(record); | this.handleDetail(record); | ||||
}, | |||||
} | |||||
} | } | ||||
} | } | ||||
</script> | </script> | ||||
@@ -119,6 +119,7 @@ | |||||
title:'简称', | title:'简称', | ||||
width:160, | width:160, | ||||
align:"left", | align:"left", | ||||
ellipsis: true, | |||||
dataIndex: 'shortName' | dataIndex: 'shortName' | ||||
}, | }, | ||||
{ | { | ||||
@@ -131,23 +132,28 @@ | |||||
title:'纳税规模', | title:'纳税规模', | ||||
width:100, | width:100, | ||||
align:"center", | align:"center", | ||||
ellipsis: true, | |||||
dataIndex: 'taxScale_dictText' | dataIndex: 'taxScale_dictText' | ||||
}, | }, | ||||
{ | { | ||||
title:'所属地区', | title:'所属地区', | ||||
width:120, | width:120, | ||||
align:"left", | align:"left", | ||||
ellipsis: true, | |||||
dataIndex: 'area' | dataIndex: 'area' | ||||
}, | }, | ||||
{ | { | ||||
title:'业务地域', | title:'业务地域', | ||||
width:120, | width:120, | ||||
align:"left", | align:"left", | ||||
ellipsis: true, | |||||
dataIndex: 'bizArea' | dataIndex: 'bizArea' | ||||
}, | }, | ||||
{ | { | ||||
title:'所属总公司', | title:'所属总公司', | ||||
align:"center", | align:"center", | ||||
width:120, | |||||
ellipsis: true, | |||||
dataIndex: 'headquarters' | dataIndex: 'headquarters' | ||||
}, | }, | ||||
{ | { | ||||
@@ -1,6 +1,6 @@ | |||||
<template> | <template> | ||||
<j-modal | |||||
:title="'客户 - ' + title" | |||||
<!-- <j-modal --> | |||||
<!-- :title="'客户 - ' + title" | |||||
:width="width" | :width="width" | ||||
:visible="visible" | :visible="visible" | ||||
:confirmLoading="confirmLoading" | :confirmLoading="confirmLoading" | ||||
@@ -8,13 +8,19 @@ | |||||
:keyboard="false" | :keyboard="false" | ||||
:forceRender="true" | :forceRender="true" | ||||
switchFullscreen | switchFullscreen | ||||
@cancel="handleCancel"> | |||||
<template slot="footer"> | |||||
@cancel="handleCancel"> --> | |||||
<a-drawer | |||||
:title="'客户 - ' + title" | |||||
:width="width" | |||||
placement="right" | |||||
:closable="readOnly" | |||||
@close="handleCancel" | |||||
:visible="visible"> | |||||
<!-- <template slot="footer"> | |||||
<a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button> | <a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button> | ||||
<a-button v-if="!readOnly" key="save" @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button> | <a-button v-if="!readOnly" key="save" @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button> | ||||
<a-button v-if="action==='detail'" key="close" @click="handleCancel" type="primary">关闭</a-button> | <a-button v-if="action==='detail'" key="close" @click="handleCancel" type="primary">关闭</a-button> | ||||
</template> | |||||
</template> --> | |||||
<a-spin :spinning="confirmLoading"> | <a-spin :spinning="confirmLoading"> | ||||
<a-form :form="form"> | <a-form :form="form"> | ||||
@@ -210,9 +216,17 @@ | |||||
</a-form-item> | </a-form-item> | ||||
</a-col> | </a-col> | ||||
</a-row> | </a-row> | ||||
<a-row> | |||||
<a-col :span="12" :offset="10"> | |||||
<a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button> | |||||
<a-button v-if="action==='detail'" key="close" @click="handleCancel" type="primary">关闭</a-button> | |||||
<a-button style="margin-left: 18px" v-if="!readOnly" key="save" @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button> | |||||
</a-col> | |||||
</a-row> | |||||
</a-form> | </a-form> | ||||
</a-spin> | </a-spin> | ||||
</j-modal> | |||||
</a-drawer> | |||||
<!-- </j-modal> --> | |||||
</template> | </template> | ||||
<script> | <script> | ||||
@@ -1,6 +1,6 @@ | |||||
<template> | <template> | ||||
<j-modal | |||||
:title="'供应商 - ' + title" | |||||
<!-- <j-modal --> | |||||
<!-- :title="'供应商 - ' + title" | |||||
:width="width" | :width="width" | ||||
:visible="visible" | :visible="visible" | ||||
:confirmLoading="confirmLoading" | :confirmLoading="confirmLoading" | ||||
@@ -8,13 +8,20 @@ | |||||
:keyboard="false" | :keyboard="false" | ||||
:forceRender="true" | :forceRender="true" | ||||
switchFullscreen | switchFullscreen | ||||
@cancel="handleCancel"> | |||||
@cancel="handleCancel"> --> | |||||
<template slot="footer"> | |||||
<a-drawer | |||||
:title="'供应商 - ' + title" | |||||
:width="width" | |||||
placement="right" | |||||
:closable="readOnly" | |||||
@close="handleCancel" | |||||
:visible="visible"> | |||||
<!-- <template slot="footer"> | |||||
<a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button> | <a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button> | ||||
<a-button v-if="!readOnly" key="save" @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button> | <a-button v-if="!readOnly" key="save" @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button> | ||||
<a-button v-if="action==='detail'" key="close" @click="handleCancel" type="primary">关闭</a-button> | <a-button v-if="action==='detail'" key="close" @click="handleCancel" type="primary">关闭</a-button> | ||||
</template> | |||||
</template> --> | |||||
<a-spin :spinning="confirmLoading"> | <a-spin :spinning="confirmLoading"> | ||||
<a-form :form="form"> | <a-form :form="form"> | ||||
@@ -210,9 +217,17 @@ | |||||
</a-form-item> | </a-form-item> | ||||
</a-col> | </a-col> | ||||
</a-row> | </a-row> | ||||
<a-row> | |||||
<a-col :span="12" :offset="10"> | |||||
<a-button v-if="action!=='detail'" key="cancel" @click="handleCancel">取消</a-button> | |||||
<a-button v-if="action==='detail'" key="close" @click="handleCancel" type="primary">关闭</a-button> | |||||
<a-button style="margin-left: 18px" v-if="!readOnly" key="save" @click="handleOk" type="primary" :loading="confirmLoading">保存</a-button> | |||||
</a-col> | |||||
</a-row> | |||||
</a-form> | </a-form> | ||||
</a-spin> | </a-spin> | ||||
</j-modal> | |||||
<!-- </j-modal> --> | |||||
</a-drawer> | |||||
</template> | </template> | ||||
<script> | <script> | ||||