diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index 485b7ea3a2..9d156c108c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -77,7 +77,7 @@ lrpd.customer, lrpd.borrowerName, ( - lrpd.`dueMoney` - SUM (IFNULL(lrh.actualMoney, 0)) + lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0)) ) AS notRepaidMoney FROM `loan_repayment_plan_details` lrpd @@ -433,16 +433,13 @@ AND s.isDelete = '0' - SELECT - c.*, - ( c.reveivableMoney - c.fund ) AS duePushMoney - FROM - ( - SELECT - b.* - FROM - ( - SELECT - a.*, - IFNULL(( SELECT SUM( fund ) FROM loan_push_fund_history AS ph WHERE ph.busVinSid = #{busVinSid} ), 0 ) AS fund - FROM - ( - SELECT - IFNULL( SUM( jr.reveivableMoney ), 0 ) AS reveivableMoney - FROM - anrui_fin.fin_uncollected_receivables_detailed_jr AS jr - LEFT JOIN loan_repayment_plan_details AS p ON p.sid = jr.busSid - WHERE - jr.payCostTitleKey = '006' - AND p.busVinSid = #{busVinSid} - ) AS a - ) AS b - WHERE - b.reveivableMoney - b.fund > 0 - ) c + SELECT c.*, + (c.reveivableMoney - c.fund) AS duePushMoney + FROM ( + SELECT b.* + FROM ( + SELECT a.*, + IFNULL((SELECT SUM(fund) + FROM loan_push_fund_history AS ph + WHERE ph.busVinSid = #{busVinSid}), 0) AS fund + FROM ( + SELECT IFNULL(SUM(jr.reveivableMoney), 0) AS reveivableMoney + FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS jr + LEFT JOIN loan_repayment_plan_details AS p ON p.sid = jr.busSid + WHERE jr.payCostTitleKey = '006' + AND p.busVinSid = #{busVinSid} + ) AS a + ) AS b + WHERE b.reveivableMoney - b.fund > 0 + ) c diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index fd8f62172f..56b627f857 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -40,7 +40,9 @@ export function selectHaveMessage(data) { url: '/portal/v1/sysuser/selectHaveMessage ', method: 'post', data: data, - headers: { 'Content-Type': 'application/json' } + headers: { + 'Content-Type': 'application/json' + } }) } @@ -50,7 +52,9 @@ export function getButtonPermissions(data) { url: '/portal/v1/sysfunction/getButtonPermissions', method: 'post', data: data, - headers: { 'Content-Type': 'application/json' } + headers: { + 'Content-Type': 'application/json' + } }) } @@ -96,7 +100,9 @@ export function customerListPage(params) { url: '/yxtcrm/apiadmin/v1/crmcustomer/customerListPage', method: 'post', data: params, - headers: { 'Content-Type': 'application/json' } + headers: { + 'Content-Type': 'application/json' + } }) } @@ -139,6 +145,20 @@ export function chooseproducts(params) { url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage', method: 'post', data: params, - headers: { 'Content-Type': 'application/json' } + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 查询分页列表 -- 商品列表 +export function getInventoryList(params) { + return request({ + url: '/wms/apiadmin/WmsOutBill/getInventoryList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) } diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 05780c667f..9310bc4601 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -225,6 +225,12 @@ export const constantRoutes = [{ name: 'InventoryRefer', meta: { title: '出入库查询', noCache: true } }, + { + path: '/maintenanceInOrOutBound/index', + component: () => import('@/views/storage/maintenanceInOrOutBound/index.vue'), + name: 'MaintenanceInOrOutBound', + meta: { title: '维修出入库查询', noCache: true } + }, { path: '/stocktaking/index', component: () => import('@/views/storage/stocktaking/index'), diff --git a/yxt-as-ui/src/views/basicinformation/profession/profession.vue b/yxt-as-ui/src/views/basicinformation/profession/profession.vue index 4cd39267f5..8509c26f3a 100644 --- a/yxt-as-ui/src/views/basicinformation/profession/profession.vue +++ b/yxt-as-ui/src/views/basicinformation/profession/profession.vue @@ -251,6 +251,9 @@ export default { }, toAdd() { this.dialogVisible = true + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 @@ -285,11 +288,15 @@ export default { handleConfirm() { this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') - req.saveOrUpdate(this.formobj).then((resp) => { - if (resp.success) { - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.getList() - this.handleClose() + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveOrUpdate(this.formobj).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.getList() + this.handleClose() + } + }) } }) }, diff --git a/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue b/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue index 00f7a8f8c1..02e07afd90 100644 --- a/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue +++ b/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue @@ -245,6 +245,9 @@ export default { }, toAdd() { this.dialogVisible = true + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 @@ -279,11 +282,15 @@ export default { handleConfirm() { this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') - req.saveOrUpdate(this.formobj).then((resp) => { - if (resp.success) { - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.getList() - this.handleClose() + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveOrUpdate(this.formobj).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.getList() + this.handleClose() + } + }) } }) }, diff --git a/yxt-as-ui/src/views/basicinformation/team/team.vue b/yxt-as-ui/src/views/basicinformation/team/team.vue index b90efa3e74..65effc4574 100644 --- a/yxt-as-ui/src/views/basicinformation/team/team.vue +++ b/yxt-as-ui/src/views/basicinformation/team/team.vue @@ -167,7 +167,7 @@ export default { case 'toAdd': this.toAdd() break - case 'toEdit: + case 'toEdit': this.toEdit() break case 'doDel': @@ -230,6 +230,9 @@ export default { }, toAdd() { this.dialogVisible = true + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 @@ -264,11 +267,15 @@ export default { handleConfirm() { this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') - req.saveOrUpdate(this.formobj).then((resp) => { - if (resp.success) { - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.getList() - this.handleClose() + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveOrUpdate(this.formobj).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.getList() + this.handleClose() + } + }) } }) }, diff --git a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue index 4e68570c93..e7f9869235 100644 --- a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue +++ b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue @@ -240,8 +240,16 @@ showAdd() { console.log("this.imgList", this.imgList) this.hideUploadBtn = this.imgList.length != 0 + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.initBrands(row.sid) .then(resp => { if (resp.success) { diff --git a/yxt-as-ui/src/views/goods/category/categoryAdd.vue b/yxt-as-ui/src/views/goods/category/categoryAdd.vue index 6c8e201906..c68304c2de 100644 --- a/yxt-as-ui/src/views/goods/category/categoryAdd.vue +++ b/yxt-as-ui/src/views/goods/category/categoryAdd.vue @@ -80,8 +80,8 @@ -
排序
- +
* 排序
+ @@ -197,6 +197,11 @@ message: '请选择出库规则', trigger: 'change' }], + sortNo: [{ + required: true, + message: '排序不能为空', + trigger: 'blur' + }], } } }, diff --git a/yxt-as-ui/src/views/goods/category/index.vue b/yxt-as-ui/src/views/goods/category/index.vue index b38ef9f052..15c33eb7be 100644 --- a/yxt-as-ui/src/views/goods/category/index.vue +++ b/yxt-as-ui/src/views/goods/category/index.vue @@ -69,7 +69,7 @@ - + diff --git a/yxt-as-ui/src/views/goods/factory/factoryAdd.vue b/yxt-as-ui/src/views/goods/factory/factoryAdd.vue index e4c105ff4d..5ba437b6ff 100644 --- a/yxt-as-ui/src/views/goods/factory/factoryAdd.vue +++ b/yxt-as-ui/src/views/goods/factory/factoryAdd.vue @@ -187,8 +187,17 @@ } this.$emit('doback') }, - showAdd() {}, + showAdd() { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + + }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.initFacturer(row.sid) .then(resp => { if (resp.success) { diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue index 020db07e0a..c201e6c07d 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue @@ -886,11 +886,20 @@ console.log('>>>>>>>>>showAdd', sid) this.formobj.sid = sid + + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) }, indexMethod(index) { return index + 1 }, showEdit(row) { + + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.initGoods(row.sid) .then(resp => { if (resp.success) { @@ -900,6 +909,8 @@ .catch(e => { this.formobj = row }) + + }, selectBrandChange(val) { const choose = this.brandList.filter((item) => item.sid == val) diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue index ef7f954d8b..0fb4199555 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue @@ -433,11 +433,21 @@ // console.log('>>>>>>>>>showAdd', sid) // this.formobj.sid = sid + + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + }, indexMethod(index) { return index + 1 }, showEdit(row) { + + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.initGoods(row.sid) .then(resp => { if (resp.success) { diff --git a/yxt-as-ui/src/views/goods/goods/goodsInfo2.vue b/yxt-as-ui/src/views/goods/goods/goodsInfo2.vue index 05854d1f71..83201ddf89 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsInfo2.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsInfo2.vue @@ -35,7 +35,7 @@ -
商品条形码
+
条形码
{{formobj.barCode}} diff --git a/yxt-as-ui/src/views/goods/unit/unitAdd.vue b/yxt-as-ui/src/views/goods/unit/unitAdd.vue index 974a123262..8308d7cbae 100644 --- a/yxt-as-ui/src/views/goods/unit/unitAdd.vue +++ b/yxt-as-ui/src/views/goods/unit/unitAdd.vue @@ -126,8 +126,17 @@ } this.$emit('doback') }, - showAdd() {}, + showAdd() { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + + }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.initUnits(row.sid) .then(resp => { if (resp.success) { diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue index 12d87c3ff3..ee8b88129e 100644 --- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue +++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue @@ -625,9 +625,16 @@ }, showAdd() { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + this.getWarehouseList() this.getsupplierLust() // this.getOrgPathSid() diff --git a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue new file mode 100644 index 0000000000..02409e35d2 --- /dev/null +++ b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/yxt-as-ui/src/views/storage/outStorage/index.vue b/yxt-as-ui/src/views/storage/outStorage/index.vue index aad61858cd..deb26bde4b 100644 --- a/yxt-as-ui/src/views/storage/outStorage/index.vue +++ b/yxt-as-ui/src/views/storage/outStorage/index.vue @@ -20,7 +20,7 @@ format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> - + @@ -61,7 +61,7 @@ - + @@ -107,12 +107,13 @@ tableLoading: false, dataList: [], btnList: [{ - type: 'danger', + type: 'primary', size: 'small', - icon: 'del', - btnKey: 'doDel', - btnLabel: '删除' + icon: 'plus', + btnKey: 'toAdd', + btnLabel: '新增' }, + { type: 'primary', size: 'small', @@ -121,11 +122,11 @@ btnLabel: '编辑' }, { - type: 'primary', + type: 'danger', size: 'small', - icon: 'plus', - btnKey: 'toAdd', - btnLabel: '新增' + icon: 'del', + btnKey: 'doDel', + btnLabel: '删除' }, { type: 'info', diff --git a/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue b/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue index dfdd86a73d..3d2a424dcd 100644 --- a/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue +++ b/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue @@ -1,80 +1,87 @@ + diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue index 3058c3968e..11d9cc90e7 100644 --- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue +++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue @@ -578,6 +578,12 @@ this.getsupplierLust() this.getWarehouseList() + + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + + }, showEdit(row) { this.title = "【修改】" @@ -585,6 +591,12 @@ this.getsupplierLust() this.getWarehouseList() console.log("showEdit", this.isUpdata); + + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + + var params = { sid: row.sid } diff --git a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue index cfd991bf14..54c5d49148 100644 --- a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue +++ b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue @@ -277,9 +277,16 @@ }, showAdd() { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + this.getWarehouseList() this.getAllOrgper() this.getOrgPathSid() diff --git a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue index 9c5d9d56ed..05b2a19aad 100644 --- a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue +++ b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue @@ -287,8 +287,16 @@ this.title = "【新增】" this.getWarehouseList() this.getAllOrgper() + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + this.getWarehouseList() this.getAllOrgper() this.title = "【修改】" diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue index bb7642b7d2..0203637432 100644 --- a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue +++ b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue @@ -280,8 +280,17 @@ } this.$emit('doback') }, - showAdd() {}, + showAdd() { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + + }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.initGoodsShelves(row.sid) .then(resp => { if (resp.success) { diff --git a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue index ead5d0e062..6520d3ef62 100644 --- a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue @@ -305,8 +305,17 @@ } this.$emit('doback') }, - showAdd() {}, + showAdd() { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + + }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.initWarehouse(row.sid) .then(resp => { if (resp.success) { diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue index 82d62f1b81..16d7a83d55 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue @@ -291,8 +291,17 @@ } this.$emit('doback') }, - showAdd() {}, + showAdd() { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + + }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.initWarehousearea(row.sid) .then(resp => { if (resp.success) { diff --git a/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue index 2fdae3e5c2..0385f24efd 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue @@ -131,8 +131,17 @@ } this.$emit('doback') }, - showAdd() {}, + showAdd() { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + + }, showEdit(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.initWarehousearea(row.sid) .then(resp => { if (resp.success) {