suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工作台接口联调

Browse Source
dev-scheduling
姜雪 1 month ago
parent 40575de4af
commit fc0d72c277
9 changed files with 4993 additions and 421 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5103
      package-lock.json
  2. 16
      src/api/desk/completedTasks.js
  3. 16
      src/api/desk/myMessage.js
  4. 16
      src/api/desk/todoList.js
  5. 43
      src/views/desk/completedTasks.vue
  6. 85
      src/views/desk/myMessage.vue
  7. 95
      src/views/desk/todoList.vue
  8. 37
      src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
  9. 3
      vite.config.mjs

5103
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
src/api/desk/completedTasks.js
Unescape View File

@ -0,0 +1,16 @@
import request from '@/axios';
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/mesApprovalRecord/pageMyHistoryApprovalRecord',
method: 'get',
params: {
...params,
current,
size,
},
cryptoToken: false,
cryptoData: false,
});
};

16
src/api/desk/myMessage.js
Unescape View File

@ -0,0 +1,16 @@
import request from '@/axios';
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/mesNotifyMessage/page',
method: 'get',
params: {
...params,
current,
size,
},
cryptoToken: false,
cryptoData: false,
});
};

16
src/api/desk/todoList.js
Unescape View File

@ -0,0 +1,16 @@
import request from '@/axios';
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/mesApprovalRecord/pageMyApprovalRecord',
method: 'get',
params: {
...params,
current,
size,
},
cryptoToken: false,
cryptoData: false,
});
};

43
src/views/desk/completedTasks.vue
Unescape View File

@ -26,6 +26,7 @@
</template> </template>
<script> <script>
import { getList} from '@/api/desk/completedTasks';
export default { export default {
data() { data() {
return { return {
@ -194,38 +195,16 @@ export default {
this.onLoad(); this.onLoad();
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true;
this.data = [ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
{ console.log(res,'00000001');
id: 1,
type: 1, const data = res.data.data;
title: '请审核张三提交的外协审批流程', this.page.total = data.total;
createUser: '张三', this.data = data.records;
status:1, this.loading = false;
approvalTime:"2026-01-18 22:15:30",
createTime: '2026-01-05 09:06:32', });
},
{
id: 2,
type: 2,
title: '请审核李四提交的仓管审批流程',
createUser: '张三',
status:1,
approvalTime:"2026-01-18 22:15:30",
createTime: '2026-01-12 09:06:32',
},
{
id: 3,
type: 3,
title: '请审核王五提交的槽液审批流程',
createUser: '张三',
status:2,
approvalTime:"2026-01-18 22:15:30",
createTime: '2026-01-15 09:06:32',
},
];
this.page.total = this.data.length;
this.loading = false;
}, },
}, },
}; };

85
src/views/desk/myMessage.vue
Unescape View File

@ -30,6 +30,7 @@
</template> </template>
<script> <script>
import { getList} from '@/api/desk/myMessage';
export default { export default {
data() { data() {
return { return {
@ -215,43 +216,55 @@ export default {
return return
} }
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true;
this.data = [ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
{ console.log(res,'00000001');
id: 1,
type: 1, const data = res.data.data;
title: '请审核张三提交的外协审批流程', this.page.total = data.total;
content:"审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息", this.data = data.records;
createUser: '张三', this.loading = false;
status:1,
approvalTime:"2026-01-18 22:15:30", });
createTime: '2026-01-05 09:06:32',
},
{
id: 2,
type: 2,
title: '请审核李四提交的仓管审批流程',
content:"审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息",
createUser: '张三',
status:1,
approvalTime:"2026-01-18 22:15:30",
createTime: '2026-01-12 09:06:32',
},
{
id: 3,
type: 1,
title: '请审核王五提交的槽液审批流程',
content:"审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息",
createUser: '张三',
status:2,
approvalTime:"2026-01-18 22:15:30",
createTime: '2026-01-15 09:06:32',
},
];
this.page.total = this.data.length;
this.loading = false;
}, },
// onLoad(page, params = {}) {
// this.loading = true;
// this.data = [
// {
// id: 1,
// type: 1,
// title: '请审核张三提交的外协审批流程',
// content:"审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息",
// createUser: '张三',
// status:1,
// approvalTime:"2026-01-18 22:15:30",
// createTime: '2026-01-05 09:06:32',
// },
// {
// id: 2,
// type: 2,
// title: '请审核李四提交的仓管审批流程',
// content:"审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息",
// createUser: '张三',
// status:1,
// approvalTime:"2026-01-18 22:15:30",
// createTime: '2026-01-12 09:06:32',
// },
// {
// id: 3,
// type: 1,
// title: '请审核王五提交的槽液审批流程',
// content:"审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息审批信息",
// createUser: '张三',
// status:2,
// approvalTime:"2026-01-18 22:15:30",
// createTime: '2026-01-15 09:06:32',
// },
// ];
// this.page.total = this.data.length;
// this.loading = false;
// },
}, },
}; };
</script> </script>

