ykx/jy-safe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ykx:998b18277d8b60d467eac1ee471d84bf6fc60c49
Branches Tags
ykx:main
..
compare: ykx:c9cbceb83b73855244df3ae747635b656c2d048c
Branches Tags
ykx:main

No commits in common. "998b18277d8b60d467eac1ee471d84bf6fc60c49" and "c9cbceb83b73855244df3ae747635b656c2d048c" have entirely different histories.
998b18277d ... c9cbceb83b

5 changed files with 40 additions and 67 deletions
Show Stats Expand all files Collapse all files

7
components/custom/check-action.vue
View File

@ -37,10 +37,6 @@
type: String,
default: ''
},
TASK_ORGID: {
type: String,
default: ''
},
refuseApi: {
type: String,
default: ''
@ -133,9 +129,6 @@
this.dataSource.CurrentNode = currentNodes[0];
}
}
if(this.TASK_ORGID&&this.TASK_ORGID.length>0){
this.dataSource.Parameter22 = this.TASK_ORGID
}
const params = {
...this.dataSource,
CurrentNode: {

7
pages/apply/subPages/SK/riskSafeIdenShow.vue
View File

@ -103,7 +103,7 @@
<!-- <view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button" v-if="isLoadOK&&tableKey==='1'&&!isAudit">
<u-button type="primary" @click="submit" color="#3d4b70">确认</u-button>
</view> -->
<check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :TASK_ORGID="TASK_ORGID" :refuseApi="refuseApi" :dataSource="$store.state.auditModel"></check-action>
<check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :refuseApi="refuseApi" :dataSource="$store.state.auditModel"></check-action>
</view>
</view>
</template>
@ -154,7 +154,6 @@
listPropUpload: ['NOTIFY_ID'],
listPropValUpload: [],
ORG_ID: uni.getStorageSync('orgId'),
TASK_ORGID:'',
stepLoad: true,
dataModel: {
Nav_ApplyDepartment: {
@ -228,7 +227,6 @@
onLoad(option) {
this.TaskID = option.taskID ? option.taskID : '';
this.ID = option.ID? option.ID:''
this.TASK_ORGID = option.TASK_ORGID? option.TASK_ORGID:''
this.model.ID = option.ID ? option.ID : '';
this.tableKey = option.tableKey ? option.tableKey : '0'
this.isAudit = option.isAudit
@ -257,9 +255,6 @@
extendInclude(json, 'Nav_Files');
extendInclude(json, 'Nav_Files.Nav_ImgFile');
extendIgnoreDataRule(json)
if(this.TASK_ORGID&& this.TASK_ORGID!=null){
json.Parameter22 = this.TASK_ORGID
}
// extendRule(json, 'TASK_ID', 1, this.TaskID);
EvaIdentifyPlanGet(json).then(res => {
this.dataModel = res;

22
pages/index/index2.nvue
View File

@ -7,14 +7,12 @@
<!-- <view class="status-bar" :style="{'width': screenWidth + 'px'}"></view> -->
<view class="main">
<view class="swiper-wrap">
<u-swiper :list="banners" height="110" radius="8" circular indicator indicatorActiveColor="#2979ff"
indicatorInactiveColor="#D7D7D7" indicatorMode="dot" indicatorStyle="right: 20px;"
<u-swiper :list="banners" height="110" radius="8" circular indicator indicatorActiveColor="#2979ff" indicatorInactiveColor="#D7D7D7" indicatorMode="dot" indicatorStyle="right: 20px;"
@change="e => currentBanner = e.current">
</u-swiper>
</view>
<view style="display: flex;flex-direction: row;height: 40px;align-items: center;margin-left: 10px;">
<view @click="handleTab('1')"
style="height: 100%;display: flex;border-radius: 15px;margin-right: 10px;flex-direction: column;">
<view @click="handleTab('1')" style="height: 100%;display: flex;border-radius: 15px;margin-right: 10px;flex-direction: column;">
<view style="display: flex;flex-direction: row;height: 100%;">
<view style="display: flex;flex-direction: column;height: 100%;justify-content: center;">
<text style="margin: 0px 5px;display: flex;align-items: center;margin-bottom: 5px;"
@ -22,8 +20,7 @@
<view v-if="currentTab === '1'" class="bottom-widget"></view>
</view>
<view style="display: flex;align-items: flex-start;">
<u-badge type="error" max="99" :value="todoTotal"
style="font-weight: bold;z-index: 999;display:flex;align-items: flex-start;"></u-badge>
<u-badge type="error" max="99" :value="todoTotal" style="font-weight: bold;z-index: 999;display:flex;align-items: flex-start;"></u-badge>
</view>
</view>
</view>
@ -39,8 +36,7 @@
</view>
</view> -->
<view @click="handleTab('3')"
style="height: 100%;margin-right: 10px;display: flex;border-radius: 15px;">
<view @click="handleTab('3')" style="height: 100%;margin-right: 10px;display: flex;border-radius: 15px;">
<view style="display: flex;flex-direction: row;height: 100%;">
<view style="display: flex;flex-direction: column;height: 100%;justify-content: center;">
<text style="margin: 0px 5px;display: flex;align-items: center;margin-bottom: 5px;"
@ -49,8 +45,7 @@
</view>
<view style="display: flex;align-items: flex-start;">
<u-badge type="error" max="99" :value="noticeTotal"
style="font-weight: bold;z-index: 999;display:flex;align-items: flex-start;"></u-badge>
<u-badge type="error" max="99" :value="noticeTotal" style="font-weight: bold;z-index: 999;display:flex;align-items: flex-start;"></u-badge>
</view>
</view>
@ -405,8 +400,6 @@
if (item.SOURCE_FORMCODE == 'PF119') {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId)
json.Parameter22 = item.ORG_ID
extendRule(json, 'ID', 1, item.SOURCE_DATA_ID);
extendInclude(json, "Nav_ApproveDetails")
extendInclude(json, "Nav_ApproveDetails.Nav_ApproveUser")
@ -434,7 +427,7 @@
item
.SOURCE_DATA_ID + "&taskID=" +
item.ID + '&isAudit=true&okApi=' + okApi + '&refuseApi=' + res
.REJECT_INTERFACE + "&TASK_ORGID=" + item.ORG_ID
.REJECT_INTERFACE
this.$store.commit('updateAuditModel', res)
uni.navigateTo({
url: linkToUrl
@ -449,8 +442,7 @@
if (linkToUrl != '') {
linkToUrl += "?tableKey=" + this.affairType + "&ID=" + item.SOURCE_DATA_ID + "&taskID=" + item.ID
if (item.SOURCE_FORMCODE == 'SC034' || item.SOURCE_FORMCODE == 'SC030' || item.SOURCE_FORMCODE ==
'SE050_SHOWPRINT') {
if (item.SOURCE_FORMCODE == 'SC034' || item.SOURCE_FORMCODE == 'SC030' || item.SOURCE_FORMCODE == 'SE050_SHOWPRINT') {
linkToUrl += "&FORMCODE=" + item.SOURCE_FORMCODE //会议 纪要 load时 添加标识
}

2
utils/common.js
View File

@ -454,7 +454,6 @@ export function initQueryFilter(OrgId, PageIndex, Limit, Sort, Order) {
IncludeCount: 0,
OrderCount: 0,
FilterGroupCount: 0,
IgnoreOrgRule: true,
Include: [],
Orders: [],
FilterGroup: {
@ -477,7 +476,6 @@ export function initFilter(OrgId, Keyword = "", Sort, Order, PageIndex = 1, Para
OrgId,
PageIndex,
Limit: 10,
IgnoreOrgRule: true,
Start: (PageIndex - 1) * 10,
Sort,
Order: (Order === '' ? 0 : Order),

69
utils/request.js
View File

@ -7,16 +7,16 @@ export default {
// return config.uni_app_web_api_url.replace('api', '')
return config.uni_app_web_local_api_url.replace('api', '')
},
getRequestHeaders(url, type = 'post', data, isIgnoreTenant) {
getRequestHeaders(url, type = 'post', isIgnoreTenant) {
const auth = 'Bearer ' + uni.getStorageSync('accessToken')
// const user = uni.getStorageSync('loginUserVerify')
// const RootOrgId = uni.getStorageSync('RootOrgId')
const appInfoData = uni.getStorageSync('appInfo')
const tenant = uni.getStorageSync('Tenant') || ''
const userId = uni.getStorageSync('Userid') || ''
const userId = uni.getStorageSync('Userid')||''
// const userId = appInfoData?.User?.ID || ''
const userName = appInfoData?.User?.NAME || ''
const orgId = uni.getStorageSync('orgId') || ''
const orgId= uni.getStorageSync('orgId')||''
// const orgId = appInfoData?.User?.ORG_ID || ''
const dataRule = appInfoData?.DataRule ? appInfoData?.DataRule.join(',') : ''
const departmentId = appInfoData?.User?.DEPARTMENT_ID || ''
@ -37,38 +37,33 @@ export default {
// const Tenant = uni.getStorageSync('Tenant')
// url.indexOf('OP') != 0 && !isIgnoreTenant && (headers.Tenant = Tenant)
const Tenant = uni.getStorageSync('Tenant') || ''
if (url.indexOf('PF/Login/Login') !== -1) {
// Login接口使用最新的Tenant、Orgid、userid、Username值
const latestTenant = uni.getStorageSync('Tenant') || ''
const latestOrgid = uni.getStorageSync('orgId')
const latestUserid = uni.getStorageSync('Userid')
const latestUsername = uni.getStorageSync('Username')
if (latestTenant) {
headers.Tenant = latestTenant
}
if (latestOrgid) {
// 覆盖原有的orgId字段，使用最新值
headers.orgId = latestOrgid
}
if (latestUserid) {
// 覆盖原有的userid字段，使用最新值
headers.userid = latestUserid
}
// if (latestUsername) {
// // 覆盖原有的username字段，使用最新值
// headers.username = latestUsername
// }
} else if (url.indexOf('OP') != 0 && !isIgnoreTenant) {
headers.Tenant = Tenant
}
//wyw
if (Tenant && Tenant == '003' && data && data.Parameter22 && data.Parameter22.length > 20) {
//总公司 Parameter22 存入子公司的ORG_ID 自动切换数据库链接
headers.Tenant = data.Parameter22.substring(0, 3)
}
if (url.indexOf('PF/Login/Login') !== -1) {
// Login接口使用最新的Tenant、Orgid、userid、Username值
const latestTenant = uni.getStorageSync('Tenant') || ''
const latestOrgid = uni.getStorageSync('orgId')
const latestUserid = uni.getStorageSync('Userid')
const latestUsername = uni.getStorageSync('Username')
if (latestTenant) {
headers.Tenant = latestTenant
}
if (latestOrgid) {
// 覆盖原有的orgId字段，使用最新值
headers.orgId = latestOrgid
}
if (latestUserid) {
// 覆盖原有的userid字段，使用最新值
headers.userid = latestUserid
}
// if (latestUsername) {
// // 覆盖原有的username字段，使用最新值
// headers.username = latestUsername
// }
} else if (url.indexOf('OP') != 0 && !isIgnoreTenant) {
headers.Tenant = Tenant
}
return headers
},
send(options = {}, onlyData, isShowLoading) {
@ -207,7 +202,7 @@ export default {
return this.send({
url: url,
data: data,
header: this.getRequestHeaders(url, 'get', data)
header: this.getRequestHeaders(url, 'get')
}, onlyData)
},
post(url = '', data = {}, onlyData = true, isShowLoading = true) {
@ -223,7 +218,7 @@ export default {
return this.send({
url: url,
data: data,
header: this.getRequestHeaders(url, 'post', data),
header: this.getRequestHeaders(url, 'post'),
method: 'POST'
}, onlyData, isShowLoading)
},