From 3268451493960900a913befafe760729061f38e8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 14:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/api/business/productOrder.js | 2
src/views/performance/manHour/workTimeManagement.vue | 14 +++-
src/api/cnas/personal/personalList.js | 4
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue | 2
src/views/business/inspectionReview/index.vue | 1
src/views/business/costStatistics/index.vue | 31 +++++++++-
src/views/business/costStatistics/components/viewInfoDia.vue | 70 +++++++++++++++++++++++
src/views/business/productOrder/index.vue | 3
src/views/business/inspectionTask/index.vue | 28 +++++++++
9 files changed, 143 insertions(+), 12 deletions(-)
diff --git a/src/api/business/productOrder.js b/src/api/business/productOrder.js
index 1b991ac..8be32b1 100644
--- a/src/api/business/productOrder.js
+++ b/src/api/business/productOrder.js
@@ -22,7 +22,7 @@
return request({
url: '/insOrder/rawAllInsOrderExport',
method: 'get',
- data: query,
+ params: query,
responseType: "blob"
})
}
diff --git a/src/api/cnas/personal/personalList.js b/src/api/cnas/personal/personalList.js
index a96377e..d6ce381 100644
--- a/src/api/cnas/personal/personalList.js
+++ b/src/api/cnas/personal/personalList.js
@@ -45,7 +45,7 @@
// 鍒犻櫎閮ㄩ棬
export function delDepartmentLims(query) {
return request({
- url: "/department/delDepartmentLims",
+ url: "/personBasicInfo/delDepartmentLims",
method: "delete",
params: query
});
@@ -53,7 +53,7 @@
// 娣诲姞閮ㄩ棬
export function addDepartmentLims(query) {
return request({
- url: "/department/addDepartmentLims",
+ url: "/personBasicInfo/addDepartmentLims",
method: "post",
data: query
});
diff --git a/src/views/business/costStatistics/components/viewInfoDia.vue b/src/views/business/costStatistics/components/viewInfoDia.vue
new file mode 100644
index 0000000..63269f3
--- /dev/null
+++ b/src/views/business/costStatistics/components/viewInfoDia.vue
@@ -0,0 +1,70 @@
+<template>
+ <div>
+ <el-dialog title="璇︽儏" :visible.sync="viewInfoDia" width="1000px">
+ <limsTable :tableData="tableData" :column="column"
+ height="600" @pagination="pagination"
+ :page="page" :tableLoading="tableLoading"></limsTable>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import limsTable from "@/components/Table/lims-table.vue";
+import {selectRatesDetail} from "@/api/business/insOrderRates";
+export default {
+ name: '',
+ // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
+ components: { limsTable },
+ data() {
+ // 杩欓噷瀛樻斁鏁版嵁
+ return {
+ tableData: [],
+ column: [
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: 160 },
+ {label: '妫�楠岄」鍒嗙被', prop: 'inspectionItemClass', width: 160},
+ {label: '妫�楠岄」', prop: 'inspectionItem', width: 160},
+ {label: '妫�楠屽瓙椤�', prop: 'inspectionItemSubclass', width: 160},
+ { label: '鏀惰垂鏍囧噯(鍏�/娆�)', prop: 'rates' },
+ ],
+ viewInfoDia: false,
+ tableLoading: false,
+ page: {
+ current: 1,
+ size: 10,
+ total: 0
+ },
+ info: {}
+ };
+ },
+ mounted() {
+
+ },
+ // 鏂规硶闆嗗悎
+ methods: {
+ openDia(row) {
+ this.viewInfoDia = true
+ this.info = this.HaveJson(row)
+ this.page.current = 1
+ this.page.size = 10
+ this.getList();
+ },
+ getList() {
+ this.tableLoading = true;
+ selectRatesDetail({insOrderId: this.info.id, ...this.page}).then(res => {
+ this.tableLoading = false;
+ this.tableData = res.data.records;
+ this.page.total = res.data.total;
+ }).catch(err => {
+ this.tableLoading = false;
+ })
+ },
+ pagination(page) {
+ this.page.size = page.limit;
+ this.getList();
+ },
+ }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/business/costStatistics/index.vue b/src/views/business/costStatistics/index.vue
index 6243ee8..98cf152 100644
--- a/src/views/business/costStatistics/index.vue
+++ b/src/views/business/costStatistics/index.vue
@@ -1,4 +1,5 @@
<template>
+<!-- 璐圭敤缁熻椤甸潰-->
<div class="capacity-scope">
<div class="search">
<div>
@@ -27,16 +28,18 @@
:height="'calc(100vh - 250px)'" @pagination="pagination"
:page="page" :tableLoading="tableLoading"></lims-table>
</div>
+ <viewInfoDia ref="viewInfoDia" v-if="viewInfoDia"></viewInfoDia>
</div>
</template>
<script>
import limsTable from "@/components/Table/lims-table.vue";
+import viewInfoDia from "./components/viewInfoDia.vue";
import {selectRatesPage} from "@/api/business/insOrderRates";
import {selectCustomPageList} from "@/api/system/customer";
export default {
- components: {limsTable},
+ components: {limsTable,viewInfoDia},
data() {
return {
entity: {
@@ -54,14 +57,29 @@
{ label: '濮旀墭浜�', prop: 'prepareUser' },
{ label: '鐢熶骇鍗曚綅', prop: 'production' },
{ label: '宸ョ▼鍚嶇О', prop: 'engineering' },
- { label: '宸ユ椂', prop: 'cost' }
+ { label: '宸ユ椂', prop: 'cost' },
+ {
+ dataType: "action",
+ fixed: "right",
+ label: "鎿嶄綔",
+ operation: [
+ {
+ name: "鏌ョ湅璇︽儏",
+ type: "text",
+ clickFun: (row) => {
+ this.openDia(row)
+ },
+ },
+ ],
+ }
],
page: {
total: 0,
size: 10,
current: 1
},
- companyOptions: []
+ companyOptions: [],
+ viewInfoDia: false
}
},
mounted() {
@@ -106,6 +124,13 @@
this.page.size = page.limit
this.refreshTable()
},
+ // 鏌ョ湅璇︽儏
+ openDia (row) {
+ this.viewInfoDia = true
+ this.$nextTick(() => {
+ this.$refs.viewInfoDia.openDia(row)
+ })
+ },
}
}
</script>
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index 66e90e9..a2f5cfb 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -374,6 +374,7 @@
/* if (!row.tempUrlPdf) return this.$message.warning('鏂囦欢鏈笂浼�')
this.currentInfo = row
this.lookDialogVisible = true*/
+ console.log(this.javaApi)
this.currentInfo = row;
let fileName = row.url
let fileType = "docx"
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index d3505bf..515c16e 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -246,6 +246,8 @@
<edit-inspection-item ref="editInspectionItem"></edit-inspection-item>
<!--鏌ョ湅宸ユ椂寮规-->
<viewManHourDia ref="viewManHourDia"></viewManHourDia>
+ <!--涓嶅悎鏍煎娴嬫煡鐪嬪脊妗�-->
+ <un-pass-retest-result v-if="retestVisible" :retestInfo="retestInfo" :retestVisible="retestVisible" @closeRetestLook="closeRetestLook"></un-pass-retest-result>
</div>
</template>
@@ -254,6 +256,7 @@
import EditInspectionItem from "./components/EditInspectionItem.vue";
import limsTable from "@/components/Table/lims-table.vue";
import viewManHourDia from "./components/viewManHourDia.vue"
+import UnPassRetestResult from "@/components/rawMaterialInspection/unPassRetestResult.vue"
import {
claimInsOrderPlan,
upPlanUser2,
@@ -267,12 +270,14 @@
selectSampleAndProductByOrderId,
} from "@/api/business/inspectionTask.js";
import { mapGetters } from "vuex";
+import {getRetestResult} from "@/api/business/rawMaterialOrder";
export default {
name: 'InspectionTask',
components: {
EditInspectionItem,
limsTable,
- viewManHourDia
+ viewManHourDia,
+ UnPassRetestResult
},
dicts: ["urgency_level", "inspection_task_state"],
computed: {
@@ -569,6 +574,16 @@
label: "鎿嶄綔",
operation: [
{
+ name: "涓嶅悎鏍煎娴嬫煡鐪�",
+ type: "text",
+ clickFun: (row) => {
+ this.getRetestResultInfo(row);
+ },
+ disabled: (row) => {
+ return row.insResult!=0
+ },
+ },
+ {
name: "妫�楠岄」缁戝畾",
type: "text",
clickFun: (row) => {
@@ -592,6 +607,7 @@
},
lookTableLoading: false,
// 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
+ retestVisible: false,
};
},
mounted() {
@@ -928,6 +944,16 @@
this.personList = data;
});
},
+ // 鏌ョ湅涓嶅悎鏍煎娴嬬粨鏋�
+ getRetestResultInfo (row) {
+ getRetestResult({insProductId: row.insProductId}).then(res => {
+ this.retestVisible = true
+ this.retestInfo = res.data
+ })
+ },
+ closeRetestLook () {
+ this.retestVisible = false
+ },
// 缁戝畾妫�楠岄」缁戝畾
getBinding(row) {
this.bindCurrentInfo = row;
diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index 9e063f1..c829dac 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -90,7 +90,7 @@
this.getRetestResult(row);
},
disabled: (row, index) => {
- return row.insResult!==0
+ return row.insResult!=0
}
},
]
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index 46d1445..7308468 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -877,7 +877,8 @@
},
// 瀵煎嚭璁板綍
downLoad() {
- rawAllInsOrderExport({ ...this.entity }).then(res => {
+ const params = { ...this.entity, state: this.tabList[this.tabIndex].value }
+ rawAllInsOrderExport({ ...params }).then(res => {
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '濮旀墭妫�娴嬩俊鎭鍑�.xlsx');
}).catch(err => {
diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue
index 3585646..6d3bc23 100644
--- a/src/views/performance/manHour/workTimeManagement.vue
+++ b/src/views/performance/manHour/workTimeManagement.vue
@@ -42,7 +42,7 @@
</div>
</div>
<div style="display: flex; align-items: center; justify-content: space-between">
- <el-radio-group :key="'111'" v-model="currentTable" size="small">
+ <el-radio-group :key="'111'" v-model="currentTable" size="small" @change="searchList">
<el-radio-button label="ValueTable0"> 杈呭姪宸ユ椂 </el-radio-button>
<el-radio-button label="ValueTable1"> 浜ч噺宸ユ椂 </el-radio-button>
</el-radio-group>
@@ -505,10 +505,17 @@
this.getCurrentWeekNumber();
this.collectWorkingHours();
this.selectshiftByUser();
- this.getList();
- this.getList0();
+ this.searchList()
},
methods: {
+ searchList() {
+ if (this.currentTable == 'ValueTable0') {
+ this.getList();
+ } else {
+ this.getList0();
+ }
+ },
+ // 鏌ヨ杈呭姪宸ユ椂鍒楄〃
getList(entity) {
this.tableLoading = true;
let param = {};
@@ -531,6 +538,7 @@
this.tableLoading = false;
});
},
+ // 鏌ヨ浜ч噺宸ユ椂鍒楄〃
getList0(entity) {
this.tableLoading = true;
let param = {};
--
Gitblit v1.9.3