diff --git a/src/api/Common/dictcommons.js b/src/api/Common/dictcommons.js
index 09bc4e2..382f579 100644
--- a/src/api/Common/dictcommons.js
+++ b/src/api/Common/dictcommons.js
@@ -49,7 +49,9 @@ export function selectHaveMessage(data) {
url: '/portal/v1/sysuser/selectHaveMessage ',
method: 'post',
data: data,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
}
@@ -59,14 +61,16 @@ export function getButtonPermissions(data) {
url: '/portal/v1/sysfunction/getButtonPermissions',
method: 'post',
data: data,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
}
// 根据当前登录用户的全路径查询相应部门下的所有人
export function selAllByOrgSidPath(data) {
return request({
- url: '/portal/v1/sysstafforg/selAllByOrgSidPath',
+ url: '/wms/apiadmin/sysstafforg/selAllByOrgSidPath',
method: 'post',
params: data
})
@@ -105,7 +109,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'
+ }
})
}
@@ -148,7 +154,9 @@ export function chooseproducts(params) {
url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
method: 'post',
data: params,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
}
diff --git a/src/api/baseinfo/supplier/supplier.js b/src/api/baseinfo/supplier/supplier.js
index 42b7bec..0ec4145 100644
--- a/src/api/baseinfo/supplier/supplier.js
+++ b/src/api/baseinfo/supplier/supplier.js
@@ -7,7 +7,9 @@ export default {
url: '/wms/apiadmin/supplierinfo/listPage',
method: 'post',
data: data,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
},
// 保存
@@ -16,7 +18,9 @@ export default {
url: '/wms/apiadmin/supplierinfo/save',
method: 'post',
data: data,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
},
// 回显
@@ -32,7 +36,9 @@ export default {
url: '/wms/apiadmin/supplierinfo/delBySids',
method: 'DELETE',
data: data,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
},
// 获取供应商类型
@@ -40,7 +46,10 @@ export default {
return request({
url: '/wms/apiadmin/suppliertype/selSupplierType',
method: 'post',
- params: data
+ params: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
}
}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9314041..bd00bf6 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,7 +6,7 @@
@@ -124,113 +125,114 @@
diff --git a/src/views/inStorage/deliveryNotice/receiptAdd.vue b/src/views/inStorage/deliveryNotice/receiptAdd.vue
index 1aa2d17..9db5cd0 100644
--- a/src/views/inStorage/deliveryNotice/receiptAdd.vue
+++ b/src/views/inStorage/deliveryNotice/receiptAdd.vue
@@ -586,44 +586,44 @@
// return
// }
- for (var i = 0; i < this.formobj.list.length; i++) {
+ for (var i = 0; i < this.formobj.list.length; i++) {
- if (Number(this.formobj.list[i].actualInCount) == 0) {
- this.$message({
- showClose: true,
- type: 'error',
- message: '商品实收数量不能为空'
- })
+ if (Number(this.formobj.list[i].actualInCount) == 0) {
+ this.$message({
+ showClose: true,
+ type: 'error',
+ message: '商品实收数量不能为空'
+ })
+
+ return
+ }
- return
}
- }
+ for (var i = 0; i < this.formobj.pcList.length; i++) {
- for (var i = 0; i < this.formobj.pcList.length; i++) {
+ if (this.formobj.pcList[i].manufactureDate == '') {
+ this.$message({
+ showClose: true,
+ type: 'error',
+ message: '生产日期不能为空'
+ })
- if (this.formobj.pcList[i].expirationDate == '') {
- this.$message({
- showClose: true,
- type: 'error',
- message: '生产日期不能为空'
- })
+ return
+ }
- return
- }
+ if (Number(this.formobj.pcList[i].batchCount) == 0) {
+ this.$message({
+ showClose: true,
+ type: 'error',
+ message: '批次数量不能为0'
+ })
- if (Number(this.formobj.pcList[i].batchCount) == 0) {
- this.$message({
- showClose: true,
- type: 'error',
- message: '批次数量不能为0'
- })
+ return
+ }
- return
}
- }
-
this.$refs['form_obj'].validate((valid) => {
if (valid) {
diff --git a/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue b/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue
index db85bc9..b0508a3 100644
--- a/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue
+++ b/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue
@@ -50,7 +50,8 @@
* 业务类型
-
+
@@ -227,39 +228,39 @@
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
+ 商品-批次
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -301,9 +302,9 @@
"sourceBillSid": "",
"sourceBillNo": "",
"createBySid": window.sessionStorage.getItem('userSid'),
- "createByName": window.sessionStorage.getItem('name'),
- "deptName": '',
- "deptSid": '',
+ "createByName": window.sessionStorage.getItem('userName'),
+ "deptName": window.sessionStorage.getItem('departmentName'),
+ "deptSid": window.sessionStorage.getItem('departmentSid'),
"createTime": getCurrentDate(),
"busTypeKey": "",
"busTypeValue": "",
@@ -689,9 +690,9 @@
"sourceBillSid": "",
"sourceBillNo": "",
"createBySid": window.sessionStorage.getItem('userSid'),
- "createByName": window.sessionStorage.getItem('name'),
- "deptName": '',
- "deptSid": '',
+ "createByName": window.sessionStorage.getItem('userName'),
+ "deptName": window.sessionStorage.getItem('departmentName'),
+ "deptSid": window.sessionStorage.getItem('departmentSid'),
"createTime": getCurrentDate(),
"busTypeKey": "",
"busTypeValue": "",
@@ -726,7 +727,10 @@
this.$refs['form_obj'].clearValidate()
})
- getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+ getTypeValueList({
+ type: 'wms_busType',
+ groupNum: 'wms_rk'
+ }).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
@@ -748,7 +752,10 @@
this.$refs['form_obj'].clearValidate()
})
- getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+ getTypeValueList({
+ type: 'wms_busType',
+ groupNum: 'wms_rk'
+ }).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 83df63b..fd63789 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -510,20 +510,22 @@
loading.close()
- window.sessionStorage.setItem('token', response.data.token)
- window.sessionStorage.setItem('userSid', response.data.sid)
- window.sessionStorage.setItem('staffSid', response.data.staffSid)
- window.sessionStorage.setItem('userName', response.data.userName)
- window.sessionStorage.setItem('orgName', response.data.orgName)
- window.sessionStorage.setItem('mobile', response.data.mobile)
- window.sessionStorage.setItem('orgSid', response.data.orgSid)
- window.sessionStorage.setItem('departmentName', response.data.departmentName)
- window.sessionStorage.setItem('departmentSid', response.data.departmentSid)
- window.sessionStorage.setItem('defaultOrgPath', response.data.orgSid)
- window.sessionStorage.setItem('orgNamePath', response.data.orgNamePath)
- window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
- window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
- .pNameAndDepartmentNameAndPostName)
+ window.sessionStorage.setItem('token', response.data.token)
+ window.sessionStorage.setItem('staffSid', response.data.staffSid)
+ window.sessionStorage.setItem('userSid', response.data.sid)
+ window.sessionStorage.setItem('name', response.data.name)
+ window.sessionStorage.setItem('userName', response.data.userName)
+ window.sessionStorage.setItem('mobile', response.data.mobile)
+ window.sessionStorage.setItem('orgName', response.data.orgName)
+ window.sessionStorage.setItem('orgSid', response.data.orgSid)
+ window.sessionStorage.setItem('defaultDeptName', response.data.defaultDeptName)
+ window.sessionStorage.setItem('defaultDeptSid', response.data.defaultDeptSid)
+ window.sessionStorage.setItem('defaultRoleName', response.data.defaultRoleName)
+ window.sessionStorage.setItem('defaultRoleSid', response.data.defaultRoleSid)
+ window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
+ window.sessionStorage.setItem('defaultOrgPath', response.data.departmentSid)
+ window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
+ .pNameAndDepartmentNameAndPostName)
}
}).catch(() => {
@@ -557,17 +559,19 @@
loading.close()
window.sessionStorage.setItem('token', response.data.token)
- window.sessionStorage.setItem('userSid', response.data.sid)
window.sessionStorage.setItem('staffSid', response.data.staffSid)
+ window.sessionStorage.setItem('userSid', response.data.sid)
+ window.sessionStorage.setItem('name', response.data.name)
window.sessionStorage.setItem('userName', response.data.userName)
- window.sessionStorage.setItem('orgName', response.data.orgName)
window.sessionStorage.setItem('mobile', response.data.mobile)
+ window.sessionStorage.setItem('orgName', response.data.orgName)
window.sessionStorage.setItem('orgSid', response.data.orgSid)
- window.sessionStorage.setItem('departmentName', response.data.departmentName)
- window.sessionStorage.setItem('departmentSid', response.data.departmentSid)
- window.sessionStorage.setItem('defaultOrgPath', response.data.orgSid)
- window.sessionStorage.setItem('orgNamePath', response.data.orgNamePath)
+ window.sessionStorage.setItem('defaultDeptName', response.data.defaultDeptName)
+ window.sessionStorage.setItem('defaultDeptSid', response.data.defaultDeptSid)
+ window.sessionStorage.setItem('defaultRoleName', response.data.defaultRoleName)
+ window.sessionStorage.setItem('defaultRoleSid', response.data.defaultRoleSid)
window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
+ window.sessionStorage.setItem('defaultOrgPath', response.data.departmentSid)
window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
.pNameAndDepartmentNameAndPostName)
}