From 8fd9e43b8ae22e64c62afee56c24df682f8c47c9 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 15:57:54 +0800
Subject: [PATCH] 成品下单下载为pdf
---
src/views/business/inspectionTask/index.vue | 628 +++++++++++++++++++-------------------------------------
1 files changed, 216 insertions(+), 412 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 71998c7..206760d 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -89,43 +89,27 @@
</style>
<template>
<div class="ins-order-plan-main">
- <div v-show="activeFace == 0 && state == 0" style="height: 100%">
+ <div style="height: 100%">
<div class="search">
<div class="search_thing">
<div class="search_label">濮旀墭缂栧彿锛�</div>
<div class="search_input">
- <el-input
- v-model="queryParams.entrustCode"
- clearable
- placeholder="璇疯緭鍏�"
- size="small"
- @keyup.enter.native="refreshTable()"
- ></el-input>
+ <el-input v-model="queryParams.entrustCode" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
<div class="search_thing">
<div class="search_label">妫�楠岀姸鎬侊細</div>
<div class="search_input">
- <el-select
- v-model="queryParams.insState"
- size="small"
- style="width: 100%"
- @change="refreshTable()"
- >
- <el-option
- v-for="(a, i) in dict.type.inspection_task_state"
- :key="i"
- :label="a.label"
- :value="a.value"
- ></el-option>
+ <el-select v-model="queryParams.insState" size="small" style="width: 100%" @change="refreshTable()">
+ <el-option v-for="(a, i) in dict.type.inspection_task_state" :key="i" :label="a.label"
+ :value="a.value"></el-option>
</el-select>
</div>
</div>
<div class="search_thing" style="padding-left: 30px">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()"
- >鏌� 璇�</el-button
- >
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
</div>
<div class="center">
@@ -135,22 +119,13 @@
<div style="display: flex; align-items: center">
<span style="font-size: 14px">璇曢獙瀹ょ绫�:</span>
<ul class="tab">
- <li
- v-for="(m, i) in tabList"
- :key="i"
- :class="{ active: i == tabIndex }"
- @click="handleTab(m, i)"
- >
+ <li v-for="(m, i) in tabList" :key="i" :class="{ active: i == tabIndex }" @click="handleTab(m, i)">
{{ m.label.replace("璇曢獙瀹�", "") }}
</li>
</ul>
<div>
- <el-checkbox
- v-model="alone"
- class="view-self-checkbox"
- @change="changeCheckBox"
- ><span>鎴戠殑浠诲姟</span></el-checkbox
- >
+ <el-checkbox v-model="alone" class="view-self-checkbox"
+ @change="changeCheckBox"><span>鎴戠殑浠诲姟</span></el-checkbox>
</div>
</div>
</el-col>
@@ -162,27 +137,18 @@
</el-col>
</el-row>
</div>
- <lims-table
- :tableData="tableData"
- :column="column"
- :page="page"
- :tableLoading="tableLoading"
- :height="'calc(100vh - 300px)'"
- @pagination="pagination"
- key="tableData0"
- ></lims-table>
+ <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
+ :rowClassName="rowClassName" :height="'calc(100vh - 300px)'" @pagination="pagination"
+ key="tableData0"></lims-table>
</div>
</div>
<el-dialog :visible.sync="claimVisible" title="鎻愮ず" width="400px">
鏄惁璁ら濮旀墭缂栧彿<span style="color: #33c130">{{
sampleUserForm.entrustCode
- }}</span
- >鐨勪换鍔�
+ }}</span>鐨勪换鍔�
<span slot="footer" class="dialog-footer">
<el-button @click="claimVisible = false">鍙� 娑�</el-button>
- <el-button :loading="loading" type="primary" @click="confirmClaim"
- >纭� 瀹�</el-button
- >
+ <el-button :loading="loading" type="primary" @click="confirmClaim">纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog :visible.sync="connectVisible" title="妫�楠屼氦鎺�" width="400px">
@@ -191,18 +157,8 @@
<span class="required-span">* </span>浜ゆ帴浜哄憳锛�
</div>
<div class="search_input">
- <el-select
- v-model="connect.connectPerson"
- filterable
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in personList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="connect.connectPerson" filterable placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -212,105 +168,47 @@
<span class="required-span">* </span>璇曢獙瀹わ細
</div>
<div class="search_input">
- <el-select
- v-model="connect.sonLaboratory"
- filterable
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in sonLaboratoryList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="connect.sonLaboratory" filterable placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in sonLaboratoryList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="connectVisible = false">鍙� 娑�</el-button>
- <el-button :loading="loading" type="primary" @click="confirmConnect"
- >纭� 瀹�</el-button
- >
+ <el-button :loading="loading" type="primary" @click="confirmConnect">纭� 瀹�</el-button>
</span>
</el-dialog>
- <div
- v-if="activeFace > 0 && isCopper == null"
- style="width: 100%; height: 100%"
- >
- <!-- <Add :active="activeFace" :currentId="currentId" :examine="examine" /> -->
- </div>
- <div
- v-if="activeFace > 0 && isCopper == 0"
- style="width: 100%; height: 100%"
- >
- <!-- <CustomsInspection
- :active="activeFace"
- :currentId="currentId"
- :customsInspection="customsInspection"
- :isReport="isReport"
- /> -->
- </div>
- <div
- v-if="activeFace > 0 && isCopper == 1"
- style="width: 100%; height: 100%"
- >
- <!-- <CopperOrder :active="activeFace" :currentId="currentId"></CopperOrder> -->
- </div>
- <!--<Inspection
- v-if="state > 0"
- :key="InspectionKey"
- :inspectorList="inspectorList"
- :orderId="orderId"
- :sonLaboratory="sonLaboratory"
- :state="state"
- :typeSource="typeSource"
- @goback="goback"
- @refreshView="refreshView"
- />-->
<el-dialog :visible.sync="dataDialogVisible" title="鏁版嵁鏌ョ湅" width="80%">
<div v-if="dataDialogVisible" style="height: 70vh; overflow-y: auto">
- <lims-table
- :tableData="lookTableData"
- :column="lookColumn"
- :page="lookPage"
- :tableLoading="lookTableLoading"
- :height="'60vh'"
- @pagination="lookPagination"
- key="tableData1"
- ></lims-table>
+ <div>
+ <el-form :model="entity" :inline="true">
+ <el-form-item label="妫�楠岄」" prop="outputWorkTime">
+ <el-input v-model="entity.inspectionItem" clearable size="small"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button size="small" type="primary" @click="getLookList">鏌ヨ</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <lims-table :tableData="lookTableData" :column="lookColumn" :page="lookPage" :tableLoading="lookTableLoading"
+ :height="'60vh'" @pagination="lookPagination" key="tableData1"></lims-table>
</div>
</el-dialog>
- <el-dialog
- :visible.sync="bindDialogVisible"
- title="妫�楠岄」缁戝畾"
- width="600px"
- >
- <div
- slot="title"
- style="
+ <el-dialog :visible.sync="bindDialogVisible" title="妫�楠岄」缁戝畾" width="600px">
+ <div slot="title" style="
display: flex;
align-items: center;
justify-content: space-between;
- "
- >
+ ">
<span>妫�楠岄」缁戝畾</span>
- <el-button
- style="float: right; margin-left: 360px"
- size="small"
- @click="openBindAdd"
- type="primary"
- >
+ <el-button style="float: right; margin-left: 360px" size="small" @click="openBindAdd" type="primary">
鏂板
</el-button>
</div>
- <el-table :data="bindTableData" style="width: 100%" height="70vh">
- <el-table-column
- prop="inspectionItemClass"
- label="妫�楠岄」鍒嗙被"
- width="150"
- >
+ <el-table :data="bindTableData" style="width: 100%" height="70vh" v-loading="bindTableDataLoading"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
+ <el-table-column prop="inspectionItemClass" label="妫�楠岄」鍒嗙被" width="150">
</el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" width="150">
</el-table-column>
@@ -318,30 +216,17 @@
</el-table-column>
<el-table-column label="鎿嶄綔">
<template slot-scope="scope">
- <el-button size="mini" type="text" @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
- <el-dialog
- :visible.sync="bindAddDialogVisible"
- title="閫夋嫨缁戝畾"
- width="600px"
- >
- <el-table
- :data="bindAddTableData"
- style="width: 100%"
- height="60vh"
- @selection-change="handleBindAddSelectionChange"
- >
+ <el-dialog :visible.sync="bindAddDialogVisible" title="閫夋嫨缁戝畾" width="600px">
+ <el-table :data="bindAddTableData" style="width: 100%" height="60vh"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ @selection-change="handleBindAddSelectionChange">
<el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column
- prop="inspectionItemClass"
- label="妫�楠岄」鍒嗙被"
- width="150"
- >
+ <el-table-column prop="inspectionItemClass" label="妫�楠岄」鍒嗙被" width="150">
</el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" width="150">
</el-table-column>
@@ -350,40 +235,31 @@
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="bindAddDialogVisible = false">鍙� 娑�</el-button>
- <el-button :loading="loading" type="primary" @click="bindAdd"
- >缁� 瀹�</el-button
- >
+ <el-button :loading="loading" type="primary" @click="bindAdd">缁� 瀹�</el-button>
</span>
</el-dialog>
- <!-- <un-pass-retest-result
- v-if="retestVisible"
- :retestInfo="retestInfo"
- :retestVisible="retestVisible"
- @closeRetestLook="closeRetestLook"
- ></un-pass-retest-result> -->
<!--浜т笟閾句俊鎭煡鐪�-->
<!-- <ShowInfo
v-if="showInfoDialog"
ref="showInfoDialog"
:showInfoDialog="showInfoDialog"
></ShowInfo> -->
+ <!--淇敼妫�楠屽�煎脊妗�-->
<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>
<script>
-import ValueTable from "@/components/Table/value-table.vue";
-// import Inspection from "../do/b1-inspect-order-plan/Inspection.vue";
-// import CustomsInspection from "../do/b1-material-ins-order/customs-inspection.vue";
import { getYearAndMonthAndDays } from "@/utils/date";
-// import Add from "../do/b1-ins-order/add.vue";
-// import ShowInfo from "../do/b1-material-ins-order/showInfo.vue";
-// import CopperOrder from "../do/b1-material-ins-order/copper-order.vue";
-// import UnPassRetestResult from "../do/b1-material-ins-order/unPassRetestResult.vue";
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 {
- getRetestResult,
claimInsOrderPlan,
upPlanUser2,
upPlanUser,
@@ -396,27 +272,25 @@
selectSampleAndProductByOrderId,
} from "@/api/business/inspectionTask.js";
import { mapGetters } from "vuex";
+import {getRetestResult} from "@/api/business/rawMaterialOrder";
export default {
+ name: 'InspectionTask',
components: {
EditInspectionItem,
- // CopperOrder,
- // ShowInfo,
- ValueTable,
limsTable,
- // Inspection,
- // Add,
- // CustomsInspection,
- // UnPassRetestResult
+ viewManHourDia,
+ UnPassRetestResult
},
dicts: ["urgency_level", "inspection_task_state"],
computed: {
- ...mapGetters(["name", "userId"]),
+ ...mapGetters(["nickName", "userId"]),
},
data() {
return {
InspectionKey: 1,
bindDialogVisible: false,
bindAddDialogVisible: false,
+ bindTableDataLoading: false,
bindTableData: [],
bindAddTableData: [],
chooseBindAddList: [],
@@ -435,85 +309,6 @@
],
active: 1,
tabIndex: 0,
- componentDataDataLook: {
- entity: {
- id: 0,
- orderBy: {
- field: "sampleCode",
- order: "asc",
- },
- },
- isIndex: false,
- showSelect: false,
- select: false,
- do: [
- {
- id: "parent",
- font: "涓嶅悎鏍煎娴嬫煡鐪�",
- type: "text",
- method: "getRetestResult",
- disabFun: (row, index) => {
- return row.insResult != 0;
- },
- },
- {
- id: "parent",
- font: "妫�楠岄」缁戝畾",
- type: "text",
- method: "getBinding",
- disabFun: (row, index) => {
- return (
- this.lookInfo.userName == null ||
- this.lookInfo.insState == 3 ||
- this.lookInfo.insState == 5
- );
- },
- },
- ],
- tagField: {
- insState: {
- select: [],
- },
- insResult: {
- select: [
- {
- value: 1,
- label: "鍚堟牸",
- type: "success",
- },
- {
- value: 0,
- label: "涓嶅悎鏍�",
- type: "danger",
- },
- {
- value: 3,
- label: "涓嶅垽瀹�",
- type: "",
- },
- ],
- },
- },
- selectField: {},
- spanConfig: {
- rows: [
- {
- name: "sampleCode",
- index: 0,
- },
- {
- name: "sample",
- index: 1,
- },
- {
- name: "model",
- index: 6,
- },
- ],
- },
- requiredAdd: [],
- requiredUp: [],
- },
dataDialogVisible: false,
planTotal: 0,
insStateList: [],
@@ -540,7 +335,6 @@
customsInspection: {},
showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪�
isReport: 0,
- retestVisible: false,
retestInfo: [],
isCopper: null,
bindCurrentInfo: {},
@@ -578,14 +372,15 @@
{
label: "濮旀墭缂栧彿",
prop: "entrustCode",
- width: "140px",
+ width: "160px",
dataType: "link",
linkMethod: "selectAllByOne",
},
- { label: "鏍峰搧鍚嶇О", prop: "sample", width: "140px" },
+ { label: "鏍峰搧鍚嶇О", prop: "sample", width: "160px" },
{
label: "涓嬪崟绫诲埆",
prop: "typeSource",
+ width: "100px",
dataType: "tag",
formatData: (params) => {
if (params == 0) {
@@ -601,12 +396,28 @@
prop: "type",
dataType: "tag",
formatData: (params) => {
- return this.urgencyLevel.find((m) => m.value == params).label;
+ if (params == 0) {
+ return '鏅��'
+ } else if (params == 1) {
+ return '浼樺厛'
+ } else {
+ return '绱ф��'
+ }
},
+ formatType: (params) => {
+ if (params == 0) {
+ return 'success'
+ } else if (params == 1) {
+ return 'warning'
+ } else {
+ return 'danger'
+ }
+ }
},
{
label: "妫�楠岀被鍨�",
prop: "orderType",
+ width: "100px",
dataType: "tag",
formatData: (params) => {
return this.orderTypeList.find((m) => m.value == params).label;
@@ -620,11 +431,18 @@
prop: "insState",
dataType: "tag",
formatData: (params) => {
- return this.inspectionTaskState.find((m) => m.value == params)
- .label;
+ if (this.inspectionTaskState.find((m) => m.value == params)) {
+ return this.inspectionTaskState.find((m) => m.value == params).label;
+ } else {
+ return null
+ }
},
formatType: (params) => {
- return this.inspectionTaskState.find((m) => m.value == params).type;
+ if (this.inspectionTaskState.find((m) => m.value == params)) {
+ return this.inspectionTaskState.find((m) => m.value == params).type;
+ } else {
+ return null
+ }
},
},
{ label: "妫�楠屼汉", prop: "userName" },
@@ -652,9 +470,17 @@
this.editInspection(row);
},
disabled: (row) => {
- return (
- row.userName == null || row.insState == 3 || row.insState == 5
- );
+ return (row.userName == null || row.insState == 3 || row.insState == 5) && this.checkPermi(['update:product:onPlan'])
+ },
+ },
+ {
+ name: "鏌ョ湅宸ユ椂",
+ type: "text",
+ clickFun: (row) => {
+ this.viewManHour(row);
+ },
+ showHide: (row) => {
+ return this.checkPermi(['get:working:hours:byOrder'])
},
},
{
@@ -668,7 +494,7 @@
row.userName == null ||
row.insState == 3 ||
row.insState == 5 ||
- (row.userName && !row.userName.includes(this.name))
+ (row.userName && !row.userName.includes(this.nickName))
);
},
},
@@ -683,7 +509,7 @@
row.userName == null ||
row.insState == 5 ||
row.insState == 3 ||
- (row.userName && !row.userName.includes(this.name))
+ (row.userName && !row.userName.includes(this.nickName))
);
},
},
@@ -721,6 +547,10 @@
type: "",
},
],
+ // 鏁版嵁鏌ョ湅鐩稿叧瀛楁---寮�濮�
+ entity: {
+ inspectionItem: "",
+ },
lookTableData: [],
lookColumn: [
{
@@ -744,10 +574,20 @@
prop: "insResult",
dataType: "tag",
formatData: (params) => {
- return this.insResultList.find((m) => m.value == params).label;
+ let obj = this.insResultList.find((m) => m.value == params)
+ if (obj) {
+ return this.insResultList.find((m) => m.value == params).label;
+ } else {
+ return null
+ }
},
formatType: (params) => {
- return this.insResultList.find((m) => m.value == params).type;
+ let obj = this.insResultList.find((m) => m.value == params)
+ if (obj) {
+ return this.insResultList.find((m) => m.value == params).type;
+ } else {
+ return null
+ }
},
},
{
@@ -759,10 +599,10 @@
name: "涓嶅悎鏍煎娴嬫煡鐪�",
type: "text",
clickFun: (row) => {
- this.getRetestResult(row);
+ this.getRetestResultInfo(row);
},
disabled: (row) => {
- return row.insResult != 0;
+ return row.insResult!=0
},
},
{
@@ -788,10 +628,13 @@
current: 0,
},
lookTableLoading: false,
+ // 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
+ retestVisible: false,
};
},
- created() {
+ mounted() {
this.getAuthorizedPerson();
+ this.queryParams.userId = this.userId;
this.currentTime = getYearAndMonthAndDays();
this.getDicts("urgency_level").then((response) => {
this.urgencyLevel = this.dictToValue(response.data);
@@ -799,10 +642,18 @@
this.getDicts("inspection_task_state").then((response) => {
this.inspectionTaskState = this.dictToValue(response.data);
});
+ this.refreshTable();
},
- mounted() {
+ activated() {
+ this.getAuthorizedPerson();
this.queryParams.userId = this.userId;
- // this.getPower();
+ this.currentTime = getYearAndMonthAndDays();
+ this.getDicts("urgency_level").then((response) => {
+ this.urgencyLevel = this.dictToValue(response.data);
+ });
+ this.getDicts("inspection_task_state").then((response) => {
+ this.inspectionTaskState = this.dictToValue(response.data);
+ });
this.refreshTable();
},
methods: {
@@ -829,7 +680,7 @@
},
getLookList() {
this.lookTableLoading = true;
- let param = { id: this.lookInfo.id, ...this.lookPage };
+ let param = { id: this.lookInfo.id, ...this.lookPage, inspectionItem: this.entity.inspectionItem };
delete param.total;
selectSampleAndProductByOrderId({ ...param })
.then((res) => {
@@ -837,6 +688,7 @@
if (res.code === 200) {
this.lookTableData = res.data.records;
this.lookPage.total = res.data.total;
+ this.dataDialogVisible = true;
}
})
.catch((err) => {
@@ -852,61 +704,14 @@
editInspection(row) {
this.$refs.editInspectionItem.showDialog(row.id);
},
- // 鍒锋柊椤甸潰
- refreshView() {
- this.getList();
+ // 鏌ョ湅宸ユ椂
+ viewManHour(row) {
+ this.$refs.viewManHourDia.showDialog(row.id, row.insState);
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
this.lookInfo = row;
this.getLookList();
- this.dataDialogVisible = true;
- },
- // 鏌ョ湅涓嶅悎鏍煎娴嬬粨鏋�
- getRetestResult(row) {
- getRetestResult({ insProductId: row.insProductId }).then((res) => {
- if (res.code == 201) return;
- this.retestVisible = true;
- this.retestInfo = res.data;
- });
- },
- //
- closeRetestLook() {
- this.retestVisible = false;
- },
- // 鏉冮檺鍒嗛厤
- getPower(radio) {
- let power = JSON.parse(sessionStorage.getItem("power"));
- let inspection = false;
- let connect = false;
- let review = false;
- let claim = false;
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == "doInsOrder") {
- inspection = true;
- }
- if (power[i].menuMethod == "upPlanUser") {
- connect = true;
- }
- if (power[i].menuMethod == "verifyPlan") {
- review = true;
- }
- if (power[i].menuMethod == "claimInsOrderPlan") {
- claim = true;
- }
- }
- if (!claim) {
- this.componentData.do.splice(3, 1);
- }
- if (!review) {
- this.componentData.do.splice(2, 1);
- }
- if (!connect) {
- this.componentData.do.splice(1, 1);
- }
- if (!inspection) {
- this.componentData.do.splice(0, 1);
- }
},
changeCheckBox(val) {
this.queryParams.userId = val ? 0 : null;
@@ -923,16 +728,6 @@
this.queryParams.typeSource = this.tabIndex;
this.getList();
},
- // claimFun(row) {
- // if (row) {
- // this.sampleUserForm = {
- // entrustCode: row.entrustCode,
- // insSampleId: row.id,
- // sonLaboratory: row.sonLaboratory,
- // }
- // this.claimVisible = true
- // }
- // },
// 鏌ョ湅浜т笟閾句俊鎭�
openInfoDialog(row) {
this.showInfoDialog = true;
@@ -956,7 +751,7 @@
this.loading = false;
});
},
- changeRowClass({ row, rowIndex }) {
+ rowClassName({ row, rowIndex }) {
if (this.currentTime == row.appointed) {
return "highlight-warning-row-border";
} else if (this.currentTime > row.appointed) {
@@ -964,43 +759,11 @@
}
return "";
},
- onReset() {
- this.searchForm = {
- sampleName: null,
- state: null,
- };
- this.queryParams.insState = null;
- this.queryParams.sampleName = null;
- this.refreshTable();
- },
- onSubmit() {
- this.queryParams.insState = this.searchForm.state;
- this.queryParams.sampleName = this.searchForm.sampleName;
- this.$nextTick(() => {
- this.refreshTable();
- });
- },
handleTab(m, i) {
this.tabIndex = i;
this.queryParams.sonLaboratory = "";
this.refreshTable();
},
- // getLaboratoryDicts() {
- // this.$axios.post(this.$api.enums.selectEnumByCategory, {
- // category: "瀛愬疄楠屽"
- // }).then(res => {
- // this.tabList = res.data.map(ele => {
- // return {
- // label: ele.label,
- // value: ele.value
- // }
- // })
- // if(this.tabList.length>0){
- // this.componentData.entity.sonLaboratory = this.tabList[0].value
- // }
- // this.refreshTable()
- // })
- // },
selectAllByOne(row) {
this.isCopper = row.isCopper;
this.customsInspection = row;
@@ -1008,9 +771,39 @@
this.examine = 1;
this.isReport = 0;
this.currentId = parseInt(row.id);
- },
- playOrder(num) {
- this.activeFace = num;
+ switch (row.isCopper) {
+ case 0:
+ // 鍘熸潗鏂�
+ this.$router.push({
+ path: "/materialOrder/customsInspection", query: {
+ customsInspection: row,
+ active: this.activeFace,
+ currentId: this.currentId,
+ isReport: this.isReport
+ }
+ });
+ break;
+ case null:
+ // 鎴愬搧
+ this.$router.push({
+ path: "/productOrder/add", query: {
+ examine: this.examine,
+ active: this.activeFace,
+ currentId: this.currentId
+ }
+ });
+ break;
+ case 1:
+ // 閾滄潗
+ this.$router.push({
+ path: "/materialOrder/copperOrder", query: {
+ active: this.activeFace,
+ currentId: this.currentId
+ }
+ });
+ break;
+ }
+
},
goback() {
this.state = 0;
@@ -1023,14 +816,24 @@
if (row.userName) {
inspectorList = row.userName.split(",");
}
- if (this.name) {
- inspectorList.push(this.name);
+ if (this.nickName) {
+ inspectorList.push(this.nickName);
}
this.inspectorList = inspectorList;
this.sonLaboratory = row.sonLaboratory;
this.state = 1;
this.typeSource = row.typeSource;
this.orderId = row.id;
+ this.$router.push({
+ path: "/inspectionTask/inspection",
+ query: {
+ inspectorList: this.inspectorList,
+ sonLaboratory: this.sonLaboratory,
+ state: this.state,
+ typeSource: this.typeSource,
+ orderId: this.orderId,
+ },
+ });
},
// 鏌ョ湅妫�楠屾暟鎹�
viewInspectInfo(row) {
@@ -1039,14 +842,24 @@
if (row.userName) {
inspectorList = row.userName.split(",");
}
- if (this.name) {
- inspectorList.push(this.name);
+ if (this.nickName) {
+ inspectorList.push(this.nickName);
}
this.inspectorList = inspectorList;
this.sonLaboratory = row.sonLaboratory;
this.state = 3;
this.typeSource = row.typeSource;
this.orderId = row.id;
+ this.$router.push({
+ path: "/inspectionTask/inspection",
+ query: {
+ inspectorList: this.inspectorList,
+ sonLaboratory: this.sonLaboratory,
+ state: this.state,
+ typeSource: this.typeSource,
+ orderId: this.orderId,
+ },
+ });
},
handleConnect(row) {
this.orderId = row.id;
@@ -1101,12 +914,8 @@
this.loading = false;
});
},
- handleReview(row) {
- this.state = 2;
- this.orderId = row.id;
- },
getAuthorizedPerson() {
- selectUserCondition().then((res) => {
+ selectUserCondition({ type: 1 }).then((res) => {
let data = [];
res.data.forEach((a) => {
data.push({
@@ -1117,15 +926,21 @@
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;
getBindingProductByProductId({ productId: row.insProductId })
.then((res) => {
- if (res.coe == 201) {
- // this.$message.error('鏈粦瀹氭楠岄」')
- return;
- }
// console.log(res)
this.bindTableData = res.data;
this.bindDialogVisible = true;
@@ -1139,10 +954,6 @@
productId: this.bindCurrentInfo.insProductId,
})
.then((res) => {
- if (res.coe == 201) {
- // this.$message.error('鏈粦瀹氭楠岄」')
- return;
- }
// console.log(res)
this.bindAddTableData = res.data;
this.bindAddDialogVisible = true;
@@ -1169,10 +980,6 @@
})
.then((res) => {
this.loading = false;
- if (res.code == 201) {
- this.$message.error("缁戝畾澶辫触");
- return;
- }
this.$message.success("缁戝畾鎴愬姛");
this.bindAddDialogVisible = false;
this.getBinding(this.bindCurrentInfo);
@@ -1187,17 +994,14 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(async () => {
- delProductTreeByProductId({ productId: row.id })
- .then((res) => {
- if (res.coe == 201) {
- // this.$message.error('鏈粦瀹氭楠岄」')
- return;
- }
- this.getBinding(this.bindCurrentInfo);
- })
- .catch((error) => {
- console.error(error);
- });
+ this.bindTableDataLoading = true
+ delProductTreeByProductId({ productId: row.id }).then((res) => {
+ this.bindTableDataLoading = false
+ this.getBinding(this.bindCurrentInfo);
+ }).catch((error) => {
+ this.bindTableDataLoading = false
+ console.error(error);
+ });
});
},
},
--
Gitblit v1.9.3