purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化单据列表和录入界面，完善提示字符

Browse Source
This commit is contained in:
jishenghua
2024-10-07 00:24:17 +08:00
parent 44a2b9bac5
commit 88cb3ffc9a
38 changed files with 222 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-web/src/views/bill/modules/OtherInModal.vue
View File

@@ -23,7 +23,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
<a-select placeholder="选择供应商" v-decorator="[ 'organId' ]" :disabled="!rowCanEdit"
<a-select placeholder="请选择供应商" v-decorator="[ 'organId' ]" :disabled="!rowCanEdit"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -304,7 +304,7 @@
},
onSearchLinkNumber() {
this.$refs.waitBillList.show('入库', '采购,销售退货', "1,3")
this.$refs.waitBillList.title = "选择采购入库或销售退货"
this.$refs.waitBillList.title = "请选择采购入库或销售退货"
},
waitBillListOk(selectBillDetailRows, linkNumber, remark) {
this.rowCanEdit = false

4
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View File

@@ -23,7 +23,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
<a-select placeholder="选择客户" v-decorator="[ 'organId' ]" :disabled="!rowCanEdit"
<a-select placeholder="请选择客户" v-decorator="[ 'organId' ]" :disabled="!rowCanEdit"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="handleOrganChange">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -304,7 +304,7 @@
},
onSearchLinkNumber() {
this.$refs.waitBillList.show('出库', '销售,采购退货', "1,3")
this.$refs.waitBillList.title = "选择销售出库或采购退货"
this.$refs.waitBillList.title = "请选择销售出库或采购退货"
},
waitBillListOk(selectBillDetailRows, linkNumber, remark) {
this.rowCanEdit = false

6
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -23,7 +23,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
<a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]" :disabled="!rowCanEdit"
<a-select placeholder="请选择供应商" v-decorator="[ 'organId', validatorRules.organId ]" :disabled="!rowCanEdit"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -120,7 +120,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
<a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
<a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
:dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -381,7 +381,7 @@
},
onSearchLinkNumber() {
this.$refs.linkBillList.show('入库', '采购', '供应商', "1,2,3")
this.$refs.linkBillList.title = "选择采购入库"
this.$refs.linkBillList.title = "请选择采购入库"
},
linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) {
this.rowCanEdit = false

6
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -27,7 +27,7 @@
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商" data-step="1" data-title="供应商"
data-intro="供应商必须选择，如果发现需要选择的供应商尚未录入，可以在下拉框中点击新增供应商进行录入">
<a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]" :disabled="!rowCanEdit"
<a-select placeholder="请选择供应商" v-decorator="[ 'organId', validatorRules.organId ]" :disabled="!rowCanEdit"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -140,7 +140,7 @@
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户" data-step="9" data-title="结算账户"
data-intro="如果在下拉框中选择多账户，则可以通过多个结算账户进行结算">
<a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
<a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
:dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -437,7 +437,7 @@
},
onSearchLinkNumber() {
this.$refs.linkBillList.show('其它', '采购订单', '供应商', "1,3")
this.$refs.linkBillList.title = "选择采购订单"
this.$refs.linkBillList.title = "请选择采购订单"
},
linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) {
let that = this

8
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -27,7 +27,7 @@
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商" data-step="1" data-title="供应商"
data-intro="供应商必须选择，如果发现需要选择的供应商尚未录入，可以在下拉框中点击新增供应商进行录入">
<a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]"
<a-select placeholder="请选择供应商" v-decorator="[ 'organId', validatorRules.organId ]"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -135,7 +135,7 @@
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户" data-step="8" data-title="结算账户"
data-intro="如果在下拉框中选择多账户，则可以通过多个结算账户进行结算">
<a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId' ]"
<a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'accountId' ]"
:dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -396,11 +396,11 @@
},
onSearchLinkNumber() {
this.$refs.linkBillList.purchaseShow('其它', '销售订单', '客户', "1,3","0,3")
this.$refs.linkBillList.title = "选择销售订单"
this.$refs.linkBillList.title = "请选择销售订单"
},
onSearchLinkApply() {
this.$refs.linkBillList.purchaseShow('其它', '请购单', '客户', "1,3")
this.$refs.linkBillList.title = "选择请购单"
this.$refs.linkBillList.title = "请选择请购单"
},
linkBillListOk(selectBillDetailRows, linkNumber, organId) {
this.rowCanEdit = false

6
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -23,7 +23,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
<a-select placeholder="选择会员卡号" v-decorator="[ 'organId' ]" :disabled="!rowCanEdit"
<a-select placeholder="请选择会员卡号" v-decorator="[ 'organId' ]" :disabled="!rowCanEdit"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -130,7 +130,7 @@
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
<span slot="label" style="font-size: 20px;line-height:20px">付款账户</span>
<a-select placeholder="选择付款账户" style="font-size:20px;" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
<a-select placeholder="请选择付款账户" style="font-size:20px;" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
<a-divider style="margin: 4px 0;" />
@@ -385,7 +385,7 @@
},
onSearchLinkNumber() {
this.$refs.linkBillList.show('出库', '零售', '会员', "1")
this.$refs.linkBillList.title = "选择零售出库"
this.$refs.linkBillList.title = "请选择零售出库"
},
linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) {
this.rowCanEdit = false

4
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View File

@@ -27,7 +27,7 @@
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号" data-step="1" data-title="会员卡号"
data-intro="如果发现需要选择的会员卡号尚未录入，可以在下拉框中点击新增会员信息进行录入">
<a-select placeholder="选择会员卡号" v-decorator="[ 'organId' ]"
<a-select placeholder="请选择会员卡号" v-decorator="[ 'organId' ]"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="onChangeOrgan">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -145,7 +145,7 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" data-step="8" data-title="收款账户"
data-intro="收款账户的信息来自基本资料菜单下的【结算账户】">
<span slot="label" style="font-size: 20px;line-height:20px">收款账户</span>
<a-select placeholder="选择收款账户" style="font-size:20px;" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
<a-select placeholder="请选择收款账户" style="font-size:20px;" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
<a-divider style="margin: 4px 0;" />

6
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -23,7 +23,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
<a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]" :disabled="!rowCanEdit"
<a-select placeholder="请选择客户" v-decorator="[ 'organId', validatorRules.organId ]" :disabled="!rowCanEdit"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="handleOrganChange">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -120,7 +120,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
<a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
<a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
:dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -392,7 +392,7 @@
},
onSearchLinkNumber() {
this.$refs.linkBillList.show('出库', '销售', '客户', "1,2,3")
this.$refs.linkBillList.title = "选择销售出库"
this.$refs.linkBillList.title = "请选择销售出库"
},
linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) {
this.rowCanEdit = false

4
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View File

@@ -28,7 +28,7 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户" data-step="1" data-title="客户"
data-intro="客户必须选择，如果发现需要选择的客户尚未录入，可以在下拉框中点击新增客户进行录入。
特别注意，客户如果录入之后在下拉框中不显示，请检查是否给当前用户分配对应的客户权限">
<a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
<a-select placeholder="请选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="handleOrganChange">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -128,7 +128,7 @@
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户" data-step="8" data-title="结算账户"
data-intro="如果在下拉框中选择多账户，则可以通过多个结算账户进行结算">
<a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId' ]"
<a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'accountId' ]"
:dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />

