Skip to content
GitLab
Commit b6cf6d4a authored by 季圣华's avatar 季圣华
Browse files

给部分表增加启用状态和排序字段，完善对应页面

parent f8e542cb
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/views/material/modules/MaterialModal.vue
View file @ b6cf6d4a
...@@ -732,9 +732,9 @@ ...@@ -732,9 +732,9 @@
let params = {}; let params = {};
params.currentPage = 1; params.currentPage = 1;
params.pageSize = 100; params.pageSize = 100;
getAction('/unit/list', params).then((res) => { getAction('/unit/getAllList', params).then((res) => {
if(res){ if(res){
that.unitList = res.data.rows; that.unitList = res.data;
} }
}) })
}, },
......
jshERP-web/src/views/system/AccountList.vue
View file @ b6cf6d4a
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
<a-dropdown> <a-dropdown>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
</a-menu> </a-menu>
<a-button> <a-button>
批量操作 <a-icon type="down" /> 批量操作 <a-icon type="down" />
...@@ -70,6 +72,10 @@ ...@@ -70,6 +72,10 @@
</a-popconfirm> </a-popconfirm>
</span> </span>
<!-- 状态渲染模板 --> <!-- 状态渲染模板 -->
<template slot="customRenderEnabledFlag" slot-scope="enabled">
<a-tag v-if="enabled" color="green">启用</a-tag>
<a-tag v-if="!enabled" color="orange">禁用</a-tag>
</template>
<template slot="customRenderFlag" slot-scope="isDefault"> <template slot="customRenderFlag" slot-scope="isDefault">
<a-tag v-if="isDefault" color="green">是</a-tag> <a-tag v-if="isDefault" color="green">是</a-tag>
<a-tag v-if="!isDefault" color="orange">否</a-tag> <a-tag v-if="!isDefault" color="orange">否</a-tag>
...@@ -119,14 +125,18 @@ ...@@ -119,14 +125,18 @@
return parseInt(index)+1; return parseInt(index)+1;
} }
}, },
{title: '名称', dataIndex: 'name', width: 100}, { title: '名称', dataIndex: 'name', width: 100},
{title: '编号', dataIndex: 'serialNo', width: 150, align: "center"}, { title: '编号', dataIndex: 'serialNo', width: 150, align: "center"},
{title: '期初金额', dataIndex: 'initialAmount', width: 100, align: "center"}, { title: '期初金额', dataIndex: 'initialAmount', width: 100, align: "center"},
{title: '当前余额', dataIndex: 'currentAmount', width: 100, align: "center"}, { title: '当前余额', dataIndex: 'currentAmount', width: 100, align: "center"},
{ title: '是否默认',dataIndex: 'isDefault',width:100,align:"center", { title: '备注', dataIndex: 'remark', width: 100},
{ title: '排序', dataIndex: 'sort', width: 60},
{ title: '状态',dataIndex: 'enabled',width:60,align:"center",
scopedSlots: { customRender: 'customRenderEnabledFlag' }
},
{ title: '是否默认',dataIndex: 'isDefault',width:80,align:"center",
scopedSlots: { customRender: 'customRenderFlag' } scopedSlots: { customRender: 'customRenderFlag' }
}, },
{title: '备注', dataIndex: 'remark', width: 100},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
...@@ -139,7 +149,8 @@ ...@@ -139,7 +149,8 @@
list: "/account/list", list: "/account/list",
delete: "/account/delete", delete: "/account/delete",
deleteBatch: "/account/deleteBatch", deleteBatch: "/account/deleteBatch",
setDefault: "/account/updateIsDefault" setDefault: "/account/updateIsDefault",
batchSetStatusUrl: "/account/batchSetStatus"
} }
} }
}, },
......
jshERP-web/src/views/system/CustomerList.vue
View file @ b6cf6d4a
...@@ -142,7 +142,8 @@ ...@@ -142,7 +142,8 @@
{ title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"}, { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"},
{ title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"}, { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"},
{ title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"}, { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"},
{ title: '状态',dataIndex: 'enabled',width:70,align:"center", { title: '排序', dataIndex: 'sort', width: 60},
{ title: '状态',dataIndex: 'enabled',width:60, align:"center",
scopedSlots: { customRender: 'customRenderFlag' } scopedSlots: { customRender: 'customRenderFlag' }
}, },
{ {
......
jshERP-web/src/views/system/DepotList.vue
View file @ b6cf6d4a
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
<a-dropdown> <a-dropdown>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
</a-menu> </a-menu>
<a-button> <a-button>
批量操作 <a-icon type="down" /> 批量操作 <a-icon type="down" />
...@@ -65,6 +67,10 @@ ...@@ -65,6 +67,10 @@
</a-popconfirm> </a-popconfirm>
</span> </span>
<!-- 状态渲染模板 --> <!-- 状态渲染模板 -->
<template slot="customRenderEnabledFlag" slot-scope="enabled">
<a-tag v-if="enabled" color="green">启用</a-tag>
<a-tag v-if="!enabled" color="orange">禁用</a-tag>
</template>
<template slot="customRenderFlag" slot-scope="isDefault"> <template slot="customRenderFlag" slot-scope="isDefault">
<a-tag v-if="isDefault" color="green">是</a-tag> <a-tag v-if="isDefault" color="green">是</a-tag>
<a-tag v-if="!isDefault" color="orange">否</a-tag> <a-tag v-if="!isDefault" color="orange">否</a-tag>
...@@ -119,11 +125,14 @@ ...@@ -119,11 +125,14 @@
{title: '仓储费', dataIndex: 'warehousing', width: 80}, {title: '仓储费', dataIndex: 'warehousing', width: 80},
{title: '搬运费', dataIndex: 'truckage', width: 80}, {title: '搬运费', dataIndex: 'truckage', width: 80},
{title: '负责人', dataIndex: 'principalName', width: 80}, {title: '负责人', dataIndex: 'principalName', width: 80},
{title: '排序', dataIndex: 'sort', width: 80}, {title: '备注', dataIndex: 'remark', width: 120},
{title: '是否默认',dataIndex: 'isDefault',width:100,align:"center", {title: '排序', dataIndex: 'sort', width: 60},
{ title: '状态',dataIndex: 'enabled',width:60,align:"center",
scopedSlots: { customRender: 'customRenderEnabledFlag' }
},
{title: '是否默认',dataIndex: 'isDefault',width:80,align:"center",
scopedSlots: { customRender: 'customRenderFlag' } scopedSlots: { customRender: 'customRenderFlag' }
}, },
{title: '备注', dataIndex: 'remark', width: 120},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
...@@ -136,7 +145,8 @@ ...@@ -136,7 +145,8 @@
list: "/depot/list", list: "/depot/list",
delete: "/depot/delete", delete: "/depot/delete",
deleteBatch: "/depot/deleteBatch", deleteBatch: "/depot/deleteBatch",
setDefault: "/depot/updateIsDefault" setDefault: "/depot/updateIsDefault",
batchSetStatusUrl: "/depot/batchSetStatus"
} }
} }
}, },
......
jshERP-web/src/views/system/InOutItemList.vue
View file @ b6cf6d4a
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
<a-dropdown> <a-dropdown>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
</a-menu> </a-menu>
<a-button> <a-button>
批量操作 <a-icon type="down" /> 批量操作 <a-icon type="down" />
...@@ -69,9 +71,9 @@ ...@@ -69,9 +71,9 @@
</a-popconfirm> </a-popconfirm>
</span> </span>
<!-- 状态渲染模板 --> <!-- 状态渲染模板 -->
<template slot="customRenderFlag" slot-scope="isDefault"> <template slot="customRenderFlag" slot-scope="enabled">
<a-tag v-if="isDefault" color="green">是</a-tag> <a-tag v-if="enabled" color="green">启用</a-tag>
<a-tag v-if="!isDefault" color="orange">否</a-tag> <a-tag v-if="!enabled" color="orange">禁用</a-tag>
</template> </template>
</a-table> </a-table>
</div> </div>
...@@ -117,9 +119,13 @@ ...@@ -117,9 +119,13 @@
return parseInt(index)+1; return parseInt(index)+1;
} }
}, },
{title: '名称', dataIndex: 'name', width: 200}, { title: '名称', dataIndex: 'name', width: 200},
{title: '类型', dataIndex: 'type', width: 100}, { title: '类型', dataIndex: 'type', width: 100},
{title: '备注', dataIndex: 'remark', width: 200}, { title: '备注', dataIndex: 'remark', width: 200},
{ title: '排序', dataIndex: 'sort', width: 60},
{ title: '状态',dataIndex: 'enabled',width:60,align:"center",
scopedSlots: { customRender: 'customRenderFlag' }
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
...@@ -131,7 +137,8 @@ ...@@ -131,7 +137,8 @@
url: { url: {
list: "/inOutItem/list", list: "/inOutItem/list",
delete: "/inOutItem/delete", delete: "/inOutItem/delete",
deleteBatch: "/inOutItem/deleteBatch" deleteBatch: "/inOutItem/deleteBatch",
batchSetStatusUrl: "/inOutItem/batchSetStatus"
} }
} }
}, },
......
jshERP-web/src/views/system/MemberList.vue
View file @ b6cf6d4a
...@@ -139,7 +139,8 @@ ...@@ -139,7 +139,8 @@
{ title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"}, { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"},
{ title: '电子邮箱', dataIndex: 'email',width:150,align:"center"}, { title: '电子邮箱', dataIndex: 'email',width:150,align:"center"},
{ title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"}, { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"},
{ title: '状态',dataIndex: 'enabled',width:70,align:"center", { title: '排序', dataIndex: 'sort', width: 60},
{ title: '状态',dataIndex: 'enabled',width:60,align:"center",
scopedSlots: { customRender: 'customRenderFlag' } scopedSlots: { customRender: 'customRenderFlag' }
}, },
{ {
......
jshERP-web/src/views/system/PersonList.vue
View file @ b6cf6d4a
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
<a-dropdown> <a-dropdown>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
</a-menu> </a-menu>
<a-button> <a-button>
批量操作 <a-icon type="down" /> 批量操作 <a-icon type="down" />
...@@ -64,6 +66,11 @@ ...@@ -64,6 +66,11 @@
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
</span> </span>
<!-- 状态渲染模板 -->
<template slot="customRenderFlag" slot-scope="enabled">
<a-tag v-if="enabled" color="green">启用</a-tag>
<a-tag v-if="!enabled" color="orange">禁用</a-tag>
</template>
</a-table> </a-table>
</div> </div>
<!-- table区域-end --> <!-- table区域-end -->
...@@ -109,16 +116,14 @@ ...@@ -109,16 +116,14 @@
} }
}, },
{ {
title: '姓名', title: '姓名', align:"center", dataIndex: 'name', width: 100,
align:"center",
dataIndex: 'name',
width: 100,
}, },
{ {
title: '类型', title: '类型', align:"center", dataIndex: 'type', width: 100,
align:"center", },
dataIndex: 'type', { title: '排序', dataIndex: 'sort', width: 60},
width: 100, { title: '状态',dataIndex: 'enabled',width:60,align:"center",
scopedSlots: { customRender: 'customRenderFlag' }
}, },
{ {
title: '操作', title: '操作',
...@@ -131,7 +136,8 @@ ...@@ -131,7 +136,8 @@
url: { url: {
list: "/person/list", list: "/person/list",
delete: "/person/delete", delete: "/person/delete",
deleteBatch: "/person/deleteBatch" deleteBatch: "/person/deleteBatch",
batchSetStatusUrl: "/person/batchSetStatus"
} }
} }
}, },
......
jshERP-web/src/views/system/RoleList.vue
View file @ b6cf6d4a
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
<a-dropdown> <a-dropdown>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
</a-menu> </a-menu>
<a-button> <a-button>
批量操作 <a-icon type="down" /> 批量操作 <a-icon type="down" />
...@@ -58,6 +60,11 @@ ...@@ -58,6 +60,11 @@
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
</span> </span>
<!-- 状态渲染模板 -->
<template slot="customRenderFlag" slot-scope="enabled">
<a-tag v-if="enabled" color="green">启用</a-tag>
<a-tag v-if="!enabled" color="orange">禁用</a-tag>
</template>
</a-table> </a-table>
</div> </div>
<!-- table区域-end --> <!-- table区域-end -->
...@@ -115,22 +122,17 @@ ...@@ -115,22 +122,17 @@
} }
}, },
{ {
title: '角色名称', title: '角色名称', align:"center", dataIndex: 'name', width: 100
align:"center",
dataIndex: 'name',
width: 100
}, },
{ {
title: '数据类型', title: '数据类型', align:"center", dataIndex: 'type', width: 100
align:"center",
dataIndex: 'type',
width: 100
}, },
{ {
title: '描述', title: '描述', align:"center", dataIndex: 'description', width: 100
align:"center", },
dataIndex: 'description', { title: '排序', dataIndex: 'sort', width: 60},
width: 100 { title: '状态',dataIndex: 'enabled',width:60,align:"center",
scopedSlots: { customRender: 'customRenderFlag' }
}, },
{ {
title: '操作', title: '操作',
...@@ -143,7 +145,8 @@ ...@@ -143,7 +145,8 @@
url: { url: {
list: "/role/list", list: "/role/list",
delete: "/role/delete", delete: "/role/delete",
deleteBatch: "/role/deleteBatch" deleteBatch: "/role/deleteBatch",
batchSetStatusUrl: "/role/batchSetStatus"
}, },
} }
}, },
......
jshERP-web/src/views/system/UnitList.vue
View file @ b6cf6d4a
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
<a-dropdown> <a-dropdown>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
</a-menu> </a-menu>
<a-button> <a-button>
批量操作 <a-icon type="down" /> 批量操作 <a-icon type="down" />
...@@ -54,6 +56,11 @@ ...@@ -54,6 +56,11 @@
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
</span> </span>
<!-- 状态渲染模板 -->
<template slot="customRenderFlag" slot-scope="enabled">
<a-tag v-if="enabled" color="green">启用</a-tag>
<a-tag v-if="!enabled" color="orange">禁用</a-tag>
</template>
</a-table> </a-table>
</div> </div>
<!-- table区域-end --> <!-- table区域-end -->
...@@ -125,10 +132,13 @@ ...@@ -125,10 +132,13 @@
} }
} }
}, },
{ title: '状态',dataIndex: 'enabled',width:60,align:"center",
scopedSlots: { customRender: 'customRenderFlag' }
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
width:120, width:100,
align:"center", align:"center",
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
} }
...@@ -136,7 +146,8 @@ ...@@ -136,7 +146,8 @@
url: { url: {
list: "/unit/list", list: "/unit/list",
delete: "/unit/delete", delete: "/unit/delete",
deleteBatch: "/unit/deleteBatch" deleteBatch: "/unit/deleteBatch",
batchSetStatusUrl: "/unit/batchSetStatus"
} }
} }
}, },
......
jshERP-web/src/views/system/VendorList.vue
View file @ b6cf6d4a
...@@ -141,7 +141,8 @@ ...@@ -141,7 +141,8 @@
{ title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"}, { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"},
{ title: '期末应付',dataIndex: 'allNeedPay',width:80,align:"center"}, { title: '期末应付',dataIndex: 'allNeedPay',width:80,align:"center"},
{ title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"}, { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"},
{ title: '状态',dataIndex: 'enabled',width:70,align:"center", { title: '排序', dataIndex: 'sort', width: 60},
{ title: '状态',dataIndex: 'enabled',width:60,align:"center",
scopedSlots: { customRender: 'customRenderFlag' } scopedSlots: { customRender: 'customRenderFlag' }
}, },
{ {
......
jshERP-web/src/views/system/modules/AccountModal.vue
View file @ b6cf6d4a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@cancel="handleCancel" @cancel="handleCancel"
cancelText="关闭" cancelText="关闭"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
style="top:20%;height: 60%;overflow-y: hidden"> style="top:20%;height: 65%;overflow-y: hidden">
<template slot="footer"> <template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> <a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭 关闭
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="当前余额"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="当前余额">
<a-input placeholder="请输入当前余额" :read-only="true" v-decorator.trim="[ 'currentAmount' ]" /> <a-input placeholder="请输入当前余额" :read-only="true" v-decorator.trim="[ 'currentAmount' ]" />
</a-form-item> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" /> <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" />
</a-form-item> </a-form-item>
...@@ -84,7 +87,7 @@ ...@@ -84,7 +87,7 @@
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'name', 'serialNo', 'initialAmount', 'currentAmount', 'remark')) this.form.setFieldsValue(pick(this.model,'name', 'serialNo', 'initialAmount', 'currentAmount', 'sort', 'remark'))
autoJumpNextInput('accountModal') autoJumpNextInput('accountModal')
}); });
}, },
......
jshERP-web/src/views/system/modules/CustomerModal.vue
View file @ b6cf6d4a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@cancel="handleCancel" @cancel="handleCancel"
cancelText="关闭" cancelText="关闭"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
style="top:15%;height: 70%;overflow-y: hidden"> style="top:15%;height: 75%;overflow-y: hidden">
<template slot="footer"> <template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> <a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭 关闭
...@@ -81,6 +81,11 @@ ...@@ -81,6 +81,11 @@
<a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" /> <a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2"> <a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" /> <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
...@@ -136,7 +141,7 @@ ...@@ -136,7 +141,7 @@
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone', this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'allNeedGet', 'allNeedPay', 'taxNum', 'taxRate', 'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'allNeedGet', 'allNeedPay', 'taxNum', 'taxRate',
'bankName', 'accountNumber', 'address', 'description')) 'bankName', 'accountNumber', 'address', 'sort', 'description'))
autoJumpNextInput('customerModal') autoJumpNextInput('customerModal')
}); });
}, },
......
jshERP-web/src/views/system/modules/InOutItemModal.vue
View file @ b6cf6d4a
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
<a-select-option value="支出">支出</a-select-option> <a-select-option value="支出">支出</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" /> <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" />
</a-form-item> </a-form-item>
...@@ -80,7 +83,7 @@ ...@@ -80,7 +83,7 @@
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'name', 'type', 'remark')) this.form.setFieldsValue(pick(this.model,'name', 'type', 'sort', 'remark'))
autoJumpNextInput('inOutItemModal') autoJumpNextInput('inOutItemModal')
}); });
}, },
......
jshERP-web/src/views/system/modules/MemberModal.vue
View file @ b6cf6d4a
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" /> <a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2"> <a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" /> <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
...@@ -95,7 +100,7 @@ ...@@ -95,7 +100,7 @@
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone', this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
'phoneNum', 'description')) 'phoneNum', 'sort', 'description'))
autoJumpNextInput('memberModal') autoJumpNextInput('memberModal')
}); });
}, },
......
jshERP-web/src/views/system/modules/PersonModal.vue
View file @ b6cf6d4a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@cancel="handleCancel" @cancel="handleCancel"
cancelText="关闭" cancelText="关闭"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
style="top:30%;height: 40%;overflow-y: hidden"> style="top:30%;height: 45%;overflow-y: hidden">
<template slot="footer"> <template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> <a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭 关闭
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
<a-select-option value="财务员">财务员</a-select-option> <a-select-option value="财务员">财务员</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-form> </a-form>
</a-spin> </a-spin>
</a-modal> </a-modal>
...@@ -78,7 +81,7 @@ ...@@ -78,7 +81,7 @@
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'name', 'type', 'description')) this.form.setFieldsValue(pick(this.model,'name', 'type', 'sort'))
autoJumpNextInput('personModal') autoJumpNextInput('personModal')
}); });
}, },
......
jshERP-web/src/views/system/modules/VendorModal.vue
View file @ b6cf6d4a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@cancel="handleCancel" @cancel="handleCancel"
cancelText="关闭" cancelText="关闭"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
style="top:15%;height: 70%;overflow-y: hidden"> style="top:15%;height: 75%;overflow-y: hidden">
<template slot="footer"> <template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> <a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭 关闭
...@@ -81,6 +81,11 @@ ...@@ -81,6 +81,11 @@
<a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" /> <a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-col>
<a-col :span="24/2"> <a-col :span="24/2">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" /> <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
...@@ -136,7 +141,7 @@ ...@@ -136,7 +141,7 @@
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone', this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'allNeedGet', 'allNeedPay', 'taxNum', 'taxRate', 'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'allNeedGet', 'allNeedPay', 'taxNum', 'taxRate',
'bankName', 'accountNumber', 'address', 'description')) 'bankName', 'accountNumber', 'address', 'sort', 'description'))
autoJumpNextInput('vendorModal') autoJumpNextInput('vendorModal')
}); });
}, },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment