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

优化客户和供应商的对账单

parent 1149ada4
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/api/api.js
View file @ b27ffdf1
......@@ -161,12 +161,9 @@ const checkSupplier = (params)=>getAction("/supplier/checkIsNameExist",params);
const findBySelectSup = (params)=>postAction("/supplier/findBySelect_sup",params);
const findBySelectCus = (params)=>postAction("/supplier/findBySelect_cus",params);
const findBySelectRetail = (params)=>postAction("/supplier/findBySelect_retail",params);
const findSupplierById = (params)=>getAction("/supplier/findById",params);
//单据相关
const findDepotHeadTotalPay = (params)=>getAction("/depotHead/findTotalPay",params);
const findBillDetailByNumber = (params)=>getAction("/depotHead/getDetailByNumber",params);
const findStockByDepotAndBarCode = (params)=>getAction("/depotItem/findStockByDepotAndBarCode",params);
const findAccountHeadTotalPay = (params)=>getAction("/accountHead/findTotalPay",params);
const findFinancialDetailByNumber = (params)=>getAction("/accountHead/getDetailByNumber",params);
export {
......@@ -277,11 +274,8 @@ export {
findBySelectSup,
findBySelectCus,
findBySelectRetail,
findSupplierById,
findDepotHeadTotalPay,
findBillDetailByNumber,
findStockByDepotAndBarCode,
findAccountHeadTotalPay,
findFinancialDetailByNumber
}
......
jshERP-web/src/views/bill/PurchaseOrderList.vue
View file @ b27ffdf1
......@@ -51,7 +51,7 @@
批量操作 <a-icon type="down" />
</a-button>
</a-dropdown>
<a-tooltip placement="left" title="采购订单不涉及入库仓库和付款金额，采购订单可以转采购入库单，但需要先对采购订单进行审核。
<a-tooltip placement="left" title="采购订单不涉及付款金额，采购订单可以转采购入库单，但需要先对采购订单进行审核。
勾选之后可以进行批量操作（删除、审核、反审核）" slot="action">
<a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
</a-tooltip>
......
jshERP-web/src/views/bill/SaleOrderList.vue
View file @ b27ffdf1
......@@ -51,7 +51,7 @@
批量操作 <a-icon type="down" />
</a-button>
</a-dropdown>
<a-tooltip placement="left" title="销售订单不涉及出库仓库和收款金额，销售订单可以转销售出库单，但需要先对销售订单进行审核。
<a-tooltip placement="left" title="销售订单不涉及收款金额，销售订单可以转销售出库单，但需要先对销售订单进行审核。
勾选之后可以进行批量操作（删除、审核、反审核）" slot="action">
<a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
</a-tooltip>
......
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View file @ b27ffdf1
......@@ -17,7 +17,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/AssembleModal.vue
View file @ b27ffdf1
......@@ -17,7 +17,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View file @ b27ffdf1
......@@ -17,7 +17,7 @@
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/OtherInModal.vue
View file @ b27ffdf1
......@@ -26,7 +26,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View file @ b27ffdf1
......@@ -26,7 +26,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View file @ b27ffdf1
......@@ -27,7 +27,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View file @ b27ffdf1
......@@ -27,7 +27,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View file @ b27ffdf1
......@@ -26,7 +26,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View file @ b27ffdf1
......@@ -27,7 +27,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View file @ b27ffdf1
......@@ -26,7 +26,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View file @ b27ffdf1
......@@ -27,7 +27,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View file @ b27ffdf1
......@@ -26,7 +26,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View file @ b27ffdf1
......@@ -27,7 +27,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['operTime']" :show-time="true"/>
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......
jshERP-web/src/views/financial/modules/AdvanceInModal.vue
View file @ b27ffdf1
......@@ -35,7 +35,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['billTime']" :show-time="true"/>
<j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......@@ -149,6 +149,11 @@
rules: [
{ required: true, message: '请选择经手人!' }
]
},
billTime:{
rules: [
{ required: true, message: '请选择单据日期!' }
]
}
},
url: {
......
jshERP-web/src/views/financial/modules/GiroModal.vue
View file @ b27ffdf1
......@@ -26,7 +26,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['billTime']" :show-time="true"/>
<j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......@@ -139,6 +139,11 @@
{ required: true, message: '请选择经手人!' }
]
},
billTime:{
rules: [
{ required: true, message: '请选择单据日期!' }
]
},
accountId:{
rules: [
{ required: true, message: '请选择付款账户!' }
......
jshERP-web/src/views/financial/modules/ItemInModal.vue
View file @ b27ffdf1
......@@ -35,7 +35,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['billTime']" :show-time="true"/>
<j-date v-decorator="['billTime', validatorRules.billTime ]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......@@ -151,6 +151,11 @@
{ required: true, message: '请选择经手人!' }
]
},
billTime:{
rules: [
{ required: true, message: '请选择单据日期!' }
]
},
accountId:{
rules: [
{ required: true, message: '请选择收入账户!' }
......
jshERP-web/src/views/financial/modules/ItemOutModal.vue
View file @ b27ffdf1
......@@ -35,7 +35,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
<j-date v-decorator="['billTime']" :show-time="true"/>
<j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
......@@ -151,6 +151,11 @@
{ required: true, message: '请选择经手人!' }
]
},
billTime:{
rules: [
{ required: true, message: '请选择单据日期!' }
]
},
accountId:{
rules: [
{ required: true, message: '请选择付款账户!' }
......
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