95
src/views/desk/todoList.vue
Unescape View File

@ -22,6 +22,7 @@
</template> </template>
<script> <script>
import { getList} from '@/api/desk/todoList';
export default { export default {
data() { data() {
return { return {
@ -65,8 +66,8 @@ export default {
column: [ column: [
{ {
label: '类型', label: '业务类型',
prop: 'type', prop: 'bizType',
sortable: false, sortable: false,
type: 'select', type: 'select',
filter: true, filter: true,
@ -74,14 +75,14 @@ export default {
search: true, search: true,
searchLabelWidth: 90, searchLabelWidth: 90,
dicData: [ dicData: [
{ label: '外协审批', value: 1 }, { label: '外协审批', value: 'testType' },
{ label: '仓管审批', value: 2 }, { label: '仓管审批', value: 2 },
{ label: '槽液审批', value: 3 }, { label: '槽液审批', value: 3 },
], ],
}, },
{ {
label: '标题', label: '业务内容',
prop: 'title', prop: 'content',
sortable: false, sortable: false,
filter: true, filter: true,
span: 12, span: 12,
@ -90,7 +91,7 @@ export default {
}, },
{ {
label: '创建人', label: '创建人',
prop: 'createUser', prop: 'currentRoleName',
sortable: false, sortable: false,
filter: true, filter: true,
span: 12, span: 12,
@ -123,7 +124,24 @@ export default {
data: [], data: [],
}; };
}, },
methods: { methods: {
hanleView(row){
// 根据不同类型跳转到不同页面，并携带 id
const typeMap = {
1: { path: '/oem/oemApproval/index', label: '外协审批' },
2: { path: '/warehouseManagement/warehouseRequest/index', label: '仓管审批' },
3: { path: '/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose', label: '槽液审批' },
};
const target = typeMap[row.type];
if (target) {
this.$router.push({
path: target.path,
state: { id: row.id }
});
}
},
searchReset() { searchReset() {
this.query = {}; this.query = {};
this.onLoad(this.page); this.onLoad(this.page);
@ -143,34 +161,47 @@ export default {
refreshChange() { refreshChange() {
this.onLoad(); this.onLoad();
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true;
this.data = [ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
{ console.log(res,'00000001');
id: 1,
type: 1, const data = res.data.data;
title: '请审核张三提交的外协审批流程', this.page.total = data.total;
createUser: '张三', this.data = data.records;
createTime: '2026-01-05 09:06:32', this.loading = false;
},
{ });
id: 2,
type: 2,
title: '请审核李四提交的仓管审批流程',
createUser: '张三',
createTime: '2026-01-12 09:06:32',
},
{
id: 3,
type: 3,
title: '请审核王五提交的槽液审批流程',
createUser: '张三',
createTime: '2026-01-15 09:06:32',
},
];
this.page.total = this.data.length;
this.loading = false;
}, },
// onLoad(page, params = {}) {
// this.loading = true;
// this.data = [
// {
// id: 1,
// type: 1,
// title: '请审核张三提交的外协审批流程',
// createUser: '张三',
// createTime: '2026-01-05 09:06:32',
// },
// {
// id: 2,
// type: 2,
// title: '请审核李四提交的仓管审批流程',
// createUser: '张三',
// createTime: '2026-01-12 09:06:32',
// },
// {
// id: 3,
// type: 3,
// title: '请审核王五提交的槽液审批流程',
// createUser: '张三',
// createTime: '2026-01-15 09:06:32',
// },
// ];
// this.page.total = this.data.length;
// this.loading = false;
// },
}, },
}; };
</script> </script>

37
src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
Unescape View File

@ -110,6 +110,7 @@ export default {
total: 0, total: 0,
}, },
search:{}, search:{},
taskId: null, // 存储从 state 传递的 id
showDialog: false, showDialog: false,
rowId: '', rowId: '',
rowObj: {}, rowObj: {},
@ -509,7 +510,22 @@ export default {
catchInfoOpen:false,//异常 catchInfoOpen:false,//异常
} }
}, },
mounted() { }, created() {
// 获取通过 state 传递的 id
const id = history.state?.id;
if (id) {
console.log('传递的 id:', id);
this.taskId = id;
// 使用 id 查询列表
this.onLoad(this.page, { ...this.search, id });
} else {
// 如果没有 id，加载全部数据
this.onLoad(this.page, this.search);
}
},
mounted() {
},
methods: { methods: {
// 异常 // 异常
catchInfoFn(row){ catchInfoFn(row){
@ -590,7 +606,7 @@ export default {
this.getMedicineOpen = false this.getMedicineOpen = false
this.catchInfoOpen = false this.catchInfoOpen = false
if(val){ if(val){
this.onLoad() this.onLoad(this.page, { ...this.search, id: this.taskId })
} }
}, },
// 多选 // 多选
@ -638,7 +654,7 @@ export default {
receiveTask({id:row.id}).then(res =>{ receiveTask({id:row.id}).then(res =>{
if(res.data.code == 200){ if(res.data.code == 200){
this.$message.success('接收成功') this.$message.success('接收成功')
this.onLoad() this.onLoad(this.page, { ...this.search, id: this.taskId })
} }
}) })
}) })
@ -669,7 +685,7 @@ export default {
type: 'success', type: 'success',
message: '撤回成功' message: '撤回成功'
}); });
this.onLoad() this.onLoad(this.page, { ...this.search, id: this.taskId ,})
} }
}) })
@ -717,14 +733,15 @@ export default {
refreshChange() { refreshChange() {
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}, },
onLoad() { onLoad(page, params) {
console.log('sear-------------',this.search) console.log('sear-------------', this.search)
this.loading = true this.loading = true
getDealList({ getDealList({
current:this.page.currentPage, current: page?.currentPage || this.page.currentPage,
size:this.page.pageSize, size: page?.pageSize || this.page.pageSize,
status:this.search.statusValue, status: params?.statusValue || this.search.statusValue,
workCenterId:this.search.workCenterId, workCenterId: params?.workCenterId || this.search.workCenterId,
id: params?.id || this.taskId, // 添加 id 参数
}).then(res =>{ }).then(res =>{
this.data = res.data.data.records this.data = res.data.data.records
this.data.map(item =>{ this.data.map(item =>{

3
vite.config.mjs
Unescape View File

@ -61,10 +61,11 @@ export default ({ mode, command }) => {
port: 2888, port: 2888,
proxy: { proxy: {
'/api': { '/api': {
target: 'http://192.168.0.104:80',//本地
// target: 'http://192.168.1.5:82', // target: 'http://192.168.1.5:82',
// target: "http://192.168.1.4:82", // target: "http://192.168.1.4:82",
// target:'http://49.232.74.228:82', // target:'http://49.232.74.228:82',
target: "http://192.168.0.7", // target: "http://192.168.0.7",
//target: 'https://saber3.bladex.cn/api', //target: 'https://saber3.bladex.cn/api',
// target: 'http://49.232.74.228:82', // target: 'http://49.232.74.228:82',
// target: "http:192.168.0.220:80", // target: "http:192.168.0.220:80",

Write Preview
Loading…
Cancel
Save