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/views/business/inspectionTask/index.vue | 707 ++++++++++++++++------------------------------------------
1 files changed, 200 insertions(+), 507 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 127d5bb..600e362 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,37 +137,18 @@
</el-col>
</el-row>
</div>
- <!-- <ValueTable
- :key="upIndex"
- ref="insOrderPlan"
- :componentData="componentData"
- :isColumnWidth="true"
- :tableRowClassName="changeRowClass"
- :upUrl="$api.user.updateUser"
- :url="$api.insOrderPlan.selectInsOrderPlanList"
- class="value-table"
- @handleInspection="handleInspection"
- /> -->
- <lims-table
- :tableData="tableData"
- :column="column"
- :page="page"
- :tableLoading="tableLoading"
- :height="'calc(100vh - 290px)'"
- @pagination="pagination"
- ></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">
@@ -201,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>
@@ -222,102 +168,36 @@
<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">
- <ValueTable
- ref="ValueTableDataLook"
- :componentData="componentDataDataLook"
- :rowKey="'insProductId'"
- :url="$api.insOrder.selectSampleAndProductByOrderId"
- />
+ <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-column prop="inspectionItemClass" label="妫�楠岄」鍒嗙被" width="150">
</el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" width="150">
</el-table-column>
@@ -325,30 +205,16 @@
</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"
+ @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>
@@ -357,17 +223,9 @@
</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"
@@ -379,18 +237,10 @@
</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 {
- getRetestResult,
claimInsOrderPlan,
upPlanUser2,
upPlanUser,
@@ -400,23 +250,18 @@
bindingProductTreeByProductId,
delProductTreeByProductId,
selectInsOrderPlanList,
+ selectSampleAndProductByOrderId,
} from "@/api/business/inspectionTask.js";
import { mapGetters } from "vuex";
export default {
+ name: 'InspectionTask',
components: {
EditInspectionItem,
- // CopperOrder,
- // ShowInfo,
- ValueTable,
limsTable,
- // Inspection,
- // Add,
- // CustomsInspection,
- // UnPassRetestResult
},
dicts: ["urgency_level", "inspection_task_state"],
computed: {
- ...mapGetters(["name", "userId"]),
+ ...mapGetters(["nickName", "userId"]),
},
data() {
return {
@@ -441,262 +286,7 @@
],
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,
- componentData: {
- entity: {
- orderBy: {
- field: "entrustCode",
- order: "asc",
- },
- sonLaboratory: null,
- insState: null,
- userId: null,
- typeSource: null,
- },
- isIndex: true,
- showSelect: false,
- select: false,
- init: false,
- needSort: ["createTime", "sendTime", "type", "appointed", "insState"],
- do: [
- {
- id: "",
- font: "鏁版嵁鏌ョ湅",
- type: "text",
- method: "handleDataLook",
- },
- {
- id: "",
- font: "淇敼妫�楠屽��",
- type: "text",
- method: "editInspection",
- disabFun: (row, index) => {
- return (
- row.userName == null || row.insState == 3 || row.insState == 5
- );
- },
- },
- {
- id: "",
- font: "妫�楠�",
- type: "text",
- method: "handleInspection",
- disabFun: (row, index) => {
- return (
- row.userName == null ||
- row.insState == 3 ||
- row.insState == 5 ||
- (row.userName &&
- !row.userName.includes(
- JSON.parse(localStorage.getItem("user")).name
- ))
- );
- },
- },
- {
- id: "",
- font: "浜ゆ帴",
- type: "text",
- method: "handleConnect",
- disabFun: (row, index) => {
- return (
- row.userName == null ||
- row.insState == 5 ||
- row.insState == 3 ||
- (row.userName &&
- !row.userName.includes(
- JSON.parse(localStorage.getItem("user")).name
- ))
- );
- },
- },
- // {
- // font: '浜т笟閾�',
- // type: 'text',
- // method: 'openInfoDialog',
- // disabFun: (row, index) => {
- // return row.typeSource !== 1
- // }
- // },
- // {
- // id: '',
- // font: '璁ら',
- // type: 'text',
- // method: 'claimFun',
- // disabFun: (row, index) => {
- // return row.userName != null || row.checkName!=null
- // }
- // },
- {
- id: "",
- font: "鍘熷璁板綍",
- type: "text",
- method: "viewInspectInfo",
- },
- ],
- linkEvent: {
- entrustCode: {
- method: "selectAllByOne",
- },
- },
- tagField: {
- type: {
- select: [],
- },
- insState: {
- select: [],
- },
- insResult: {
- select: [
- {
- value: 0,
- label: "涓嶅悎鏍�",
- type: "danger",
- },
- {
- value: 1,
- label: "鍚堟牸",
- type: "success",
- },
- {
- value: "",
- label: "鏈嚭缁撴灉",
- type: "info",
- },
- ],
- },
- typeSource: {
- select: [
- {
- value: 0,
- label: "鎴愬搧涓嬪崟",
- type: "info",
- },
- {
- value: 1,
- label: "鍘熸潗鏂欎笅鍗�",
- type: "info",
- },
- {
- value: 2,
- label: "鍘熸潗鏂欎笅鍗�",
- type: "info",
- },
- ],
- },
- orderType: {
- select: [
- {
- value: "Customer-ordered test",
- label: "濮旀墭璇曢獙",
- type: "success",
- effect: "plain",
- },
- {
- value: "鎶芥",
- label: "鎶芥",
- type: "",
- effect: "plain",
- },
- {
- value: "杩涘巶妫�楠�",
- label: "杩涘巶妫�楠�",
- type: "info",
- effect: "plain",
- },
- {
- value: "Quarterly inspection",
- label: "瀛ｅ害妫�楠�",
- type: "warning",
- effect: "plain",
- },
- ],
- },
- },
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- },
- upIndex: 0,
planTotal: 0,
insStateList: [],
state: 0, // 0:鍙拌处椤碉紝1锛氭楠岄〉闈�,2妫�楠岄〉闈�(澶嶆牳)锛岄粯璁や负0,3鏁版嵁鏌ョ湅
@@ -722,7 +312,6 @@
customsInspection: {},
showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪�
isReport: 0,
- retestVisible: false,
retestInfo: [],
isCopper: null,
bindCurrentInfo: {},
@@ -760,14 +349,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) {
@@ -789,6 +379,7 @@
{
label: "妫�楠岀被鍨�",
prop: "orderType",
+ width: "100px",
dataType: "tag",
formatData: (params) => {
return this.orderTypeList.find((m) => m.value == params).label;
@@ -819,7 +410,6 @@
dataType: "action",
fixed: "right",
label: "鎿嶄綔",
- width: "260px",
operation: [
{
name: "鏁版嵁鏌ョ湅",
@@ -851,7 +441,7 @@
row.userName == null ||
row.insState == 3 ||
row.insState == 5 ||
- (row.userName && !row.userName.includes(this.name))
+ (row.userName && !row.userName.includes(this.nickName))
);
},
},
@@ -866,7 +456,7 @@
row.userName == null ||
row.insState == 5 ||
row.insState == 3 ||
- (row.userName && !row.userName.includes(this.name))
+ (row.userName && !row.userName.includes(this.nickName))
);
},
},
@@ -887,6 +477,82 @@
},
tableLoading: false,
queryParams: {},
+ insResultList: [
+ {
+ value: 1,
+ label: "鍚堟牸",
+ type: "success",
+ },
+ {
+ value: 0,
+ label: "涓嶅悎鏍�",
+ type: "danger",
+ },
+ {
+ value: 3,
+ label: "涓嶅垽瀹�",
+ type: "",
+ },
+ ],
+ // 鏁版嵁鏌ョ湅鐩稿叧瀛楁---寮�濮�
+ lookTableData: [],
+ lookColumn: [
+ {
+ label: "鏍峰搧缂栧彿",
+ prop: "sampleCode",
+ width: "140px",
+ mergeCol: true, //鍚堝苟鍒�
+ },
+ { label: "鏍峰搧鍚嶇О", prop: "sample", width: "140px", mergeCol: true },
+ { label: "妫�楠岄」鍒嗙被", prop: "inspectionItemClass" },
+ { label: "妫�楠岄」", prop: "inspectionItem", width: "140px" },
+ { label: "妫�楠屽瓙椤�", prop: "inspectionItemSubclass" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "鏍峰搧鍨嬪彿", prop: "model", mergeCol: true },
+ { label: "鏉′欢", prop: "radius" },
+ { label: "鐢电紗鏍囪瘑", prop: "cableTag" },
+ { label: "璇曢獙瑕佹眰", prop: "tell" },
+ { label: "妫�楠岀粨鏋�", prop: "lastValue" },
+ {
+ label: "缁撴灉鍒ゅ畾",
+ prop: "insResult",
+ dataType: "tag",
+ formatData: (params) => {
+ return this.insResultList.find((m) => m.value == params).label;
+ },
+ formatType: (params) => {
+ return this.insResultList.find((m) => m.value == params).type;
+ },
+ },
+ {
+ dataType: "action",
+ fixed: "right",
+ label: "鎿嶄綔",
+ operation: [
+ {
+ name: "妫�楠岄」缁戝畾",
+ type: "text",
+ clickFun: (row) => {
+ this.getBinding(row);
+ },
+ disabled: (row) => {
+ return (
+ this.lookInfo.userName == null ||
+ this.lookInfo.insState == 3 ||
+ this.lookInfo.insState == 5
+ );
+ },
+ },
+ ],
+ },
+ ],
+ lookPage: {
+ total: 0,
+ size: 10,
+ current: 0,
+ },
+ lookTableLoading: false,
+ // 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
};
},
created() {
@@ -901,7 +567,6 @@
},
mounted() {
this.queryParams.userId = this.userId;
- // this.getPower();
this.refreshTable();
},
methods: {
@@ -926,6 +591,28 @@
this.page.size = limit;
this.getList();
},
+ getLookList() {
+ this.lookTableLoading = true;
+ let param = { id: this.lookInfo.id, ...this.lookPage };
+ delete param.total;
+ selectSampleAndProductByOrderId({ ...param })
+ .then((res) => {
+ this.lookTableLoading = false;
+ if (res.code === 200) {
+ this.lookTableData = res.data.records;
+ this.lookPage.total = res.data.total;
+ this.dataDialogVisible = true;
+ }
+ })
+ .catch((err) => {
+ this.lookTableLoading = false;
+ });
+ },
+ lookPagination({ page, limit }) {
+ this.lookPage.current = page;
+ this.lookPage.size = limit;
+ this.getLookList();
+ },
// 淇敼妫�楠屽��
editInspection(row) {
this.$refs.editInspectionItem.showDialog(row.id);
@@ -937,54 +624,7 @@
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
this.lookInfo = row;
- this.componentDataDataLook.entity.id = row.id;
- 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);
- }
+ this.getLookList();
},
changeCheckBox(val) {
this.queryParams.userId = val ? 0 : null;
@@ -1034,7 +674,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) {
@@ -1086,6 +726,39 @@
this.examine = 1;
this.isReport = 0;
this.currentId = parseInt(row.id);
+ 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;
+ }
+
},
playOrder(num) {
this.activeFace = num;
@@ -1101,14 +774,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) {
@@ -1117,14 +800,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;
@@ -1184,7 +877,7 @@
this.orderId = row.id;
},
getAuthorizedPerson() {
- selectUserCondition().then((res) => {
+ selectUserCondition({ type: 1 }).then((res) => {
let data = [];
res.data.forEach((a) => {
data.push({
--
Gitblit v1.9.3