From 651bf313c2ca0ac69f2a43fc242fb90a29749120 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 20 May 2024 14:46:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouseAreaType/warehouseAreaTypeAdd.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue index 6fee179e8b..8ad0daa42b 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue @@ -44,9 +44,10 @@ sid: '', warehouseAreaTypeName: '', remarks: '', - useOrgSid: window.sessionStorage.getItem('departmentSid'), - createOrgSid: window.sessionStorage.getItem('orgSid'), - userSid: window.sessionStorage.getItem('userSid'), + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), }, } @@ -84,9 +85,10 @@ sid: '', warehouseAreaTypeName: '', remarks: '', - useOrgSid: window.sessionStorage.getItem('departmentSid'), - createOrgSid: window.sessionStorage.getItem('orgSid'), - userSid: window.sessionStorage.getItem('userSid'), + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') }, From e7745f6fe00efea5b14861b36e15fe4f7964e1e3 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 20 May 2024 15:57:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/goods/brands/brandsAdd.vue | 288 ++++++++-------- .../src/views/goods/category/categoryAdd.vue | 304 ++++++++++------- .../src/views/goods/factory/factoryAdd.vue | 238 ++++++++------ yxt-as-ui/src/views/goods/goods/goodsAdd2.vue | 75 +++-- yxt-as-ui/src/views/goods/unit/unitAdd.vue | 215 +++++------- .../goodsShelves/goodsShelvesAdd.vue | 290 +++++++++------- .../warehouseArea/warehouseAreaAdd.vue | 310 +++++++++++------- .../warehouseAreaTypeAdd.vue | 194 ++++++----- 8 files changed, 1032 insertions(+), 882 deletions(-) diff --git a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue index 1c77572048..4e68570c93 100644 --- a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue +++ b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue @@ -15,6 +15,61 @@
+ + + + + + +
* 品牌名称
+ + + + + + +
* 品牌代码
+ + + + + + +
* 首字母大写
+ + + + + + + + + + +
品牌备注
+ + + + + + + + + + +
品牌Logo
+ + + + + + + + + + - -
品牌Logo： -
- + -->
@@ -96,7 +128,24 @@ }, hideUploadBtn: false, - hideUploadBtn2: false + hideUploadBtn2: false, + rules: { + brandName: [{ + required: true, + message: '品牌名称不能为空', + trigger: 'blur' + }], + brandCode: [{ + required: true, + message: '品牌代码不能为空', + trigger: 'blur' + }], + letter: [{ + required: true, + message: '首字母大写不能为空', + trigger: 'blur' + }], + } } }, created() { @@ -122,48 +171,53 @@ saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) - if (this.formobj.brandName == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "品牌名称不能为空" - }) - return - } + // if (this.formobj.brandName == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "品牌名称不能为空" + // }) + // return + // } + + // if (this.formobj.brandCode == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "品牌代码不能为空" + // }) + // return + // } + + // if (this.formobj.letter == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "首字母大写不能为空" + // }) + // return + // } + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveBrands(this.formobj) + .then(resp => { + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn('true') + } else { + // 根据resp.code进行异常情况处理 + } + }) + .catch(() => {}) + } + }) - if (this.formobj.brandCode == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "品牌代码不能为空" - }) - return - } - - if (this.formobj.letter == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "首字母大写不能为空" - }) - return - } - req.saveBrands(this.formobj) - .then(resp => { - if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg - }) - this.handleReturn('true') - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(() => {}) }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') @@ -211,93 +265,37 @@ } } - diff --git a/yxt-as-ui/src/views/goods/category/categoryAdd.vue b/yxt-as-ui/src/views/goods/category/categoryAdd.vue index 8583893cd6..fac57fb20c 100644 --- a/yxt-as-ui/src/views/goods/category/categoryAdd.vue +++ b/yxt-as-ui/src/views/goods/category/categoryAdd.vue @@ -3,7 +3,7 @@
-
类别信息
+
商品类别
保存 @@ -15,7 +15,92 @@
- + + + + +
选择父级类别
+ + + + + + + + + +
* 类别名称
+ + + + + + +
* 类别编码
+ + + + + + + + + +
提成比例
+ + + + + + +
提成金额
+ + + + + + +
* 出库规则
+ + + + + + + + + + + + +
排序
+ + + + + + + +
备注
+ + + + + + + + + + +
@@ -96,6 +181,23 @@ }, goodsTypeList: [], outStockRuleList: [], + rules: { + goodsTypeName: [{ + required: true, + message: '类别名称不能为空', + trigger: 'blur' + }], + goodsTypeCode: [{ + required: true, + message: '类别编码不能为空', + trigger: 'blur' + }], + outStockRuleValue: [{ + required: true, + message: '请选择出库规则', + trigger: 'change' + }], + } } }, created() { @@ -126,57 +228,61 @@ saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) - if (this.formobj.goodsTypeName == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "类别名称不能为空" - }) - return - } - - if (this.formobj.goodsTypeCode == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "类别编码不能为空" - }) - return - } - - if (this.formobj.outStockRule == '' || this.formobj.outStockRuleValue == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "请选择出库规则" - }) - return - } - - if (this.formobj.sortNo == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "类别排序不能为空" - }) - return - } - - - req.saveTypes(this.formobj) - .then(resp => { - if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg + // if (this.formobj.goodsTypeName == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "类别名称不能为空" + // }) + // return + // } + + // if (this.formobj.goodsTypeCode == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "类别编码不能为空" + // }) + // return + // } + + // if (this.formobj.outStockRule == '' || this.formobj.outStockRuleValue == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "请选择出库规则" + // }) + // return + // } + + // if (this.formobj.sortNo == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "类别排序不能为空" + // }) + // return + // } + + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveTypes(this.formobj) + .then(resp => { + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn('true') + } else { + // 根据resp.code进行异常情况处理 + } }) - this.handleReturn('true') - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(() => {}) + .catch(() => {}) + } + }) + }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') @@ -229,79 +335,37 @@ } } - diff --git a/yxt-as-ui/src/views/goods/factory/factoryAdd.vue b/yxt-as-ui/src/views/goods/factory/factoryAdd.vue index d4c8211ac8..e4c105ff4d 100644 --- a/yxt-as-ui/src/views/goods/factory/factoryAdd.vue +++ b/yxt-as-ui/src/views/goods/factory/factoryAdd.vue @@ -15,7 +15,48 @@
- + + + + + + +
* 厂家名称
+ + + + + + +
* 厂家编码
+ + + + + + + + + +
* 排序
+ + + + + + +
备注
+ + + + + + + + + +
@@ -58,6 +99,23 @@ createOrgSid: window.sessionStorage.getItem('orgSid'), userSid: window.sessionStorage.getItem('userSid'), }, + rules: { + manufacturerName: [{ + required: true, + message: '厂家名称不能为空', + trigger: 'blur' + }], + manufacturerCode: [{ + required: true, + message: '厂家编码不能为空', + trigger: 'blur' + }], + sortNo: [{ + required: true, + message: '排序不能为空', + trigger: 'blur' + }], + } } }, created() {}, @@ -66,47 +124,53 @@ saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) - if (this.formobj.manufacturerName == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "厂家名称不能为空" - }) - return - } + // if (this.formobj.manufacturerName == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "厂家名称不能为空" + // }) + // return + // } + + // if (this.formobj.manufacturerCode == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "厂家编码不能为空" + // }) + // return + // } + + // if (this.formobj.sortNo == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "厂家排序不能为空" + // }) + // return + // } + + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveFacturer(this.formobj) + .then(resp => { + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn('true') + } else { + // 根据resp.code进行异常情况处理 + } + }) + .catch(() => {}) + } + }) - if (this.formobj.manufacturerCode == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "厂家编码不能为空" - }) - return - } - if (this.formobj.sortNo == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "厂家排序不能为空" - }) - return - } - - req.saveFacturer(this.formobj) - .then(resp => { - if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg - }) - this.handleReturn('true') - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(() => {}) }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') @@ -139,79 +203,37 @@ } } - diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue index 5c8ea06f1c..2d53731e7a 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue @@ -36,14 +36,14 @@ -
商品条形码
+
条形码
 -
