From aef23adc1c9782baf61a367d0bc80a12ad71050c Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Tue, 6 Aug 2024 16:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/goods/goods.js | 8 +++ .../supplier/supplier/supplierAdd.vue | 22 ++------ .../goodsShelves/goodsShelvesAdd.vue | 23 ++++++-- .../warehouses/warehouse/warehouseAdd.vue | 56 +++++++++++++++---- .../warehouseArea/warehouseAreaAdd.vue | 28 +++++++--- .../warehouseAreaTypeAdd.vue | 16 +++++- src/views/goods/goods/goodsAdd.vue | 30 ++++++++-- src/views/system/menuManage/menuManage.vue | 6 +- src/views/system/userManage/userManageAdd.vue | 14 ++++- .../system/userManage/userManageList.vue | 11 +++- 10 files changed, 163 insertions(+), 51 deletions(-) diff --git a/src/api/goods/goods.js b/src/api/goods/goods.js index 773acbe..947a1c6 100644 --- a/src/api/goods/goods.js +++ b/src/api/goods/goods.js @@ -44,6 +44,14 @@ export default { }); }, + // 商品规格 修改是否可用状态 + updateIsEnable2: function(sid, isEnable) { + return request({ + url: '/wms/apiadmin/base/basegoodsspu/updateIsEnablebySku/' + sid + "/" + isEnable + }); + }, + + // 商品-- 删除 deleteBySids: function(data) { diff --git a/src/views/baseInfo/supplier/supplier/supplierAdd.vue b/src/views/baseInfo/supplier/supplier/supplierAdd.vue index d471dfc..750120f 100644 --- a/src/views/baseInfo/supplier/supplier/supplierAdd.vue +++ b/src/views/baseInfo/supplier/supplier/supplierAdd.vue @@ -127,8 +127,8 @@ placeholder="" /> -
*开票类型
- +
开票类型
+ -
*税率
- +
税率
+ @@ -274,23 +274,13 @@ message: '开票公司名称不能为空', trigger: 'blur' }], - billingTypeValue: [{ - required: true, - message: '开票类型不能为空', - trigger: 'change' - }], - taxRate: [{ - required: true, - message: '税率不能为空', - trigger: 'blur' - }] } } }, methods: { init() { typeValues({ - type: 'accountType' + type: 'billingType' }).then((res) => { if (res.success) { this.billingType_list = res.data diff --git a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue index abfcedd..577a746 100644 --- a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue +++ b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue @@ -17,14 +17,14 @@
- 选择所属仓库： + * 选择所属仓库：
- 选择所属库区： + * 选择所属库区： @@ -35,7 +35,7 @@
- 库位编码： + * 库位编码：
@@ -98,7 +98,7 @@ if (this.formobj.warehouseName == '' || this.formobj.warehouseSid == '') { this.$message({ showClose: true, - type: 'error', + type: 'warning', message: '所属仓库不能为空' }) return @@ -107,12 +107,21 @@ if (this.formobj.locationName == '' || this.formobj.locationSid == '') { this.$message({ showClose: true, - type: 'error', + type: 'warning', message: '所属仓区不能为空' }) return } + if (this.formobj.rackCode == '') { + this.$message({ + showClose: true, + type: 'warning', + message: '库位编码不能为空' + }) + return + } + req.saveGoodsShelves(this.formobj) .then(resp => { if (resp.success) { @@ -215,6 +224,10 @@ flex: 0.8; font-size: 18px; text-align: right; + + .must { + color: #f00; + } } .item_input { diff --git a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue index b865022..799e779 100644 --- a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue +++ b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue @@ -17,11 +17,11 @@
- 仓库名称： + * 仓库名称：
- 仓库编码： + * 仓库编码：
@@ -56,20 +56,21 @@
- 具体地址： + * 具体地址：
- 使用状态： + * 使用状态： - 正常 - 停用 + 正常 + 停用
- 仓库排序： - + * 仓库排序： +
仓库备注： @@ -99,7 +100,7 @@ manager: '', longitude: '', latitude: '', - usageStatus: "", + usageStatus: "1", address: '', squareMeter: '', sortNo: '', @@ -123,7 +124,7 @@ if (this.formobj.warehouseName == '') { this.$message({ showClose: true, - type: 'error', + type: 'warning', message: '仓库名称不能为空' }) return @@ -132,12 +133,39 @@ if (this.formobj.warehouseCode == '') { this.$message({ showClose: true, - type: 'error', + type: 'warning', message: '仓库编码不能为空' }) return } + if (this.formobj.address == '') { + this.$message({ + showClose: true, + type: 'warning', + message: '具体地址不能为空' + }) + return + } + + if (this.formobj.usageStatus == '') { + this.$message({ + showClose: true, + type: 'warning', + message: '使用状态不能为空' + }) + return + } + + if (this.formobj.sortNo == '') { + this.$message({ + showClose: true, + type: 'warning', + message: '排序不能为空' + }) + return + } + req.saveWarehouse(this.formobj) .then(resp => { @@ -166,7 +194,7 @@ manager: '', longitude: '', latitude: '', - usageStatus: "", + usageStatus: "1", address: '', squareMeter: '', sortNo: '', @@ -222,6 +250,10 @@ flex: 0.8; font-size: 18px; text-align: right; + + .must { + color: #f00; + } } .item_input { diff --git a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue index 280839b..cfd2e85 100644 --- a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue +++ b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue @@ -17,18 +17,18 @@
- 选择所属仓库： + * 选择所属仓库：
- 库区名称： + * 库区名称：
- 库区编码： + * 库区编码：
@@ -42,7 +42,7 @@
- 库区类型： + * 库区类型： { if (resp.success) { @@ -230,6 +240,10 @@ flex: 0.8; font-size: 18px; text-align: right; + + .must { + color: #f00; + } } .item_input { diff --git a/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue b/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue index 031137a..cdc12af 100644 --- a/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue +++ b/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue @@ -18,7 +18,7 @@
- 库区类型名称： + * 库区类型名称：
@@ -55,6 +55,16 @@ methods: { saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) + + if (this.formobj.warehouseAreaTypeName == '') { + this.$message({ + showClose: true, + type: 'warning', + message: '库区类型名称不能为空' + }) + return + } + req.saveWarehousearea(this.formobj) .then(resp => { if (resp.success) { @@ -125,6 +135,10 @@ flex: 0.8; font-size: 18px; text-align: right; + + .must { + color: #f00; + } } .item_input { diff --git a/src/views/goods/goods/goodsAdd.vue b/src/views/goods/goods/goodsAdd.vue index 15ac701..b274eb0 100644 --- a/src/views/goods/goods/goodsAdd.vue +++ b/src/views/goods/goods/goodsAdd.vue @@ -266,9 +266,10 @@ - + @@ -715,15 +716,15 @@ - + - +
备注
@@ -993,6 +994,27 @@ this.orderInfo = goodsSku this.dialogVisible3 = true }, + delGoodsSku(row) { + console.log('>>>>>>>>>delGoodsSku', row) + var index = this.formobj.baseGoodsSkus.findIndex((item) => item == row) + this.formobj.baseGoodsSkus.splice(index, 1) + }, + enableChange(sid, state) { + console.log('sid', sid) + console.log('state', state) + req.updateIsEnable2(sid, state).then((resp) => { + if (resp.success) { + this.$message({ + type: 'success', + message: '状态已更新', + showClose: true + }) + } else { // 根据resp.code进行异常情况处理 + } + }).catch(e => { + console.log(e) + }) + }, showGoodsSkuDttail(goodsSkuDto) { console.log('>>>>>>>>>showGoodsSkuDttail', goodsSkuDto) diff --git a/src/views/system/menuManage/menuManage.vue b/src/views/system/menuManage/menuManage.vue index 5dd6f7c..e65b909 100644 --- a/src/views/system/menuManage/menuManage.vue +++ b/src/views/system/menuManage/menuManage.vue @@ -92,7 +92,8 @@ - + --> - + - @@ -185,6 +185,14 @@ treeNodeClick() { this.$refs.el_select.visible = false }, + nodeClick(val) { + console.log("nodeClick", val); + this.form.sysStaffOrg.orgSid = val.sid + this.form.sysStaffOrg.orgName = val.name + this.form.sysStaffOrg.orgCode = val.orgCode + this.$refs.Tree.visible = false + + }, checkchange(data, checked, indeterminate) { console.log("checkchange", data); @@ -255,7 +263,7 @@ if (this.form.sid) { - userUpdatauserUpdata(this.form).then(res => { + userUpdata(this.form).then(res => { if (res.code == '200') { this.reset() this.$message({ diff --git a/src/views/system/userManage/userManageList.vue b/src/views/system/userManage/userManageList.vue index 730f393..6925216 100644 --- a/src/views/system/userManage/userManageList.vue +++ b/src/views/system/userManage/userManageList.vue @@ -132,7 +132,7 @@ - @@ -343,6 +343,14 @@ } + }, + nodeClick(val) { + console.log("nodeClick", val); + this.form.sysStaffOrg.orgSid = val.sid + this.form.sysStaffOrg.orgName = val.name + this.form.sysStaffOrg.orgCode = val.orgCode + this.$refs.Tree.visible = false + }, checkchange(data, checked, indeterminate) { @@ -490,6 +498,7 @@ }); }, save() { + this.form.orgSid = this.form.orgSid == '' ? window.sessionStorage.getItem('orgSid') : this.form.orgSid userUpdata(this.form).then(res => { if (res.code == '200') { this.$message({