流程签收功能 取消组任务
This commit is contained in:
parent
72e1f6c02f
commit
60e6f2bd2f
@ -8,13 +8,6 @@ export function taskListApi(config) { // 我的任务列表
|
|||||||
data: config
|
data: config
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
export function taskGroupListApi(config) { // 我的组任务列表
|
|
||||||
return https({
|
|
||||||
url: '/act/task/taskGroupList',
|
|
||||||
method: 'get',
|
|
||||||
data: config
|
|
||||||
})
|
|
||||||
}
|
|
||||||
export function taskHistoryListApi(config) { // 我的历史任务列表
|
export function taskHistoryListApi(config) { // 我的历史任务列表
|
||||||
return https({
|
return https({
|
||||||
url: '/act/task/taskHistoryList',
|
url: '/act/task/taskHistoryList',
|
||||||
|
@ -1,32 +1,36 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="list_box">
|
<view class="list_box">
|
||||||
<view class="list" v-for="item,i in taskArr" :key="i" @click="tojump(`/pages/task/handle?info=${JSON.stringify(item)}&type=${currentIndex}`)">
|
<view class="list" v-for="item,i in taskArr" :key="i"
|
||||||
|
@click="tojump(`/pages/task/handle?info=${JSON.stringify(item)}&type=${currentIndex}`)">
|
||||||
<view class="title f-row aic jcb">
|
<view class="title f-row aic jcb">
|
||||||
<view class="">
|
<view>
|
||||||
<view class="">
|
<view>
|
||||||
{{item.processApplyUserName}}的{{item.processDefinitionName}}
|
{{item.bpmBizTitle}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<text>{{item.durationStr}}</text>
|
<text>{{item.durationStr}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="info">
|
<view class="info">
|
||||||
<view class="">
|
<view>
|
||||||
申请理由:{{item.bpmBizTitle}}
|
申请理由:{{item.bpmBizTitle}}
|
||||||
</view>
|
</view>
|
||||||
<view class="">
|
<view>
|
||||||
当前环节:{{item.taskName}}
|
当前环节:{{item.taskName}}
|
||||||
</view>
|
</view>
|
||||||
<view class="">
|
<view>
|
||||||
流程名称:{{item.processDefinitionName}}
|
流程名称:{{item.processDefinitionName}}
|
||||||
</view>
|
</view>
|
||||||
<view class="">
|
<view>
|
||||||
发起人:{{item.processApplyUserName}}
|
发起人:{{item.processApplyUserName}}
|
||||||
</view>
|
</view>
|
||||||
<view class="">
|
<view>
|
||||||
开始时间:{{item.taskBeginTime}}
|
开始时间:{{item.taskBeginTime}}
|
||||||
</view>
|
</view>
|
||||||
|
<view v-if="currentIndex == 1">
|
||||||
|
结束时间:{{item.taskEndTime}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="btn f-row aic jcb" v-show="currentIndex!=2">
|
<view class="btn f-row aic jcb" v-if="currentIndex == 0 && item.taskAssigneeName">
|
||||||
<view class="entrust" @click.stop="tojump(`/pages/userlist/index?isradio=1&id=${item.id}`)">
|
<view class="entrust" @click.stop="tojump(`/pages/userlist/index?isradio=1&id=${item.id}`)">
|
||||||
委托
|
委托
|
||||||
</view>
|
</view>
|
||||||
@ -34,11 +38,28 @@
|
|||||||
办理
|
办理
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="btn f-row aic jcb" v-if="currentIndex == 0 && !item.taskAssigneeName">
|
||||||
|
<view>
|
||||||
|
</view>
|
||||||
|
<view class="handle" @click="claim(item.id)">
|
||||||
|
签收
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import {
|
||||||
|
claimApi
|
||||||
|
} from '@/api/api.js';
|
||||||
|
import {
|
||||||
|
getCurrentInstance,
|
||||||
|
} from 'vue';
|
||||||
|
const {
|
||||||
|
proxy
|
||||||
|
} = getCurrentInstance()
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
taskArr: {
|
taskArr: {
|
||||||
type: Array,
|
type: Array,
|
||||||
@ -53,11 +74,26 @@
|
|||||||
const tojump = (url) => {
|
const tojump = (url) => {
|
||||||
emit('jump', url)
|
emit('jump', url)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**签收*/
|
||||||
|
const claim = (id) => {
|
||||||
|
claimApi({
|
||||||
|
taskId: id
|
||||||
|
}).then((res) => {
|
||||||
|
if (res.success) {
|
||||||
|
proxy.$toast(res.message)
|
||||||
|
setTimeout(function() {
|
||||||
|
uni.redirectTo({
|
||||||
|
url: './index?id=0'
|
||||||
|
});
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.list_box {
|
.list_box {
|
||||||
// padding: 200rpx 30rpx 0 30rpx;
|
|
||||||
padding: 0 30rpx 0 30rpx;
|
padding: 0 30rpx 0 30rpx;
|
||||||
margin-top: 24rpx;
|
margin-top: 24rpx;
|
||||||
|
|
||||||
|
@ -250,10 +250,7 @@
|
|||||||
const menu = ref([{
|
const menu = ref([{
|
||||||
text: '我的任务',
|
text: '我的任务',
|
||||||
path: '/pages/task/index?id=0'
|
path: '/pages/task/index?id=0'
|
||||||
}, {
|
},{
|
||||||
text: '组任务',
|
|
||||||
path: '/pages/task/index?id=1'
|
|
||||||
}, {
|
|
||||||
text: '历史任务',
|
text: '历史任务',
|
||||||
path: '/pages/task/index?id=2'
|
path: '/pages/task/index?id=2'
|
||||||
}])
|
}])
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
<view class="name">
|
<view class="name">
|
||||||
{{taskInfo.processApplyUserName}}的{{taskInfo.processDefinitionName}}
|
{{taskInfo.processApplyUserName}}的{{taskInfo.processDefinitionName}}
|
||||||
</view>
|
</view>
|
||||||
<view class="status" v-if="type!=2">
|
<view class="status" v-if="type==0">
|
||||||
待审批
|
待审批
|
||||||
</view>
|
</view>
|
||||||
<view class="status" v-else style="background-color: #7AC756;">
|
<view class="status" v-else style="background-color: #7AC756;">
|
||||||
@ -20,7 +20,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</customNav>
|
</customNav>
|
||||||
<component :is="comp" :dataId="dataId"></component>
|
<component :is="comp" :dataId="dataId"></component>
|
||||||
<view class="btn f-row aic jcb" v-if="type!=2&&taskInfo.taskAssigneeName">
|
<view class="btn f-row aic jcb" >
|
||||||
<view class="refuse" @click="openpop(1)">
|
<view class="refuse" @click="openpop(1)">
|
||||||
拒绝
|
拒绝
|
||||||
</view>
|
</view>
|
||||||
@ -28,14 +28,6 @@
|
|||||||
同意
|
同意
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="btn f-row aic jcb" v-if="type!=2&&!taskInfo.taskAssigneeName">
|
|
||||||
<view class="">
|
|
||||||
|
|
||||||
</view>
|
|
||||||
<view class="agree" @click="claim">
|
|
||||||
签收
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<uni-popup ref="popup" type="center">
|
<uni-popup ref="popup" type="center">
|
||||||
<view class="popup">
|
<view class="popup">
|
||||||
@ -44,7 +36,6 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="f-col aic">
|
<view class="f-col aic">
|
||||||
<view class="input f-col">
|
<view class="input f-col">
|
||||||
|
|
||||||
<textarea v-model="reason" name="" id="" maxlength="200" placeholder="请输入"></textarea>
|
<textarea v-model="reason" name="" id="" maxlength="200" placeholder="请输入"></textarea>
|
||||||
<view class="">
|
<view class="">
|
||||||
{{reason.length}}/200
|
{{reason.length}}/200
|
||||||
@ -90,7 +81,6 @@
|
|||||||
processCompleteApi,
|
processCompleteApi,
|
||||||
getProcessTaskTransInfoApi,
|
getProcessTaskTransInfoApi,
|
||||||
getHisProcessNodeInfoApi,
|
getHisProcessNodeInfoApi,
|
||||||
claimApi
|
|
||||||
} from '@/api/api.js';
|
} from '@/api/api.js';
|
||||||
import {
|
import {
|
||||||
beforeJump
|
beforeJump
|
||||||
@ -173,19 +163,6 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
/**签收*/
|
|
||||||
const claim = () => {
|
|
||||||
claimApi({
|
|
||||||
taskId: taskInfo.value.id
|
|
||||||
}).then((res) => {
|
|
||||||
if (res.success) {
|
|
||||||
proxy.$toast(res.message)
|
|
||||||
setTimeout(() => {
|
|
||||||
uni.navigateBack()
|
|
||||||
}, 2000)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**审批流程节点*/
|
/**审批流程节点*/
|
||||||
@ -223,7 +200,7 @@
|
|||||||
onLoad((options) => {
|
onLoad((options) => {
|
||||||
taskInfo.value = JSON.parse(options.info)
|
taskInfo.value = JSON.parse(options.info)
|
||||||
type = options.type
|
type = options.type
|
||||||
if (type == 2) {
|
if (type == 1) {
|
||||||
return getHisProcessNodeInfo(taskInfo.value.processInstanceId)
|
return getHisProcessNodeInfo(taskInfo.value.processInstanceId)
|
||||||
}
|
}
|
||||||
getProcessNodeInfo(taskInfo.value.id)
|
getProcessNodeInfo(taskInfo.value.id)
|
||||||
|
@ -10,9 +10,6 @@
|
|||||||
<view class="tasklist">
|
<view class="tasklist">
|
||||||
<tasklistCom @jump="jump" :taskArr="taskArr" :currentIndex="currentIndex"></tasklistCom>
|
<tasklistCom @jump="jump" :taskArr="taskArr" :currentIndex="currentIndex"></tasklistCom>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -24,7 +21,6 @@
|
|||||||
import { toast } from '@/utils/index.js';
|
import { toast } from '@/utils/index.js';
|
||||||
import {
|
import {
|
||||||
taskListApi,
|
taskListApi,
|
||||||
taskGroupListApi,
|
|
||||||
taskHistoryListApi
|
taskHistoryListApi
|
||||||
} from '@/api/api.js';
|
} from '@/api/api.js';
|
||||||
import {
|
import {
|
||||||
@ -55,12 +51,10 @@
|
|||||||
const tabArr = ref([{
|
const tabArr = ref([{
|
||||||
text: '我的任务',
|
text: '我的任务',
|
||||||
id: 0
|
id: 0
|
||||||
}, {
|
},
|
||||||
text: '组任务',
|
{
|
||||||
id: 1
|
|
||||||
}, {
|
|
||||||
text: '历史任务',
|
text: '历史任务',
|
||||||
id: 2
|
id: 1
|
||||||
}])
|
}])
|
||||||
const date = ref('')
|
const date = ref('')
|
||||||
const currentIndex = ref(0)
|
const currentIndex = ref(0)
|
||||||
@ -73,8 +67,7 @@
|
|||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title: '加载中...'
|
title: '加载中...'
|
||||||
})
|
})
|
||||||
let getlist = currentIndex.value == 0 ? taskListApi : currentIndex.value == 1 ? taskGroupListApi :
|
let getlist = currentIndex.value == 0 ? taskListApi : taskHistoryListApi
|
||||||
taskHistoryListApi
|
|
||||||
getlist({
|
getlist({
|
||||||
// createTime: date.value ? date.value + ' 00:00:00' : '',
|
// createTime: date.value ? date.value + ' 00:00:00' : '',
|
||||||
pageNo,
|
pageNo,
|
||||||
@ -92,8 +85,6 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const change = (i) => {
|
const change = (i) => {
|
||||||
taskArr.value = []
|
taskArr.value = []
|
||||||
pageNo = 1
|
pageNo = 1
|
||||||
|
219
unpackage/dist/dev/app-plus/app-service.js
vendored
219
unpackage/dist/dev/app-plus/app-service.js
vendored
@ -61,7 +61,7 @@ if (uni.restoreGlobal) {
|
|||||||
const _imports_4 = "/static/login/eye-off.png";
|
const _imports_4 = "/static/login/eye-off.png";
|
||||||
const _imports_5 = "/static/login/nocheck.png";
|
const _imports_5 = "/static/login/nocheck.png";
|
||||||
const _imports_6 = "/static/login/checked.png";
|
const _imports_6 = "/static/login/checked.png";
|
||||||
let baseUrl$1 = "https://36.112.48.190/jeecg-boot";
|
let baseUrl$1 = "http://10.75.166.174:8080/jeecg-boot";
|
||||||
let loading = false;
|
let loading = false;
|
||||||
function https(config) {
|
function https(config) {
|
||||||
if (loading)
|
if (loading)
|
||||||
@ -130,9 +130,9 @@ if (uni.restoreGlobal) {
|
|||||||
});
|
});
|
||||||
return promise;
|
return promise;
|
||||||
}
|
}
|
||||||
function loginApi(config) {
|
function localLoginApi(config) {
|
||||||
return https({
|
return https({
|
||||||
url: "/sys/sinopecLogin",
|
url: "/sys/login",
|
||||||
method: "post",
|
method: "post",
|
||||||
data: config
|
data: config
|
||||||
});
|
});
|
||||||
@ -1779,21 +1779,15 @@ This will fail in production.`);
|
|||||||
return proxy.$toast("请输入账号");
|
return proxy.$toast("请输入账号");
|
||||||
if (!password.value.trim())
|
if (!password.value.trim())
|
||||||
return proxy.$toast("请输入密码");
|
return proxy.$toast("请输入密码");
|
||||||
let un = Base64.encode(encodeURIComponent(username.value));
|
Base64.encode(encodeURIComponent(username.value));
|
||||||
let pw = Base64.encode(encodeURIComponent(password.value));
|
Base64.encode(encodeURIComponent(password.value));
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title: "登录中..."
|
title: "登录中..."
|
||||||
});
|
});
|
||||||
loginApi({
|
localLoginApi({
|
||||||
username: un,
|
username: username.value,
|
||||||
password: pw,
|
password: password.value,
|
||||||
ip: getDeviceIp()
|
captcha: "app"
|
||||||
/*生产环境 end */
|
|
||||||
/*开发环境 begin */
|
|
||||||
// localLoginApi({
|
|
||||||
// username: username.value,
|
|
||||||
// password: password.value,
|
|
||||||
// captcha: 'app'
|
|
||||||
/*开发环境 end */
|
/*开发环境 end */
|
||||||
}).then((loginres) => {
|
}).then((loginres) => {
|
||||||
if (loginres.success) {
|
if (loginres.success) {
|
||||||
@ -1825,31 +1819,6 @@ This will fail in production.`);
|
|||||||
password.value = obj.pw ? obj.pw : "";
|
password.value = obj.pw ? obj.pw : "";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
function getDeviceIp() {
|
|
||||||
let deviceIp;
|
|
||||||
if (plus.os.name == "Android") {
|
|
||||||
let Context = plus.android.importClass("android.content.Context");
|
|
||||||
let main = plus.android.runtimeMainActivity();
|
|
||||||
let cm = main.getSystemService(Context.CONNECTIVITY_SERVICE);
|
|
||||||
plus.android.importClass(cm);
|
|
||||||
let linkProperties = cm.getLinkProperties(cm.getActiveNetwork());
|
|
||||||
let linkAddrs = plus.android.invoke(linkProperties, "getLinkAddresses");
|
|
||||||
plus.android.importClass(linkAddrs);
|
|
||||||
for (var i2 = 0; i2 < linkAddrs.size(); i2++) {
|
|
||||||
let inetAddr = plus.android.invoke(linkAddrs.get(i2), "getAddress");
|
|
||||||
deviceIp = plus.android.invoke(inetAddr, "getHostAddress");
|
|
||||||
}
|
|
||||||
if (deviceIp == "") {
|
|
||||||
var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
|
|
||||||
var wifiInfo = plus.android.invoke(wifiManager, "getConnectionInfo");
|
|
||||||
var ipAddress = plus.android.invoke(wifiInfo, "getIpAddress");
|
|
||||||
if (ipAddress != 0) {
|
|
||||||
deviceIp = (ipAddress & 255) + "." + (ipAddress >> 8 & 255) + "." + (ipAddress >> 16 & 255) + "." + (ipAddress >> 24 & 255);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return deviceIp;
|
|
||||||
}
|
|
||||||
return (_ctx, _cache) => {
|
return (_ctx, _cache) => {
|
||||||
return vue.openBlock(), vue.createElementBlock(
|
return vue.openBlock(), vue.createElementBlock(
|
||||||
"view",
|
"view",
|
||||||
@ -6219,13 +6188,6 @@ This will fail in production.`);
|
|||||||
data: config
|
data: config
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
function taskGroupListApi(config) {
|
|
||||||
return https({
|
|
||||||
url: "/act/task/taskGroupList",
|
|
||||||
method: "get",
|
|
||||||
data: config
|
|
||||||
});
|
|
||||||
}
|
|
||||||
function taskHistoryListApi(config) {
|
function taskHistoryListApi(config) {
|
||||||
return https({
|
return https({
|
||||||
url: "/act/task/taskHistoryList",
|
url: "/act/task/taskHistoryList",
|
||||||
@ -6451,7 +6413,7 @@ This will fail in production.`);
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
const customNav = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-420daeb5"], ["__file", "D:/projects/cxc-szcx-uniapp/bpm/customNav.vue"]]);
|
const customNav = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-420daeb5"], ["__file", "D:/projects/cxc-szcx-uniapp/bpm/customNav.vue"]]);
|
||||||
const baseurl = "https://36.112.48.190/jeecg-boot/sys/common/static/";
|
const baseurl = "http://10.75.166.174:8080/jeecg-boot/sys/common/static/";
|
||||||
const toast = (title, icon, duration) => {
|
const toast = (title, icon, duration) => {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title,
|
title,
|
||||||
@ -6674,7 +6636,7 @@ This will fail in production.`);
|
|||||||
vue.useCssVars((_ctx) => ({
|
vue.useCssVars((_ctx) => ({
|
||||||
"ae0729d5-cusnavbarheight": cusnavbarheight
|
"ae0729d5-cusnavbarheight": cusnavbarheight
|
||||||
}));
|
}));
|
||||||
const baseurl2 = "https://36.112.48.190/jeecg-boot";
|
const baseurl2 = "http://10.75.166.174:8080/jeecg-boot";
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
onShow(() => {
|
onShow(() => {
|
||||||
cxcDaping();
|
cxcDaping();
|
||||||
@ -6743,9 +6705,6 @@ This will fail in production.`);
|
|||||||
const menu = vue.ref([{
|
const menu = vue.ref([{
|
||||||
text: "我的任务",
|
text: "我的任务",
|
||||||
path: "/pages/task/index?id=0"
|
path: "/pages/task/index?id=0"
|
||||||
}, {
|
|
||||||
text: "组任务",
|
|
||||||
path: "/pages/task/index?id=1"
|
|
||||||
}, {
|
}, {
|
||||||
text: "历史任务",
|
text: "历史任务",
|
||||||
path: "/pages/task/index?id=2"
|
path: "/pages/task/index?id=2"
|
||||||
@ -6765,7 +6724,7 @@ This will fail in production.`);
|
|||||||
}
|
}
|
||||||
loading2 = false;
|
loading2 = false;
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
formatAppLog("log", "at pages/tab/index.vue:276", "err", err);
|
formatAppLog("log", "at pages/tab/index.vue:273", "err", err);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const gonggaolist = () => {
|
const gonggaolist = () => {
|
||||||
@ -6779,7 +6738,7 @@ This will fail in production.`);
|
|||||||
}
|
}
|
||||||
loading2 = false;
|
loading2 = false;
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
formatAppLog("log", "at pages/tab/index.vue:291", "err", err);
|
formatAppLog("log", "at pages/tab/index.vue:288", "err", err);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const zhibanArr = vue.ref([]);
|
const zhibanArr = vue.ref([]);
|
||||||
@ -6789,7 +6748,7 @@ This will fail in production.`);
|
|||||||
zhibanArr.value = res2.result.records.slice(0, 2);
|
zhibanArr.value = res2.result.records.slice(0, 2);
|
||||||
}
|
}
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
formatAppLog("log", "at pages/tab/index.vue:302", "err", err);
|
formatAppLog("log", "at pages/tab/index.vue:299", "err", err);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const fagui = () => {
|
const fagui = () => {
|
||||||
@ -6803,7 +6762,7 @@ This will fail in production.`);
|
|||||||
}
|
}
|
||||||
loading2 = false;
|
loading2 = false;
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
formatAppLog("log", "at pages/tab/index.vue:318", "err", err);
|
formatAppLog("log", "at pages/tab/index.vue:315", "err", err);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const zhidu = () => {
|
const zhidu = () => {
|
||||||
@ -6819,7 +6778,7 @@ This will fail in production.`);
|
|||||||
}
|
}
|
||||||
loading2 = false;
|
loading2 = false;
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
formatAppLog("log", "at pages/tab/index.vue:335", "err", err);
|
formatAppLog("log", "at pages/tab/index.vue:332", "err", err);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const formatObj = (arr, title, time, depart) => {
|
const formatObj = (arr, title, time, depart) => {
|
||||||
@ -7887,10 +7846,27 @@ This will fail in production.`);
|
|||||||
},
|
},
|
||||||
emits: ["jump"],
|
emits: ["jump"],
|
||||||
setup(__props, { emit: __emit }) {
|
setup(__props, { emit: __emit }) {
|
||||||
|
const {
|
||||||
|
proxy
|
||||||
|
} = vue.getCurrentInstance();
|
||||||
const emit = __emit;
|
const emit = __emit;
|
||||||
const tojump = (url) => {
|
const tojump = (url) => {
|
||||||
emit("jump", url);
|
emit("jump", url);
|
||||||
};
|
};
|
||||||
|
const claim = (id) => {
|
||||||
|
claimApi({
|
||||||
|
taskId: id
|
||||||
|
}).then((res) => {
|
||||||
|
if (res.success) {
|
||||||
|
proxy.$toast(res.message);
|
||||||
|
setTimeout(function() {
|
||||||
|
uni.redirectTo({
|
||||||
|
url: "./index?id=0"
|
||||||
|
});
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
return (_ctx, _cache) => {
|
return (_ctx, _cache) => {
|
||||||
return vue.openBlock(), vue.createElementBlock("view", { class: "list_box" }, [
|
return vue.openBlock(), vue.createElementBlock("view", { class: "list_box" }, [
|
||||||
(vue.openBlock(true), vue.createElementBlock(
|
(vue.openBlock(true), vue.createElementBlock(
|
||||||
@ -7903,11 +7879,11 @@ This will fail in production.`);
|
|||||||
onClick: ($event) => tojump(`/pages/task/handle?info=${JSON.stringify(item)}&type=${__props.currentIndex}`)
|
onClick: ($event) => tojump(`/pages/task/handle?info=${JSON.stringify(item)}&type=${__props.currentIndex}`)
|
||||||
}, [
|
}, [
|
||||||
vue.createElementVNode("view", { class: "title f-row aic jcb" }, [
|
vue.createElementVNode("view", { class: "title f-row aic jcb" }, [
|
||||||
vue.createElementVNode("view", { class: "" }, [
|
vue.createElementVNode("view", null, [
|
||||||
vue.createElementVNode(
|
vue.createElementVNode(
|
||||||
"view",
|
"view",
|
||||||
{ class: "" },
|
null,
|
||||||
vue.toDisplayString(item.processApplyUserName) + "的" + vue.toDisplayString(item.processDefinitionName),
|
vue.toDisplayString(item.bpmBizTitle),
|
||||||
1
|
1
|
||||||
/* TEXT */
|
/* TEXT */
|
||||||
)
|
)
|
||||||
@ -7923,58 +7899,70 @@ This will fail in production.`);
|
|||||||
vue.createElementVNode("view", { class: "info" }, [
|
vue.createElementVNode("view", { class: "info" }, [
|
||||||
vue.createElementVNode(
|
vue.createElementVNode(
|
||||||
"view",
|
"view",
|
||||||
{ class: "" },
|
null,
|
||||||
" 申请理由:" + vue.toDisplayString(item.bpmBizTitle),
|
" 申请理由:" + vue.toDisplayString(item.bpmBizTitle),
|
||||||
1
|
1
|
||||||
/* TEXT */
|
/* TEXT */
|
||||||
),
|
),
|
||||||
vue.createElementVNode(
|
vue.createElementVNode(
|
||||||
"view",
|
"view",
|
||||||
{ class: "" },
|
null,
|
||||||
" 当前环节:" + vue.toDisplayString(item.taskName),
|
" 当前环节:" + vue.toDisplayString(item.taskName),
|
||||||
1
|
1
|
||||||
/* TEXT */
|
/* TEXT */
|
||||||
),
|
),
|
||||||
vue.createElementVNode(
|
vue.createElementVNode(
|
||||||
"view",
|
"view",
|
||||||
{ class: "" },
|
null,
|
||||||
" 流程名称:" + vue.toDisplayString(item.processDefinitionName),
|
" 流程名称:" + vue.toDisplayString(item.processDefinitionName),
|
||||||
1
|
1
|
||||||
/* TEXT */
|
/* TEXT */
|
||||||
),
|
),
|
||||||
vue.createElementVNode(
|
vue.createElementVNode(
|
||||||
"view",
|
"view",
|
||||||
{ class: "" },
|
null,
|
||||||
" 发起人:" + vue.toDisplayString(item.processApplyUserName),
|
" 发起人:" + vue.toDisplayString(item.processApplyUserName),
|
||||||
1
|
1
|
||||||
/* TEXT */
|
/* TEXT */
|
||||||
),
|
),
|
||||||
vue.createElementVNode(
|
vue.createElementVNode(
|
||||||
"view",
|
"view",
|
||||||
{ class: "" },
|
null,
|
||||||
" 开始时间:" + vue.toDisplayString(item.taskBeginTime),
|
" 开始时间:" + vue.toDisplayString(item.taskBeginTime),
|
||||||
1
|
1
|
||||||
/* TEXT */
|
/* TEXT */
|
||||||
)
|
),
|
||||||
|
__props.currentIndex == 1 ? (vue.openBlock(), vue.createElementBlock(
|
||||||
|
"view",
|
||||||
|
{ key: 0 },
|
||||||
|
" 结束时间:" + vue.toDisplayString(item.taskEndTime),
|
||||||
|
1
|
||||||
|
/* TEXT */
|
||||||
|
)) : vue.createCommentVNode("v-if", true)
|
||||||
]),
|
]),
|
||||||
vue.withDirectives(vue.createElementVNode(
|
__props.currentIndex == 0 && item.taskAssigneeName ? (vue.openBlock(), vue.createElementBlock("view", {
|
||||||
"view",
|
key: 0,
|
||||||
{ class: "btn f-row aic jcb" },
|
class: "btn f-row aic jcb"
|
||||||
[
|
}, [
|
||||||
vue.createElementVNode("view", {
|
vue.createElementVNode("view", {
|
||||||
class: "entrust",
|
class: "entrust",
|
||||||
onClick: vue.withModifiers(($event) => tojump(`/pages/userlist/index?isradio=1&id=${item.id}`), ["stop"])
|
onClick: vue.withModifiers(($event) => tojump(`/pages/userlist/index?isradio=1&id=${item.id}`), ["stop"])
|
||||||
}, " 委托 ", 8, ["onClick"]),
|
}, " 委托 ", 8, ["onClick"]),
|
||||||
vue.createElementVNode("view", {
|
vue.createElementVNode("view", {
|
||||||
class: "handle",
|
class: "handle",
|
||||||
onClick: ($event) => tojump(`/pages/task/handle?info=${JSON.stringify(item)}&type=${__props.currentIndex}`)
|
onClick: ($event) => tojump(`/pages/task/handle?info=${JSON.stringify(item)}&type=${__props.currentIndex}`)
|
||||||
}, " 办理 ", 8, ["onClick"])
|
}, " 办理 ", 8, ["onClick"])
|
||||||
],
|
])) : vue.createCommentVNode("v-if", true),
|
||||||
512
|
__props.currentIndex == 0 && !item.taskAssigneeName ? (vue.openBlock(), vue.createElementBlock("view", {
|
||||||
/* NEED_PATCH */
|
key: 1,
|
||||||
), [
|
class: "btn f-row aic jcb"
|
||||||
[vue.vShow, __props.currentIndex != 2]
|
}, [
|
||||||
])
|
vue.createElementVNode("view"),
|
||||||
|
vue.createElementVNode("view", {
|
||||||
|
class: "handle",
|
||||||
|
onClick: ($event) => claim(item.id)
|
||||||
|
}, " 签收 ", 8, ["onClick"])
|
||||||
|
])) : vue.createCommentVNode("v-if", true)
|
||||||
], 8, ["onClick"]);
|
], 8, ["onClick"]);
|
||||||
}),
|
}),
|
||||||
128
|
128
|
||||||
@ -8001,16 +7989,16 @@ This will fail in production.`);
|
|||||||
loading2 = false;
|
loading2 = false;
|
||||||
taskList();
|
taskList();
|
||||||
});
|
});
|
||||||
const tabArr = vue.ref([{
|
const tabArr = vue.ref([
|
||||||
text: "我的任务",
|
{
|
||||||
id: 0
|
text: "我的任务",
|
||||||
}, {
|
id: 0
|
||||||
text: "组任务",
|
},
|
||||||
id: 1
|
{
|
||||||
}, {
|
text: "历史任务",
|
||||||
text: "历史任务",
|
id: 1
|
||||||
id: 2
|
}
|
||||||
}]);
|
]);
|
||||||
vue.ref("");
|
vue.ref("");
|
||||||
const currentIndex = vue.ref(0);
|
const currentIndex = vue.ref(0);
|
||||||
let pageNo = 1;
|
let pageNo = 1;
|
||||||
@ -8022,7 +8010,7 @@ This will fail in production.`);
|
|||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title: "加载中..."
|
title: "加载中..."
|
||||||
});
|
});
|
||||||
let getlist = currentIndex.value == 0 ? taskListApi : currentIndex.value == 1 ? taskGroupListApi : taskHistoryListApi;
|
let getlist = currentIndex.value == 0 ? taskListApi : taskHistoryListApi;
|
||||||
getlist({
|
getlist({
|
||||||
// createTime: date.value ? date.value + ' 00:00:00' : '',
|
// createTime: date.value ? date.value + ' 00:00:00' : '',
|
||||||
pageNo,
|
pageNo,
|
||||||
@ -8038,7 +8026,7 @@ This will fail in production.`);
|
|||||||
loading2 = false;
|
loading2 = false;
|
||||||
}
|
}
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
formatAppLog("log", "at pages/task/index.vue:91", err);
|
formatAppLog("log", "at pages/task/index.vue:84", err);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const change = (i2) => {
|
const change = (i2) => {
|
||||||
@ -8969,18 +8957,6 @@ This will fail in production.`);
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const claim = () => {
|
|
||||||
claimApi({
|
|
||||||
taskId: taskInfo.value.id
|
|
||||||
}).then((res) => {
|
|
||||||
if (res.success) {
|
|
||||||
proxy.$toast(res.message);
|
|
||||||
setTimeout(() => {
|
|
||||||
uni.navigateBack();
|
|
||||||
}, 2e3);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
const stepNode = vue.ref([]);
|
const stepNode = vue.ref([]);
|
||||||
const currentnode = vue.ref(null);
|
const currentnode = vue.ref(null);
|
||||||
const nodeChange = (e2) => {
|
const nodeChange = (e2) => {
|
||||||
@ -9011,7 +8987,7 @@ This will fail in production.`);
|
|||||||
onLoad((options) => {
|
onLoad((options) => {
|
||||||
taskInfo.value = JSON.parse(options.info);
|
taskInfo.value = JSON.parse(options.info);
|
||||||
type = options.type;
|
type = options.type;
|
||||||
if (type == 2) {
|
if (type == 1) {
|
||||||
return getHisProcessNodeInfo(taskInfo.value.processInstanceId);
|
return getHisProcessNodeInfo(taskInfo.value.processInstanceId);
|
||||||
}
|
}
|
||||||
getProcessNodeInfo(taskInfo.value.id);
|
getProcessNodeInfo(taskInfo.value.id);
|
||||||
@ -9052,7 +9028,7 @@ This will fail in production.`);
|
|||||||
1
|
1
|
||||||
/* TEXT */
|
/* TEXT */
|
||||||
),
|
),
|
||||||
vue.unref(type) != 2 ? (vue.openBlock(), vue.createElementBlock("view", {
|
vue.unref(type) == 0 ? (vue.openBlock(), vue.createElementBlock("view", {
|
||||||
key: 0,
|
key: 0,
|
||||||
class: "status"
|
class: "status"
|
||||||
}, " 待审批 ")) : (vue.openBlock(), vue.createElementBlock("view", {
|
}, " 待审批 ")) : (vue.openBlock(), vue.createElementBlock("view", {
|
||||||
@ -9066,10 +9042,7 @@ This will fail in production.`);
|
|||||||
/* STABLE */
|
/* STABLE */
|
||||||
}),
|
}),
|
||||||
(vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(comp.value), { dataId: dataId.value }, null, 8, ["dataId"])),
|
(vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(comp.value), { dataId: dataId.value }, null, 8, ["dataId"])),
|
||||||
vue.unref(type) != 2 && taskInfo.value.taskAssigneeName ? (vue.openBlock(), vue.createElementBlock("view", {
|
vue.createElementVNode("view", { class: "btn f-row aic jcb" }, [
|
||||||
key: 0,
|
|
||||||
class: "btn f-row aic jcb"
|
|
||||||
}, [
|
|
||||||
vue.createElementVNode("view", {
|
vue.createElementVNode("view", {
|
||||||
class: "refuse",
|
class: "refuse",
|
||||||
onClick: _cache[0] || (_cache[0] = ($event) => openpop(1))
|
onClick: _cache[0] || (_cache[0] = ($event) => openpop(1))
|
||||||
@ -9078,17 +9051,7 @@ This will fail in production.`);
|
|||||||
class: "agree",
|
class: "agree",
|
||||||
onClick: _cache[1] || (_cache[1] = ($event) => openpop(2))
|
onClick: _cache[1] || (_cache[1] = ($event) => openpop(2))
|
||||||
}, " 同意 ")
|
}, " 同意 ")
|
||||||
])) : vue.createCommentVNode("v-if", true),
|
]),
|
||||||
vue.unref(type) != 2 && !taskInfo.value.taskAssigneeName ? (vue.openBlock(), vue.createElementBlock("view", {
|
|
||||||
key: 1,
|
|
||||||
class: "btn f-row aic jcb"
|
|
||||||
}, [
|
|
||||||
vue.createElementVNode("view", { class: "" }),
|
|
||||||
vue.createElementVNode("view", {
|
|
||||||
class: "agree",
|
|
||||||
onClick: claim
|
|
||||||
}, " 签收 ")
|
|
||||||
])) : vue.createCommentVNode("v-if", true),
|
|
||||||
vue.createVNode(
|
vue.createVNode(
|
||||||
_component_uni_popup,
|
_component_uni_popup,
|
||||||
{
|
{
|
||||||
@ -15706,7 +15669,7 @@ ${i3}
|
|||||||
const address = vue.ref("");
|
const address = vue.ref("");
|
||||||
const reason = vue.ref("");
|
const reason = vue.ref("");
|
||||||
const path = vue.ref([]);
|
const path = vue.ref([]);
|
||||||
const baseUrl2 = "https://36.112.48.190/jeecg-boot/sys/common/upload/";
|
const baseUrl2 = "http://10.75.166.174:8080/jeecg-boot/sys/common/upload/";
|
||||||
const imageStyles = {
|
const imageStyles = {
|
||||||
width: 64,
|
width: 64,
|
||||||
height: 64,
|
height: 64,
|
||||||
@ -16115,7 +16078,7 @@ ${i3}
|
|||||||
const _sfc_main$j = {
|
const _sfc_main$j = {
|
||||||
__name: "useredit",
|
__name: "useredit",
|
||||||
setup(__props) {
|
setup(__props) {
|
||||||
const baseUrl2 = "https://36.112.48.190/jeecg-boot/sys/common/upload";
|
const baseUrl2 = "http://10.75.166.174:8080/jeecg-boot/sys/common/upload";
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
const chooseAvatar = () => {
|
const chooseAvatar = () => {
|
||||||
uni.chooseImage({
|
uni.chooseImage({
|
||||||
@ -19006,7 +18969,7 @@ ${i3}
|
|||||||
__definePage("pages/safe/detail", PagesSafeDetail);
|
__definePage("pages/safe/detail", PagesSafeDetail);
|
||||||
__definePage("pages/zhiban/index", PagesZhibanIndex);
|
__definePage("pages/zhiban/index", PagesZhibanIndex);
|
||||||
__definePage("pages/task/self", PagesTaskSelf);
|
__definePage("pages/task/self", PagesTaskSelf);
|
||||||
const baseUrl = "https://36.112.48.190/jeecg-boot/sys/common/static/";
|
const baseUrl = "http://10.75.166.174:8080/jeecg-boot/sys/common/static/";
|
||||||
const useUpdateApp = defineStore("updateApp", () => {
|
const useUpdateApp = defineStore("updateApp", () => {
|
||||||
const updateOptions = vue.reactive({
|
const updateOptions = vue.reactive({
|
||||||
force: false,
|
force: false,
|
||||||
|
Loading…
Reference in New Issue
Block a user