商品拼音缩写
+
拼音缩写
@@ -95,19 +95,18 @@ -
* 商品品牌
+
* 品牌
- + -
* 商品厂家
+
* 厂家
- @@ -118,7 +117,8 @@
原厂标志
- + 是 否 @@ -130,17 +130,18 @@ -
* 商品排序
- - +
* 库存上限
+ + -
商品备注
- - +
* 库存下限
+ + @@ -148,22 +149,20 @@ - -
* 库存上限
- - + +
* 排序
+ + -
* 库存下限
- - +
备注
+ + - @@ -171,7 +170,8 @@
锁定销售定价
- + 是 否 @@ -208,7 +208,7 @@ -
规格图片
+
商品图片
@@ -259,13 +259,13 @@ "brandName": "", "manufacturerSid": "", "manufacturerName": "", - "isOriginalFactory": "", + "isOriginalFactory": "2", "isOriginalFactoryValue": "", "sortNo": "", "skuRemarks": "", "inventoryAlertUpperLimit": "", "inventoryAlertLowerLimit": "", - "isLockingSalesPrice": "", + "isLockingSalesPrice": "2", "isLockingSalesPriceValue": "", "minimumSalesPrice": "", "standardPurchasePrice": "", @@ -329,6 +329,19 @@ this.initData() }, methods: { + + selectIsOriginalFactory(val) { + console.log('selectIsOriginalFactory》》》》', val) + + this.formobj.isOriginalFactoryValue = val == '1' ? '是' : '否' + + }, + selectIsLockingSalesPrice(val) { + console.log('selectIsLockingSalesPrice》》》》', val) + + this.formobj.isLockingSalesPriceValue = val == '1' ? '是' : '否' + + }, initData() { var parpams = { orgPath: window.sessionStorage.getItem('defaultOrgPath'), @@ -397,13 +410,13 @@ "brandName": "", "manufacturerSid": "", "manufacturerName": "", - "isOriginalFactory": "", + "isOriginalFactory": "2", "isOriginalFactoryValue": "", "sortNo": "", "skuRemarks": "", "inventoryAlertUpperLimit": "", "inventoryAlertLowerLimit": "", - "isLockingSalesPrice": "", + "isLockingSalesPrice": "2", "isLockingSalesPriceValue": "", "minimumSalesPrice": "", "standardPurchasePrice": "", diff --git a/yxt-as-ui/src/views/goods/unit/unitAdd.vue b/yxt-as-ui/src/views/goods/unit/unitAdd.vue index ed5787eac8..02c3055a8b 100644 --- a/yxt-as-ui/src/views/goods/unit/unitAdd.vue +++ b/yxt-as-ui/src/views/goods/unit/unitAdd.vue @@ -15,7 +15,27 @@
- + + + + + + +
* 计量单位名称
+ + + + + + +
备注
+ + + + + + + - - - - - + -->
@@ -60,8 +54,7 @@ - diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue index ccd7c3dd8b..bb7642b7d2 100644 --- a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue +++ b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue @@ -15,7 +15,65 @@
- + + + + + + +
* 选择所属仓库
+ + + + + + + + +
* 选择所属库区
+ + + + + + + + + + + +
* 库位名称
+ + + + + + +
* 库位编码
+ + + + + + + + + +
备注
+ + + + + + + + + +
@@ -76,6 +134,28 @@ }, warehouseList: [], warehouseAreaList: [], + rules: { + warehouseName: [{ + required: true, + message: '请选择所属仓库', + trigger: 'change' + }], + locationName: [{ + required: true, + message: '请选择所属库区', + trigger: 'change' + }], + rackName: [{ + required: true, + message: '库位名称不能为空', + trigger: 'blur' + }], + rackCode: [{ + required: true, + message: '库位编码不能为空', + trigger: 'blur' + }] + } } }, created() { @@ -86,7 +166,7 @@ initData() { var parpams = { - orgPath:window.sessionStorage.getItem('defaultOrgPath'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), } req2.getAllWarehouse(parpams).then(resp => { @@ -123,61 +203,64 @@ saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) - if (this.formobj.warehouseSid == '' || this.formobj.warehouseName == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "请选择所属仓库" - }) - return - } - - if (this.formobj.locationSid == '' || this.formobj.locationSid == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "请选择所属库区" - }) - return - } - - - if (this.formobj.rackName == '') { - this.$message({ - showClose: true, - 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) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg + // if (this.formobj.warehouseSid == '' || this.formobj.warehouseName == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "请选择所属仓库" + // }) + // return + // } + + // if (this.formobj.locationSid == '' || this.formobj.locationSid == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "请选择所属库区" + // }) + // return + // } + + + // if (this.formobj.rackName == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "库位名称不能为空" + // }) + // return + // } + + + // if (this.formobj.rackCode == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "库位编码不能为空" + // }) + // return + // } + + + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveGoodsShelves(this.formobj) + .then(resp => { + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn('true') + } else { + // 根据resp.code进行异常情况处理 + } }) - this.handleReturn('true') - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(() => {}) + .catch(() => {}) + } + }) + }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') @@ -213,79 +296,38 @@ } } - diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue index 1b7a1c8313..9943fdd80b 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue @@ -15,7 +15,85 @@
- + + + + + + +
* 选择所属仓库
+ + + + + + + + +
* 库区名称
+ + + + + + +
* 库区编码
+ + + + + + + + + + +
* 库区容量
+ + + + + + +
* 计量单位
+ + + + + + +
* 库区类型
+ + + + + + + + + + + + +
备注
+ + + + + + + + + + + +
@@ -89,6 +167,29 @@ }, warehouseList: [], warehouseTypeList: [], + rules: { + warehouseName: [{ + required: true, + message: '请选择所属仓库', + trigger: 'change' + }], + + areaName: [{ + required: true, + message: '库区名称不能为空', + trigger: 'blur' + }], + areaCode: [{ + required: true, + message: '库区编码不能为空', + trigger: 'blur' + }], + areaTypeName: [{ + required: true, + message: '请选择库区类型', + trigger: 'change' + }], + } } }, created() { @@ -97,7 +198,7 @@ methods: { initData() { var parpams = { - orgPath:window.sessionStorage.getItem('defaultOrgPath'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), } req2.getAllWarehouse(parpams).then(resp => { this.warehouseList = resp.data @@ -112,59 +213,64 @@ saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) - if (this.formobj.warehouseSid == '' || this.formobj.warehouseName == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "请选择所属仓库" - }) - return - } - - if (this.formobj.areaName == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "库区名称不能为空" - }) - return - } - - - if (this.formobj.areaCode == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "库区编码不能为空" - }) - return - } - - - if (this.formobj.areaTypeSid == '' || this.formobj.areaTypeName == '') { - this.$message({ - showClose: true, - type: 'warning', - message: "请选择库区类型" - }) - return - } - - - req.saveWarehousearea(this.formobj) - .then(resp => { - if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg + // if (this.formobj.warehouseSid == '' || this.formobj.warehouseName == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "请选择所属仓库" + // }) + // return + // } + + // if (this.formobj.areaName == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "库区名称不能为空" + // }) + // return + // } + + + // if (this.formobj.areaCode == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "库区编码不能为空" + // }) + // return + // } + + + // if (this.formobj.areaTypeSid == '' || this.formobj.areaTypeName == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "请选择库区类型" + // }) + // return + // } + + this.$refs['form_obj'].validate((valid) => { + if (valid) { + + req.saveWarehousearea(this.formobj) + .then(resp => { + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn('true') + } else { + // 根据resp.code进行异常情况处理 + } }) - this.handleReturn('true') - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(() => {}) + .catch(() => {}) + } + }) + }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') @@ -212,80 +318,38 @@ } } - diff --git a/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue index 8ad0daa42b..2fdae3e5c2 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue @@ -15,7 +15,31 @@
- + + + + + +
* 库区类型名称
+ + + + + + + + + +
库区类型备注
+ + + + + + + +
@@ -44,40 +68,55 @@ sid: '', warehouseAreaTypeName: '', remarks: '', - useOrgSid: window.sessionStorage.getItem('departmentSid'), - orgPath: window.sessionStorage.getItem('defaultOrgPath'), - createOrgSid: window.sessionStorage.getItem('orgSid'), - userSid: window.sessionStorage.getItem('userSid'), + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), }, + + rules: { + warehouseAreaTypeName: [{ + required: true, + message: '库区类型名称不能为空', + trigger: 'blur' + }], + }, + } }, created() {}, 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) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg + // if (this.formobj.warehouseAreaTypeName == '') { + // this.$message({ + // showClose: true, + // type: 'warning', + // message: "库区类型名称不能为空" + // }) + // return + // } + + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveWarehousearea(this.formobj) + .then(resp => { + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn('true') + } else { + // 根据resp.code进行异常情况处理 + } }) - this.handleReturn('true') - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(() => {}) + .catch(() => {}) + } + }) + }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') @@ -85,10 +124,10 @@ sid: '', warehouseAreaTypeName: '', remarks: '', - useOrgSid: window.sessionStorage.getItem('departmentSid'), - orgPath: window.sessionStorage.getItem('defaultOrgPath'), - createOrgSid: window.sessionStorage.getItem('orgSid'), - userSid: window.sessionStorage.getItem('userSid'), + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') }, @@ -107,79 +146,38 @@ } } - From e7141ff0c5e97c610429b9907e2aff99db17356f Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 20 May 2024 16:10:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basebrandinfo/BaseBrandInfoService.java | 6 +- .../BaseGoodsSkuExtend.java | 16 +++-- .../biz/base/basegoodsspu/BaseGoodsSpu.java | 2 +- .../base/basegoodsspu/BaseGoodsSpuListVo.java | 4 +- .../base/basegoodsspu/BaseGoodsSpuMapper.xml | 4 +- .../basegoodsspu/BaseGoodsSpuService.java | 47 ++++++++++-- .../biz/base/basegoodstype/BaseGoodsType.java | 6 +- .../BaseManufacturerMapper.xml | 2 +- .../wmswarehousearea/WmsWarehouseArea.java | 3 +- .../WmsWarehouseAreaService.java | 72 +++++++++---------- 10 files changed, 101 insertions(+), 61 deletions(-) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java index fbae17eba6..c57ef30f03 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java @@ -74,13 +74,13 @@ public class BaseBrandInfoService extends MybatisBaseService p = new PagerVo<>(); + PagerVo p = new PagerVo<>(); return rb.success().setData(p); } } else { - PagerVo p = new PagerVo<>(); + PagerVo p = new PagerVo<>(); return rb.success().setData(p); } if(StringUtils.isNotBlank(query.getName())){ diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java index a92bafb86c..30db30fc14 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; +import java.math.BigDecimal; + /** * @author wangpengfei * @date 2024/2/26 13:36 @@ -20,13 +22,13 @@ public class BaseGoodsSkuExtend extends BaseEntity { private String inventoryAlertUpperLimit;//库存警戒上线 @TableField(value = "InventoryAlertLowerLimit") private String inventoryAlertLowerLimit;//库存警戒下线 - private String costPrice;//成本价 - private String tagPrice;//吊牌价 - private String salesPrice;//销售单价 - private String standardPurchasePrice;//标准进价 - private String agencyPrice;//代理价 - private String discount;//折扣 - private String minimumSalesPrice;//最低零售价 + private BigDecimal costPrice;//成本价 + private BigDecimal tagPrice;//吊牌价 + private BigDecimal salesPrice;//销售单价 + private BigDecimal standardPurchasePrice;//标准进价 + private BigDecimal agencyPrice;//代理价 + private BigDecimal discount;//折扣 + private BigDecimal minimumSalesPrice;//最低零售价 private String isLockingSalesPrice;//是否锁定销售价 1是2否 private String isLockingSalesPriceValue;//是否锁定销售价 private String isIntegralExchange;//是否可以积分兑换 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java index effb7143d1..8de4df826b 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java @@ -22,7 +22,7 @@ public class BaseGoodsSpu extends BaseEntity { private String goodsUnitSid;//商品单位sid private String goodsUnitName;//商品单位名称 private String taxRate;//税率 - private String shelfLife;//保质期天 + private Integer shelfLife;//保质期天 private String nationalStandardCode;//国标码 private String sortNo;//排序 private String externalCode;//外部编码 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java index a6f5962a63..848fe2b8ae 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java @@ -25,10 +25,10 @@ public class BaseGoodsSpuListVo implements Vo { private String shelfLife;//保质期 private String brandName;//品牌 private String manufacturerName;//厂家 - private String isOriginalFactory;//原厂标志（ 1 是 2否） + private String isOriginalFactoryValue;//原厂标志（ 1 是 2否） private String InventoryAlertUpperLimit;//库存上限 private String InventoryAlertLowerLimit;//库存下限 - private String isLockingSalesPrice;//锁定销售价（ 1 是 2否） + private String isLockingSalesPriceValue;//锁定销售价（ 1 是 2否） private String minimumSalesPrice;//销售底价 private String standardPurchasePrice;//三包价格 private String agencyPrice;//首保价格 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml index 385542e0b4..c35556b94e 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml @@ -81,8 +81,8 @@ WHERE diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java index 8518704fab..c6a9e38589 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; import java.util.UUID; @@ -22,7 +23,7 @@ public class WmsWarehouseArea extends BaseEntity { private String areaName;//库位名称 private String areaCode;//库位编码 private String warehouseSid;//仓库sid - private String volume;//库位容量 + private BigDecimal volume;//库位容量 private String unit;//计量单位 private String areaTypeSid;//货区类型 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java index 780a69d224..ae9eab453e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java @@ -42,42 +42,42 @@ public class WmsWarehouseAreaService extends MybatisBaseService qw = new QueryWrapper<>(); -// PrivilegeQuery privilegeQuery = new PrivilegeQuery(); -// privilegeQuery.setOrgPath(query.getOrgPath()); -// privilegeQuery.setMenuUrl(query.getMenuUrl()); -// privilegeQuery.setUserSid(query.getUserSid()); -// ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); -// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { -// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) -// String orgSidPath = query.getOrgPath(); -// orgSidPath = orgSidPath + "/"; -// int i1 = orgSidPath.indexOf("/"); -// int i2 = orgSidPath.indexOf("/", i1 + 1); -// int i3 = orgSidPath.indexOf("/", i2 + 1); -// int i4 = orgSidPath.indexOf("/", i3 + 1); -// String orgLevelKey = defaultIdReltBean.getData(); -// if ("1".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i1); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("2".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i2); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("3".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i3); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("4".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, i4); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("5".equals(orgLevelKey)) { -// qw.eq("a.createBySid", query.getUserSid()); -// } else { -// PagerVo p = new PagerVo<>(); -// return rb.success().setData(p); -// } -// } else { -// PagerVo p = new PagerVo<>(); -// return rb.success().setData(p); -// } + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } if (StringUtils.isNotBlank(query.getName())) { qw.like("a.areaName", query.getName()); } From e064ecc0fce776a571b0a2a39a5d9fe020668944 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 20 May 2024 16:15:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=85=A8=E6=AC=BE=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF=E6=8A=A5?= =?UTF-8?q?null=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20=E8=B4=B7=E6=AC=BE?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=BC=80=E7=A5=A8=E4=B8=80=E5=B9=B6=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=99=90=E5=88=B6=E5=92=8C=E6=8F=90=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E9=AA=8C=E8=BD=A6=E6=8F=90=E7=A4=BA=E9=AA=8C=E8=BD=A6?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusBillApplicationService.java | 6 ++- .../ScmVehicleExamineMapper.xml | 1 + .../autoservice/invoiced/InvoicedService.java | 50 +++++++++++-------- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java index 3fd746cec7..d01dc2de8f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java @@ -1703,8 +1703,10 @@ public class BusBillApplicationService extends MybatisBaseService \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 3923bc384b..d9c5f3a06e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -350,8 +350,36 @@ public class InvoicedService { BusBillApplicationDetailsVo data = busBillApplicationFeign.fetchDetailByCkSid(query.getSid()).getData(); BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(query.getSid()).getData(); List busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(query.getSid()).getData(); + if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && StringUtils.isBlank(data.getSid())){ + String userSid = query.getUserSid(); + String orgPath = query.getOrgPath(); + List vins = query.getVins(); + for (BusDeliveredApplyDetails busDeliveredApplyDetail : busDeliveredApplyDetails) { + vins.add(busDeliveredApplyDetail.getVinSid()); + } + ResultBean billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(busDeliveredApply.getContractNo(),vins); + if(billApplicationIInfoVoResultBean.getData() != null){ + BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData(); + BeanUtil.copyProperties(billApplicationIInfoVoss,billApplicationIInfoVo); + } + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); + billApplicationIInfoVo.setCkSid(query.getSid()); + billApplicationIInfoVo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName()); + billApplicationIInfoVo.setShowBtn(true); + billApplicationIInfoVo.setInvoiceStateKey("001"); + billApplicationIInfoVo.setInvoiceState("正常开票"); + billApplicationIInfoVo.setDate(DateUtil.formatDate(new Date())); + billApplicationIInfoVo.setShowXsState(true); + return rb.success().setData(billApplicationIInfoVo); + } billApplicationIInfoVo.setShowValueCustomer(data.getShowValueCustomer()); if (data != null) { + if ("2".equals(busDeliveredApply.getPaymentMethodKey())){ + billApplicationIInfoVo.setNoEditInvoiceTypeAndName(true); + billApplicationIInfoVo.setNoEditInvoiceMoney(true); + } + billApplicationIInfoVo.setRemarks(data.getRemarks()); billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid()); billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName()); billApplicationIInfoVo.setSid(data.getSid()); @@ -471,28 +499,6 @@ public class InvoicedService { } } else { - if ("2".equals(busDeliveredApply.getPaymentMethodKey())){ - String userSid = query.getUserSid(); - String orgPath = query.getOrgPath(); - List vins = query.getVins(); - if(vins.size() == 0){ - return rb.setMsg("请选择车辆"); - } - ResultBean billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins); - if(billApplicationIInfoVoResultBean.getData() != null){ - BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData(); - BeanUtil.copyProperties(billApplicationIInfoVoss,billApplicationIInfoVo); - } - SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); - billApplicationIInfoVo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName()); - billApplicationIInfoVo.setShowBtn(true); - billApplicationIInfoVo.setInvoiceStateKey("001"); - billApplicationIInfoVo.setInvoiceState("正常开票"); - billApplicationIInfoVo.setDate(DateUtil.formatDate(new Date())); - billApplicationIInfoVo.setShowXsState(true); - return rb.success().setData(billApplicationIInfoVo); - } billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid()); billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName()); billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId()); From 227fb661aa69a74a1cf8d98221569692b89ec99e Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 20 May 2024 16:15:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/goods/goods/index.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/yxt-as-ui/src/views/goods/goods/index.vue b/yxt-as-ui/src/views/goods/goods/index.vue index 4388fc6b44..d7a1efa74c 100644 --- a/yxt-as-ui/src/views/goods/goods/index.vue +++ b/yxt-as-ui/src/views/goods/goods/index.vue @@ -27,19 +27,19 @@ - + - + - + @@ -302,6 +302,11 @@ this.selectionList = val + const aa = [] + val.forEach(element => { + aa.push(element.sid) + }) + this.sids = aa }, loadList() { this.tableLoading = true