product_platform/oms-ui-admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yunuo970428
2024-10-22 09:29:32 +08:00
parent 8030797253 d8285ac816
commit 16bbf9adbe
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 17 KiB

2
src/api/system/roleAdminister/index.js
View File

@@ -125,7 +125,7 @@ export function saveRoleMenuList(data) {
// 菜单授权
export function roleMenuTree(data) {
return request({
url: `/oms/apiadmin/sysmenu/listAllByRoleSid`,
url: `/oms/apiadmin/sysmenu/listAllByRoleSidG`,
method: 'POST',
data: data,
headers: {

25
src/views/login/login.vue
View File

@@ -75,7 +75,7 @@
<span style="width: 100%;margin-top: 15px;">密码</span>
<el-input class="input" style="flex: 1; margin-right: 10px;margin-top: 5px;" maxlength="6" placeholder="请输入密码"
<el-input class="input" style="flex: 1; margin-right: 10px;margin-top: 5px;" placeholder="8至16位大小写字母和数字的组合"
v-model="registerInfo.password" show-password />
<span style="width: 100%;margin-top: 15px;">验证码</span>
@@ -83,13 +83,14 @@
style="display: flex;flex-direction: row;align-items: center;width: 100%; margin-top: 5px;margin-left: -10px;">
<el-input class="input" style="flex: 1; margin-right: 10px;" maxlength="6" placeholder="请输入验证码"
v-model="registerInfo.code" />
<span :class="sendCodeType2 ? 'sendCode1' : 'sendCode2'" @click="sendCode2">{{sendCodeText2}}</span>
<span :class="sendCodeType2 ? 'sendCode1' : 'sendCode2'" style="cursor:pointer;"
@click="sendCode2">{{sendCodeText2}}</span>
</div>
<div style="display: flex;flex-direction: row;align-items: center;width: 100%; margin-top: 5px;"
@click="goLogin">
<span>已有账号？</span>
<span style="color: #5084D2;">登录</span>
<span style="color: #5084D2;cursor:pointer;">登录</span>
</div>
@@ -121,9 +122,9 @@
<img src="../../assets/images/company_icon.png" style="width: 25px; height: 25px;
margin-left: 10px;margin-right: 10px;" />
<span style="flex: 1;margin-right: 10px;">{{item.orgName}}</span>
<img v-show="item.type=='1'" src="../../assets/images/overdue.png" style=" height: 100%;" />
<img v-show="item.type=='3'" src="../../assets/images/overdue.png" style=" height: 100%;" />
<img v-show="item.type=='2'" src="../../assets/images/experience.png" style=" height: 100%;" />
<img v-show="item.type=='3'" src="../../assets/images/formal.png" style=" height: 100%;" />
<img v-show="item.type=='1'" src="../../assets/images/formal.png" style=" height: 100%;" />
</div>
@@ -218,6 +219,7 @@
check: false,
registerInfo: {
mobile: '',
password: "",
userSid: "",
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44', // oms 资源sid
},
@@ -450,6 +452,16 @@
},
registerStep1() {
var passwordreg = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9]).{8,16}$/
if (!passwordreg.test(this.registerInfo.password)) {
this.$message({
message: '密码格式错误，必须为8至16位大小写字母和数字的组合',
type: 'warning'
})
return
}
if (!this.check) {
this.$message({
message: '请阅读并同意《宇信通服务协议》与《隐私协议》',
@@ -550,7 +562,8 @@
var params = {
userSid: this.registerInfo.userSid,
orgSid: item.orgSid
orgSid: item.orgSid,
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44', // oms 资源sid
}
selOrganization(params).then((response) => {

4
src/views/purchase/purchaseOrder/index.vue
View File

@@ -116,8 +116,8 @@
<el-table-column prop="productProgress" label="生产进度" width="120" align="center" />
<el-table-column prop="unTaxTotalAmount" label="未含税总额" width="120" align="center" />
<el-table-column prop="countTotal" label="总采购数量" width="120" align="center" />
<el-table-column prop="countTotal" label="总入库数量" width="120" align="center" />
<el-table-column prop="countTotal" label="总入库金额" width="120" align="center" />
<el-table-column prop="enterWareCount" label="总入库数量" width="120" align="center" />
<el-table-column prop="enterWareAmount" label="总入库金额" width="120" align="center" />
<!-- <el-table-column prop="receiveStateValue" label="收货状态" align="center" /> -->
<el-table-column prop="deliveryStateValue" label="发货状态" width="120" align="center" />
<el-table-column prop="remarks" label="备注" :min-width="200" align="center" />