bonus
/
SmartStorage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领料审批修改

This commit is contained in:
FrancisHu 2024-09-13 10:12:26 +08:00
parent 305a6e239a
commit 633d4188df
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apis/http.js
View File

@ -3,26 +3,26 @@ class HttpConfig {
baseUrl = "/api"
// #endif
// #ifdef APP-PLUS
// baseUrl = "http://112.29.103.165:21624"
baseUrl = "http://112.29.103.165:21624"
// baseUrl = "http://192.168.0.14:21624"
// baseUrl = "http://112.29.103.165:21626"
// baseUrl = "http://172.20.10.3:8080"
// baseUrl = "http://10.40.92.8:8080"
// baseUrl = "http://10.40.92.52:28080"
// baseUrl = "http://10.40.92.78:28080"
baseUrl = "http://192.168.2.136:28090"
// baseUrl = "http://192.168.2.127:28080"
// baseUrl = "https://z.csgmall.com.cn/gl"
// baseUrl = "http://10.40.92.141:28080"
// #endif
// 基地址
// authPath = `${this.baseUrl}/dev-api/auth`
// systemPath = `${this.baseUrl}/dev-api/system`
// basePath = `${this.baseUrl}/dev-api/base`
// materialPath = `${this.baseUrl}/dev-api/material`
authPath = `${this.baseUrl}/auth`
authPath = `${this.baseUrl}/dev-api/auth`
systemPath = `${this.baseUrl}/dev-api/system`
basePath = `${this.baseUrl}/dev-api/base`
materialPath = `${this.baseUrl}/dev-api/material`
/* authPath = `${this.baseUrl}/auth`
systemPath = `${this.baseUrl}/system`
basePath = `${this.baseUrl}/base`
materialPath = `${this.baseUrl}/material`
materialPath = `${this.baseUrl}/material` */
// 短链
serviceUrl = {
login: {

52
pages/fetchExam/fetchExam.vue
View File

@ -65,7 +65,7 @@
</view>
<view
style="background-color: #FCA30D;"
v-show="fetch.taskStatus == 30 && roles.includes('fgs')"
v-show="fetch.taskStatus == 30 && fetch.deptId == deptId"
@click="toggleOpenModal(fetch)"
>
<uni-icons style="color: #fff;" type="auth"></uni-icons>
@ -73,7 +73,7 @@
</view>
<view
style="background-color: #FCA30D;"
v-show="fetch.taskStatus == 31 && roles.includes('picking:auditing:sgb')"
v-show="fetch.taskStatus == 31 && roles.includes('sgb')"
@click="toggleOpenModal(fetch)"
>
<uni-icons style="color: #fff;" type="auth"></uni-icons>
@ -270,6 +270,7 @@ import { basePath } from '../../public'
examList: [],
deviceList: [],
roles: uni.getStorageSync('roles'),
deptId: uni.getStorageSync('userInfo').sysUser.deptId,
modalList: {},
rejectReason: ''
}
@ -336,25 +337,7 @@ import { basePath } from '../../public'
}
if (that.modalList.taskStatus == 30) {
if (that.modalList.leaseApplyInfoList[0].leaseApplyDetails[0].companyId == 101) {
this.examList = {
taskId: that.modalList.taskId,
taskType: that.modalList.taskType,
taskStatus: that.modalList.taskStatus + 1,
companyId: that.modalList.leaseApplyInfoList[0].companyId,
code: that.modalList.code,
leaseApplyInfoList: that.modalList.leaseApplyInfoList
}
} else if (that.modalList.leaseApplyInfoList[0].leaseApplyDetails[0].companyId == 102) {
this.examList = {
taskId: that.modalList.taskId,
taskType: that.modalList.taskType,
taskStatus: that.modalList.taskStatus + 2,
companyId: that.modalList.leaseApplyInfoList[0].companyId,
code: that.modalList.code,
leaseApplyInfoList: that.modalList.leaseApplyInfoList
}
}
} else {
that.modalList.leaseApplyInfoList[0].examineStatusId = that.modalList.taskStatus
this.examList = {
taskId: that.modalList.taskId,
taskType: that.modalList.taskType,
@ -362,7 +345,28 @@ import { basePath } from '../../public'
companyId: that.modalList.leaseApplyInfoList[0].companyId,
code: that.modalList.code,
leaseApplyInfoList: that.modalList.leaseApplyInfoList,
leaseApplyDetails: that.modalList.leaseApplyInfoList[0].leaseApplyDetails
}
} else if (that.modalList.leaseApplyInfoList[0].leaseApplyDetails[0].companyId == 102) {
that.modalList.leaseApplyInfoList[0].examineStatusId = that.modalList.taskStatus
this.examList = {
taskId: that.modalList.taskId,
taskType: that.modalList.taskType,
taskStatus: that.modalList.taskStatus + 2,
companyId: that.modalList.leaseApplyInfoList[0].companyId,
code: that.modalList.code,
leaseApplyInfoList: that.modalList.leaseApplyInfoList,
}
}
} else {
that.modalList.leaseApplyInfoList[0].examineStatusId = that.modalList.taskStatus
this.examList = {
taskId: that.modalList.taskId,
taskType: that.modalList.taskType,
taskStatus: that.modalList.taskStatus + 1,
companyId: that.modalList.leaseApplyInfoList[0].companyId,
code: that.modalList.code,
leaseApplyInfoList: that.modalList.leaseApplyInfoList,
leaseApplyDetails: that.modalList.leaseApplyInfoList[0].leaseApplyDetails,
}
}
if (that.roles.includes('fgs') && that.modalList.taskStatus == 30) {
@ -746,7 +750,8 @@ import { basePath } from '../../public'
let that = this
that.fetchIpt = ''
console.log(uni.getStorageSync('userInfo'));
console.log(that.roles);
console.log(that.roles, that.deptId);
if (that.roles.includes('admin')) that.roles = ['fgs', 'sgb', 'ajb', 'jjfgs', 'tsfgs', 'admin']
for (let i = 0; i < that.roles.length; i++) {
if (that.roles[i] == 'em01' || that.roles[i] == 'em02') {
that.roles[i] = 'jjfgs'
@ -759,7 +764,6 @@ import { basePath } from '../../public'
if (item == 'em01' || item == 'em02') item = 'jjfgs'
if (item == 'dm01' || item == 'dm02') item = 'tsfgs'
}) */
if (that.roles.includes('admin')) that.roles = ['fgs', 'sgb', 'ajb', 'jjfgs', 'tsfgs', 'admin']
// if (that.roles.includes('sgb')) that.roles = ['sgb']
console.log(that.roles);
that.initFetch()