6
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -28,7 +28,7 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户" data-step="1" data-title="客户"
data-intro="客户必须选择，如果发现需要选择的客户尚未录入，可以在下拉框中点击新增客户进行录入。
特别注意，客户如果录入之后在下拉框中不显示，请检查是否给当前用户分配对应的客户权限">
<a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]" :disabled="!rowCanEdit"
<a-select placeholder="请选择客户" v-decorator="[ 'organId', validatorRules.organId ]" :disabled="!rowCanEdit"
:dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="handleOrganChange">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -141,7 +141,7 @@
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户" data-step="9" data-title="结算账户"
data-intro="如果在下拉框中选择多账户，则可以通过多个结算账户进行结算">
<a-select style="width:185px;" placeholder="选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
<a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'accountId', validatorRules.accountId ]"
:dropdownMatchSelectWidth="false" allowClear @select="selectAccount">
<div slot="dropdownRender" slot-scope="menu">
<v-nodes :vnodes="menu" />
@@ -454,7 +454,7 @@
},
onSearchLinkNumber() {
this.$refs.linkBillList.show('其它', '销售订单', '客户', "1,3")
this.$refs.linkBillList.title = "选择销售订单"
this.$refs.linkBillList.title = "请选择销售订单"
},
linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) {
let that = this