From 41490d6a55c4d9d33cbbedaad5d3c0ee07eb0c0a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 26 二月 2025 11:03:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/api/business/productOrder.js | 6 +++---
src/views/business/inspectionTask/inspection.vue | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/api/business/productOrder.js b/src/api/business/productOrder.js
index 00862c6..e0c49ef 100644
--- a/src/api/business/productOrder.js
+++ b/src/api/business/productOrder.js
@@ -54,8 +54,8 @@
export function upPlanUser2(query) {
return request({
url: '/insOrderPlan/upPlanUser2',
- method: 'post',
- data: query
+ method: 'get',
+ params: query
})
}
// 妫�楠屼笅鍙�
@@ -63,7 +63,7 @@
return request({
url: '/insOrder/upInsOrder',
method: 'post',
- data: query
+ params: query
})
}
// 灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 58accdd..697a551 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -21,7 +21,7 @@
<el-button v-if="typeSource == 1" size="small" type="primary" @click="openPurchase">杩涜揣楠岃瘉</el-button>
<el-button v-if="state == 1 && typeSource == 1" size="small" type="primary" @click="openUnPassDialog('add')">涓嶅悎鏍煎鐞�</el-button>
<el-button size="small" type="primary" @click="sampleVisible = true;uploadSample();">鏍峰搧鍒囨崲</el-button>
- <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">浠诲姟鍒囨崲</el-button>
+<!-- <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">浠诲姟鍒囨崲</el-button>-->
<el-button v-if="state == 1" size="small" type="primary" @click="addVerifyDia = true">鎻愪氦</el-button>
<!-- 澶嶆牳 -->
<el-button v-if="state == 2" size="medium" type="primary" @click="openAddCheck">閫氳繃</el-button>
@@ -355,7 +355,6 @@
size="medium" style="margin-right: 5px">{{ item.label }}</el-tag>
</template>
</el-table-column>
- <el-table-column label="妫�楠屼汉" min-width="80px" prop="checkName" show-overflow-tooltip></el-table-column>
<el-table-column align="center" label="鏄惁鐣欐牱" prop="isLeave" show-overflow-tooltip width="95px">
<template slot-scope="scope">
<span>{{ scope.row.isLeave == 0 ? "鍚�" : "鏄�" }}</span>
@@ -786,7 +785,7 @@
this.getAuthorizedPerson();
// this.getPower();
this.startWorker();
- this.getList0()
+ // this.getList0() // 浠诲姟鍒囨崲
this.scrollInit();
},
watch: {
--
Gitblit v1.9.3