From dff404a76987de5b632ae635a6dea6c95dc37a4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 四月 2024 16:58:59 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b2-standard.vue | 34 +
src/components/do/b1-ins-order/add.vue | 6
src/components/view/a5-capacity-scope.vue | 4
src/components/do/b1-inspect-order-plan/Inspection.vue | 1612 +++++++++++++++++++++++++++++----------------------------
src/components/view/a7-standard-method.vue | 10
5 files changed, 862 insertions(+), 804 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 1cf0c10..5f39d99 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -301,7 +301,11 @@
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
show-overflow-tooltip></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip></el-table-column>
- <el-table-column prop="method" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="method" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <span>{{scope.row.method.replace('[','').replace(']','').replaceAll('"','')}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="鍗曚环" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="manDay" label="棰勮鏃堕棿(澶�)" width="120" show-overflow-tooltip></el-table-column>
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index c405c31..4bf4d11 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1,826 +1,846 @@
<style scoped>
- .title {
- height: 60px;
- line-height: 60px;
- }
-
- .search {
- width: 100%;
- margin-bottom: 10px;
- background-color: #fff;
- border-radius: 3px;
- }
-
- .search .form-inline {
- padding-top: 20px;
- padding-left: 50px;
- }
-
- .center {
- width: calc(100% - 40px);
- max-height: 580px;
- background-color: #fff;
- border-radius: 3px;
- padding: 20px;
+ .inspection {
+ height: 100%;
overflow-y: auto;
- }
+ }
- .center-box {
- display: flex;
- align-items: center;
- justify-content: center;
- flex-wrap: wrap;
- }
+ .inspection::-webkit-scrollbar {
+ width: 0;
+ }
- .tables {
- margin-bottom: 16px;
- }
+ .title {
+ height: 60px;
+ line-height: 60px;
+ }
- .tables td {
- height: 40px;
- width: 100px;
- text-align: center;
- font-size: 14px;
- }
+ .search {
+ width: 100%;
+ margin-bottom: 10px;
+ background-color: #fff;
+ border-radius: 3px;
+ }
- .content {
- display: flex;
- width: 100%;
- height: 100%;
- align-items: center;
- justify-content: left;
- padding: 5px;
- box-sizing: border-box;
- }
+ .search .form-inline {
+ padding-top: 20px;
+ padding-left: 50px;
+ }
- .content-h-0 {
- justify-content: center;
- }
+ .center {
+ width: calc(100% - 40px);
+ /* max-height: 580px; */
+ background-color: #fff;
+ border-radius: 3px;
+ padding: 20px;
+ overflow: auto;
+ }
- .content-h-1 {
- justify-content: start;
- }
+ .center-box {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-wrap: wrap;
+ }
- .content-h-2 {
- justify-content: end;
- }
+ .tables {
+ margin-bottom: 16px;
+ }
- .content-v-0 {
- align-items: center;
- }
+ .tables td {
+ height: 40px;
+ width: 100px;
+ text-align: center;
+ font-size: 14px;
+ }
- .content-v-1 {
- align-items: start;
- }
+ .content {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ align-items: center;
+ justify-content: left;
+ padding: 5px;
+ box-sizing: border-box;
+ }
- .content-v-2 {
- align-items: end;
- }
+ .content-h-0 {
+ justify-content: center;
+ }
- .table_input {
- width: 100%;
- height: 100%;
- }
+ .content-h-1 {
+ justify-content: start;
+ }
- .collection {
- width: 50px;
- height: 100%;
- margin-left: 5px;
- border-color: transparent;
- background-color: #409eff;
- color: #fff;
- border-radius: 4px;
- font-size: 12px;
- }
+ .content-h-2 {
+ justify-content: end;
+ }
- .collection:active {
- opacity: .7;
- }
+ .content-v-0 {
+ align-items: center;
+ }
+
+ .content-v-1 {
+ align-items: start;
+ }
+
+ .content-v-2 {
+ align-items: end;
+ }
+
+ .table_input {
+ width: 100%;
+ height: 100%;
+ }
+
+ .collection {
+ width: 50px;
+ height: 100%;
+ margin-left: 5px;
+ border-color: transparent;
+ background-color: #409eff;
+ color: #fff;
+ border-radius: 4px;
+ font-size: 12px;
+ }
+
+ .collection:active {
+ opacity: .7;
+ }
</style>
<style>
- .el-form-item__label {
- color: #000;
- }
+ .el-form-item__label {
+ color: #000;
+ }
- .el-drawer__header::before {
- content: "";
- display: inline-block;
- width: 4px;
- height: 30.24px;
- background: #3A7BFA;
- border-radius: 10px;
- margin-left: 32px;
- margin-right: 8.5px;
- }
+ .el-drawer__header::before {
+ content: "";
+ display: inline-block;
+ width: 4px;
+ height: 30.24px;
+ background: #3A7BFA;
+ border-radius: 10px;
+ margin-left: 32px;
+ margin-right: 8.5px;
+ }
- .el-drawer__header {
- color: #303133;
- }
+ .el-drawer__header {
+ color: #303133;
+ }
</style>
<template>
- <div v-loading="loading">
- <el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏</el-col>
- <el-col :span="12" style="text-align: right;">
- <el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
- <el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
+ <div v-loading="loading" class="inspection">
+ <el-row class="title">
+ <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
+ <el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
<el-button size="small" type="primary" @click="submit" v-show="state==1" :loading="submitLoading">鎻愪氦</el-button>
<!-- 澶嶆牳 -->
<el-button size="medium" type="primary" @click="upInsReview(1)" :loading="reviewLoading"
- v-show="state>1">閫氳繃</el-button>
- <el-button size="medium" @click="upInsReview(0)" v-show="state>1">涓嶉�氳繃</el-button>
- <el-button size="small" @click="$emit('goback')">杩斿洖</el-button>
- </el-col>
- </el-row>
- <div class="search">
- <el-form :inline="true" :model="searchForm" class="form-inline" label-width="100px">
- <el-form-item label="濮旀墭缂栧彿:">
- <el-input clearable v-model="insOrder.entrustCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧缂栧彿:">
- <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧鍚嶇О:">
- <el-input clearable v-model="currentSample.sample" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧鏁伴噺:">
- <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="涓嬪彂鏃堕棿:">
- <el-input clearable v-model="insOrder.sendTime" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="绱ф�ョ▼搴�:">
- <el-input clearable v-model="insOrder.typeName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="绾﹀畾鏃堕棿:">
- <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="褰撳墠鏍峰搧浣嶆暟:">
- <el-tag v-if="currentSample.index">{{ `NO.${currentSample.index}` }}</el-tag>
- </el-form-item>
- </el-form>
- </div>
- <div class="center">
- <div class="center-box">
- <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
- <tbody>
- <tr v-for="(m,i) in item.arr" :key="i">
- <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
- :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1" :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
- :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen[n.c]}px;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
- <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`">
- <template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��'">
- <el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
- :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')||state>1"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" />
- <el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea"
- :autosize="{ minRows: 1}" v-model="n.v.v" :disabled="state>1" />
- <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v" :disabled="state>1">
- <el-option label="鏄�" value="鏄�"></el-option>
- <el-option label="鍚�" value="鍚�"></el-option>
- </el-select>
- <span :style="`font-family:${n.v.ff} !important;`"
- v-else-if="getInspectionValueType(n.i) == 4">/</span>
- <el-button type="primary" icon="el-icon-edit" size="mini" circle
- v-if="getInspectionItemType(n.i) == 1" style="border: 0;margin-left: 2px;"
- @click="getSystemValue(n)" :disabled="(n.u != userId && n.u != undefined && n.u != '')||state>1">
- </el-button>
- </template>
- <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='缁撹'">
- <span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
- <span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
- <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
- </template>
+ v-show="state>1">閫氳繃</el-button>
+ <el-button size="medium" @click="upInsReview(0)" v-show="state>1">涓嶉�氳繃</el-button>
+ <el-button size="small" @click="$emit('goback')">杩斿洖</el-button>
+ </el-col>
+ </el-row>
+ <div class="search">
+ <el-form :inline="true" :model="searchForm" class="form-inline" label-width="100px">
+ <el-form-item label="濮旀墭缂栧彿:">
+ <el-input clearable v-model="insOrder.entrustCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ <el-form-item label="鏍峰搧缂栧彿:">
+ <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ <el-form-item label="鏍峰搧鍚嶇О:">
+ <el-input clearable v-model="currentSample.sample" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ <el-form-item label="鏍峰搧鏁伴噺:">
+ <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ <el-form-item label="涓嬪彂鏃堕棿:">
+ <el-input clearable v-model="insOrder.sendTime" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ <el-form-item label="绱ф�ョ▼搴�:">
+ <el-input clearable v-model="insOrder.typeName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ <el-form-item label="绾﹀畾鏃堕棿:">
+ <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ <el-form-item label="褰撳墠鏍峰搧浣嶆暟:">
+ <el-tag v-if="currentSample.index">{{ `NO.${currentSample.index}` }}</el-tag>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="center">
+ <div class="center-box">
+ <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
+ <tbody>
+ <tr v-for="(m,i) in item.arr" :key="i">
+ <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
+ :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1" :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
+ :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen[n.c]}px;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
+ <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`">
+ <template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��'">
+ <el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
+ :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')||state>1"
+ @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" />
+ <el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea"
+ :autosize="{ minRows: 1}" v-model="n.v.v" :disabled="state>1" />
+ <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v"
+ :disabled="state>1">
+ <el-option label="鏄�" value="鏄�"></el-option>
+ <el-option label="鍚�" value="鍚�"></el-option>
+ </el-select>
+ <span :style="`font-family:${n.v.ff} !important;`"
+ v-else-if="getInspectionValueType(n.i) == 4">/</span>
+ <el-button type="primary" icon="el-icon-edit" size="mini" circle
+ v-if="getInspectionItemType(n.i) == 1" style="border: 0;margin-left: 2px;"
+ @click="getSystemValue(n)" :disabled="(n.u != userId && n.u != undefined && n.u != '')||state>1">
+ </el-button>
+ </template>
+ <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='缁撹'">
+ <span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
+ <span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
+ <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
+ </template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='璁惧'">
- <el-select v-model="n.v.v" placeholder="璇烽�夋嫨" @visible-change="e=>getEquipOptions(e,n.i)" :disabled="state>1">
- <el-option
- v-for="item in equipOptions"
- :key="item.value"
- :label="item.label"
- :value="item.label">
+ <el-select v-model="n.v.v" placeholder="璇烽�夋嫨" @visible-change="e=>getEquipOptions(e,n.i)"
+ :disabled="state>1">
+ <el-option v-for="item in equipOptions" :key="item.value" :label="item.label" :value="item.label">
</el-option>
</el-select>
- </template>
- <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <el-drawer title="鏍峰搧鍒囨崲" :visible.sync="sampleVisible" :size="500">
- <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border
- highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
- :current-row-key="currentKey" :row-key="record=>record.index" v-if="sampleVisible">
- <el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
- </el-table-column>
- <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="100px" show-overflow-tooltip></el-table-column>
- <el-table-column prop="model" label="鏍峰搧鍨嬪彿" min-width="100px" show-overflow-tooltip></el-table-column>
- <el-table-column prop="insState" label="妫�娴嬬姸鎬�" width="95px" show-overflow-tooltip>
- <template slot-scope="scope">
- <el-tag v-for="(item, i) in typeList" :key="i" v-if="item.value == scope.row.insState" :type="item.type"
- size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="isLeave" label="鏄惁鐣欐牱" width="95px" show-overflow-tooltip align="center">
- <template slot-scope="scope">
- <span>{{ scope.row.isLeave==0?'鍚�':'鏄�' }}</span>
- </template>
- </el-table-column>
- <!-- 妫�楠屽崟浼氭湁涓�涓槸鍚︽湁閰嶅鏍峰搧瀛楁鎺у埗鏄剧ず -->
- <el-table-column prop="joinModel" label="閰嶅鏍峰搧鍨嬪彿" min-width="130px" show-overflow-tooltip
- v-if="insOrder.mating>0"></el-table-column>
- <el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" min-width="130px" show-overflow-tooltip
- v-if="insOrder.mating>0"></el-table-column>
- <el-table-column prop="joinNum" label="閰嶅鏍峰搧鏁伴噺" min-width="130px" show-overflow-tooltip
- v-if="insOrder.mating>0"></el-table-column>
- </el-table>
- </el-drawer>
- <el-drawer title="浠诲姟鍒囨崲" :visible.sync="taskVisible" :size="500">
- <ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.selectInsOrderPlanList"
- :componentData="componentData" :key="upIndex" />
- </el-drawer>
+ </template>
+ <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <el-drawer title="鏍峰搧鍒囨崲" :visible.sync="sampleVisible" :size="500">
+ <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border
+ highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
+ :current-row-key="currentKey" :row-key="record=>record.index" v-if="sampleVisible">
+ <el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
+ </el-table-column>
+ <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="100px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="model" label="鏍峰搧鍨嬪彿" min-width="100px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="insState" label="妫�娴嬬姸鎬�" width="95px" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-tag v-for="(item, i) in typeList" :key="i" v-if="item.value == scope.row.insState" :type="item.type"
+ size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="isLeave" label="鏄惁鐣欐牱" width="95px" show-overflow-tooltip align="center">
+ <template slot-scope="scope">
+ <span>{{ scope.row.isLeave==0?'鍚�':'鏄�' }}</span>
+ </template>
+ </el-table-column>
+ <!-- 妫�楠屽崟浼氭湁涓�涓槸鍚︽湁閰嶅鏍峰搧瀛楁鎺у埗鏄剧ず -->
+ <el-table-column prop="joinModel" label="閰嶅鏍峰搧鍨嬪彿" min-width="130px" show-overflow-tooltip
+ v-if="insOrder.mating>0"></el-table-column>
+ <el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" min-width="130px" show-overflow-tooltip
+ v-if="insOrder.mating>0"></el-table-column>
+ <el-table-column prop="joinNum" label="閰嶅鏍峰搧鏁伴噺" min-width="130px" show-overflow-tooltip
+ v-if="insOrder.mating>0"></el-table-column>
+ </el-table>
+ </el-drawer>
+ <el-drawer title="浠诲姟鍒囨崲" :visible.sync="taskVisible" :size="500">
+ <ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.selectInsOrderPlanList"
+ :componentData="componentData" :key="upIndex" />
+ </el-drawer>
<el-dialog title="妫�楠屽鏍�" :visible.sync="reviewDia" width="400px">
- <div class="body" style="display: flex;" v-if="reviewDia">
- <div class="search_label" style="width: 120px;"><span class="required-span">* </span>涓嶉�氳繃鍘熷洜锛�</div>
- <div class="search_input">
- <el-input size="small" clearable v-model="noReason" type="textarea" :autosize="{ minRows: 3, maxRows: 5}"></el-input>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="reviewDia = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="handleReviewDia" :loading="reviewLoading">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- </div>
+ <div class="body" style="display: flex;" v-if="reviewDia">
+ <div class="search_label" style="width: 120px;"><span class="required-span">* </span>涓嶉�氳繃鍘熷洜锛�</div>
+ <div class="search_input">
+ <el-input size="small" clearable v-model="noReason" type="textarea"
+ :autosize="{ minRows: 3, maxRows: 5}"></el-input>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="reviewDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="handleReviewDia" :loading="reviewLoading">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
</template>
<script>
- import ValueTable from '../../tool/value-table.vue'
- export default {
- props: ['sonLaboratory', 'orderId','state'],
- components: {
- ValueTable,
- },
- data() {
- return {
- sampleVisible: false,
- taskVisible: false,
- submitLoading:false,
- searchForm: {
- sampleName: null,
- state: null
- },
- id: 0,
- componentData: {
- entity: {
- sonLaboratory: null,
- userId: 0
- },
- isIndex: false,
- showSelect: false,
- select: false,
- selectMethod: 'handleChangeTask',
- sort: false,
- do: [],
- isPage: false,
- linkEvent: {},
- tagField: {
- type: {
- select: []
- },
- insState: {
- select: []
- },
- },
- currentId: '',
- selectField: {},
- requiredAdd: [],
- requiredUp: []
- },
- upIndex: 0,
- insOrder: {},
- sampleProduct: [],
- typeList: [],
- urgentList: [],
- currentSample: {}, //褰撳墠鏍峰搧淇℃伅
- tableList: [],
- loading: false,
- ps: {},
- param: {},
- currentKey: 1,
- comparisonList: [],
- excelMethodList: [],
- equipOptions:[],
- userId: 0,
- reviewLoading:false,
- reviewDia:false,
- noReason:''
- }
- },
- created() {
- this.componentData.entity.sonLaboratory = this.sonLaboratory;
- this.id = this.orderId;
- this.getUserInfo()
- },
- mounted() {
- this.getTypeDicts()
- this.getInsStateDicts()
- this.getComparisonList()
- },
- watch: {
- id(val) {
- this.loading = true
- this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
- id: val,
+ import ValueTable from '../../tool/value-table.vue'
+ export default {
+ props: ['sonLaboratory', 'orderId', 'state'],
+ components: {
+ ValueTable,
+ },
+ data() {
+ return {
+ sampleVisible: false,
+ taskVisible: false,
+ submitLoading: false,
+ searchForm: {
+ sampleName: null,
+ state: null
+ },
+ id: 0,
+ componentData: {
+ entity: {
+ sonLaboratory: null,
+ userId: 0
+ },
+ isIndex: false,
+ showSelect: false,
+ select: false,
+ selectMethod: 'handleChangeTask',
+ sort: false,
+ do: [],
+ isPage: false,
+ linkEvent: {},
+ tagField: {
+ type: {
+ select: []
+ },
+ insState: {
+ select: []
+ },
+ },
+ currentId: '',
+ selectField: {},
+ requiredAdd: [],
+ requiredUp: []
+ },
+ upIndex: 0,
+ insOrder: {},
+ sampleProduct: [],
+ typeList: [],
+ urgentList: [],
+ currentSample: {}, //褰撳墠鏍峰搧淇℃伅
+ tableList: [],
+ loading: false,
+ ps: {},
+ param: {},
+ currentKey: 1,
+ comparisonList: [],
+ excelMethodList: [],
+ equipOptions: [],
+ userId: 0,
+ reviewLoading: false,
+ reviewDia: false,
+ noReason: ''
+ }
+ },
+ created() {
+ this.componentData.entity.sonLaboratory = this.sonLaboratory;
+ this.id = this.orderId;
+ this.getUserInfo()
+ },
+ mounted() {
+ this.getTypeDicts()
+ this.getInsStateDicts()
+ this.getComparisonList()
+ },
+ watch: {
+ id(val) {
+ this.loading = true
+ this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
+ id: val,
laboratory: this.sonLaboratory
- }).then(res => {
- this.insOrder = res.data.insOrder;
- this.urgentList.forEach(m => {
- if (m.value == this.insOrder.type) {
- this.insOrder.typeName = m.label
- }
- })
- this.sampleProduct = res.data.sampleProduct
- this.currentSample = this.sampleProduct[0]
- this.currentSample.insProduct.forEach(a => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue:null,
- insResult: null
- }
- })
- if (this.currentSample.index == undefined) this.currentSample['index'] = 1
- this.loading = false
- this.handleTableData()
- this.componentData.currentId = val;
- this.currentKey = 1;
- })
- }
- },
- methods: {
- handleChangeSample(row, column, event) {
- this.currentSample = row;
- this.param = {}
- this.currentSample.insProduct.forEach(a => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue:null,
- insResult: null
- }
- })
- this.handleTableData()
- this.sampleVisible = false;
- this.currentKey = row.index
- },
- handleChangeTask(row) {
- if (row.length > 0) this.id = row[0].id;
- this.taskVisible = false;
- },
- getTypeDicts() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "绱ф�ョ▼搴�"
- }).then(res => {
- let data = res.data
- data.forEach(ele => {
- if (ele.value === '0') {
- ele.type = 'success'
- } else if (ele.value === '1') {
- ele.type = 'warning'
- } else if (ele.value === '2') {
- ele.type = 'danger'
- }
- })
- this.urgentList = data;
- this.componentData.tagField.type.select = data
- })
- },
- getInsStateDicts() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "妫�楠屼换鍔＄姸鎬�"
- }).then(res => {
- let data = res.data
- data.forEach(ele => {
- //0:寰呮楠� 1:妫�楠屼腑 2:宸叉楠� 3:寰呭鏍� 4:澶嶆牳鏈�氳繃 5:澶嶆牳閫氳繃
- if (['2', '5'].includes(ele.value)) {
- ele.type = 'success'
- } else if (['1', '3'].includes(ele.value)) {
- ele.type = 'warning'
- } else if (['0', '4'].includes(ele.value)) {
- ele.type = 'danger'
- }
- })
- this.typeList = data
- this.componentData.tagField.insState.select = data
- })
- },
- getComparisonList() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "琛ㄦ牸鍧愭爣杞崲"
- }).then(res => {
- let data = res.data
- this.comparisonList = data;
- })
- },
- tableRowClassName({
- row,
- rowIndex
- }) {
- row.index = rowIndex + 1;
- },
- handleTableData() {
- this.excelMethodList = []
- const mySet1 = new Set();
- this.tableList = JSON.parse(JSON.stringify(this.currentSample.insProduct)).filter(m => {
- let num0 = mySet1.size;
- mySet1.add(JSON.stringify({
- inspectionItem: m.inspectionItem,
- templateId: m.templateId
- }))
- let num1 = mySet1.size;
- if (num1 > num0) {
- return m
- }
- })
- this.tableList.forEach(a => {
- let dels = []
- let ids = []
- a.template.forEach(b => {
- if (b.v.ps != undefined && b.v.ps.value === '妫�楠屽瓙椤�') {
- let count = 0
- for (let i in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[i].inspectionItemSubclass === b.v.v && this.currentSample
- .insProduct[i].templateId === a.templateId) {
- ids.push({
- r: b.r,
- id: this.currentSample.insProduct[i].id,
- product: this.currentSample.insProduct[i]
- })
- break
- }
- count++
- }
- if (count === this.currentSample.insProduct.length) {
- dels.push(b)
- }
- }
+ }).then(res => {
+ this.insOrder = res.data.insOrder;
+ this.urgentList.forEach(m => {
+ if (m.value == this.insOrder.type) {
+ this.insOrder.typeName = m.label
+ }
})
- dels.forEach(del => {
- for (let b = 0; b < a.template.length; b++) {
- if (a.template[b].r === del.r) {
- if (a.template[b].v.mc != undefined) {
- if (a.template[b].v.mc.rs != undefined && a.template[b].v.mc.rs > 1) {
- if (a.template[b].r === a.template[b].v.mc.r) {
- a.template[b].r += 1
- a.template[b].v.mc.r += 1
- a.template[b].v.mc.rs -= 1
- continue
- }
- }
- }
- a.template.splice(b, 1)
- b -= 1
- }
- }
- })
- ids.forEach(id => {
- for (let b = 0; b < a.template.length; b++) {
- if (a.template[b].r === id.r) {
- a.template[b].i = id.id
- if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '鍗曚綅') {
- a.template[b].v.v = id.product.unit
- }
- }
- }
- })
- })
- this.tableList.forEach(a => {
- let arrs = []
- let set = new Set()
- let count1 = 0
- let conclusionList = []; //缁撹鍒楄〃
- let finalList = []; //鏈�缁堝�煎垪琛�
- conclusionList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '缁撹')
- finalList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '鏈�缁堝��')
- a.template.forEach(b => {
- if (b.v.ps != undefined && b.v.ps.value === '搴忓彿') {
- count1++
- b.v.v = count1
- }
- if (b.v.ps != undefined && b.v.ps.value === '瑕佹眰鍊�') {
- b.v.v = this.getAsk(b.i)
- }
- if (b.v.ps != undefined && b.v.ps.value === '妫�楠屽��') {
- b.v.v = ''
- b.u = ''
- this.param[b.i].insValue.push(b)
- }
- if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
- b.v.v = ''
- this.param[b.i].comValue.push(b)
- }
- if (b.v.ps!=undefined&&b.v.ps.value==='璁惧'){
- b.v.v = ''
- this.param[b.i].equipValue = b
- }
- if (b.v.ps!=undefined&&b.v.ps.value==='鏈�缁堝��'){
- b.v.v = ''
- if (b.i === undefined) {
- for (var c in this.param) {
- this.param[c].resValue = b
- }
- } else {
- this.param[b.i].resValue = b
- }
- }
- if (b.v.ps!=undefined&&b.v.ps.value==='缁撹'){
- for(var c in this.param){
+ this.sampleProduct = res.data.sampleProduct
+ this.currentSample = this.sampleProduct[0]
+ this.currentSample.insProduct.forEach(a => {
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: null,
+ insResult: null
+ }
+ })
+ if (this.currentSample.index == undefined) this.currentSample['index'] = 1
+ this.loading = false
+ this.handleTableData()
+ this.componentData.currentId = val;
+ this.currentKey = 1;
+ })
+ }
+ },
+ methods: {
+ handleChangeSample(row, column, event) {
+ this.currentSample = row;
+ this.param = {}
+ this.currentSample.insProduct.forEach(a => {
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: null,
+ insResult: null
+ }
+ })
+ this.handleTableData()
+ this.sampleVisible = false;
+ this.currentKey = row.index
+ },
+ handleChangeTask(row) {
+ if (row.length > 0) this.id = row[0].id;
+ this.taskVisible = false;
+ },
+ getTypeDicts() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "绱ф�ョ▼搴�"
+ }).then(res => {
+ let data = res.data
+ data.forEach(ele => {
+ if (ele.value === '0') {
+ ele.type = 'success'
+ } else if (ele.value === '1') {
+ ele.type = 'warning'
+ } else if (ele.value === '2') {
+ ele.type = 'danger'
+ }
+ })
+ this.urgentList = data;
+ this.componentData.tagField.type.select = data
+ })
+ },
+ getInsStateDicts() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "妫�楠屼换鍔＄姸鎬�"
+ }).then(res => {
+ let data = res.data
+ data.forEach(ele => {
+ //0:寰呮楠� 1:妫�楠屼腑 2:宸叉楠� 3:寰呭鏍� 4:澶嶆牳鏈�氳繃 5:澶嶆牳閫氳繃
+ if (['2', '5'].includes(ele.value)) {
+ ele.type = 'success'
+ } else if (['1', '3'].includes(ele.value)) {
+ ele.type = 'warning'
+ } else if (['0', '4'].includes(ele.value)) {
+ ele.type = 'danger'
+ }
+ })
+ this.typeList = data
+ this.componentData.tagField.insState.select = data
+ })
+ },
+ getComparisonList() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "琛ㄦ牸鍧愭爣杞崲"
+ }).then(res => {
+ let data = res.data
+ this.comparisonList = data;
+ })
+ },
+ tableRowClassName({
+ row,
+ rowIndex
+ }) {
+ row.index = rowIndex + 1;
+ },
+ handleTableData() {
+ this.excelMethodList = []
+ const mySet1 = new Set();
+ this.tableList = JSON.parse(JSON.stringify(this.currentSample.insProduct)).filter(m => {
+ let num0 = mySet1.size;
+ mySet1.add(JSON.stringify({
+ template: m.template,
+ templateId: m.templateId
+ }))
+ let num1 = mySet1.size;
+ if (num1 > num0) {
+ return m
+ }
+ })
+ this.tableList.forEach(a => {
+ let dels = []
+ let ids = []
+ a.template.forEach(b => {
+ if (b.v.ps != undefined && b.v.ps.value === '妫�楠岄」') {
+ let count = 0
+ for (let i in this.currentSample.insProduct) {
+ if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample.insProduct[i].inspectionItem === b.v.v) {
+ let count2 = 0
+ for (var c in a.template) {
+ if (a.template[c].r === b.r && a.template[c].v.ps != undefined && a.template[c].v.ps.value === '妫�楠屽瓙椤�') {
+ if(this.currentSample.insProduct[i].inspectionItemSubclass === a.template[c].v.v){
+ ids.push({
+ r: b.r,
+ id: this.currentSample.insProduct[i].id,
+ product: this.currentSample.insProduct[i]
+ })
+ break
+ }
+ }
+ count2++
+ }
+ if (count2 < a.template.length) {
+ break
+ }
+ }
+ count++
+ }
+ if (count === this.currentSample.insProduct.length) {
+ dels.push(b)
+ }
+ }
+ })
+ dels.forEach(del => {
+ for (let b = 0; b < a.template.length; b++) {
+ if (a.template[b].r === del.r) {
+ if (a.template[b].v.mc != undefined) {
+ if (a.template[b].v.mc.rs != undefined && a.template[b].v.mc.rs > 1) {
+ if (a.template[b].r === a.template[b].v.mc.r) {
+ a.template[b].r += 1
+ a.template[b].v.mc.r += 1
+ a.template[b].v.mc.rs -= 1
+ continue
+ }
+ }
+ }
+ a.template.splice(b, 1)
+ b -= 1
+ }
+ }
+ })
+ ids.forEach(id => {
+ for (let b = 0; b < a.template.length; b++) {
+ if (a.template[b].r === id.r) {
+ a.template[b].i = id.id
+ if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '鍗曚綅') {
+ a.template[b].v.v = id.product.unit
+ }
+ }
+ }
+ })
+ })
+ this.tableList.forEach(a => {
+ let arrs = []
+ let set = new Set()
+ let count1 = 0
+ let conclusionList = []; //缁撹鍒楄〃
+ let finalList = []; //鏈�缁堝�煎垪琛�
+ conclusionList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '缁撹')
+ finalList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '鏈�缁堝��')
+ a.template.forEach(b => {
+ if (b.v.ps != undefined && b.v.ps.value === '搴忓彿') {
+ count1++
+ b.v.v = count1
+ }
+ if (b.v.ps != undefined && b.v.ps.value === '瑕佹眰鍊�') {
+ b.v.v = this.getAsk(b.i)
+ }
+ if (b.v.ps != undefined && b.v.ps.value === '妫�楠屽��') {
+ b.v.v = ''
+ b.u = ''
+ this.param[b.i].insValue.push(b)
+ }
+ if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
+ b.v.v = ''
+ this.param[b.i].comValue.push(b)
+ }
+ if (b.v.ps != undefined && b.v.ps.value === '璁惧') {
+ b.v.v = ''
+ this.param[b.i].equipValue = b
+ }
+ if (b.v.ps != undefined && b.v.ps.value === '鏈�缁堝��') {
+ b.v.v = ''
+ if (b.i === undefined) {
+ for (var c in this.param) {
+ this.param[c].resValue = b
+ }
+ } else {
+ this.param[b.i].resValue = b
+ }
+ }
+ if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
+ for (var c in this.param) {
this.param[c].insResult = b
}
- conclusionList.forEach((n,i)=>{
- if(n.r==b.r&&n.c==b.c){
- b.v.f = `(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
+ conclusionList.forEach((n, i) => {
+ if (n.r == b.r && n.c == b.c) {
+ b.v.f =
+ `(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
}
})
- }
- set.add(b.r)
- if (b.v.f) {
- this.excelMethodList.push(b)
- }
- })
- set = Array.sort(set)
- set.forEach(b => {
- let arr = []
- a.template.forEach(c => {
- if (c.r === b) {
- if (arr.length === 0) {
- if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.push(c)
- } else {
- for (let d = 0; d < arr.length; d++) {
- if (c.c < arr[d].c) {
- if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.splice(d, 0, c)
- break
- }
- if (d === arr.length - 1) {
- if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.push(c)
- break
- }
- }
- }
- }
- })
- arrs.push(arr)
- })
- a.arr = arrs
- })
- this.currentSample.insProduct.forEach(a=>{
- try{
- let comValue = JSON.parse(a.insProductResult.comValue)
- for(var i=0;i<comValue.length;i++){
- this.param[a.id].comValue[i].v.v = comValue[i].v
- }
- }catch(e){}
- try{
- let insValue = JSON.parse(a.insProductResult.insValue)
- for(var i=0;i<insValue.length;i++){
- this.param[a.id].insValue[i].v.v = insValue[i].v
- this.param[a.id].insValue[i].u = insValue[i].u
- }
- }catch(e){}
- try{
- this.param[a.id].equipValue.v.v = a.insProductResult.equipValue
- }catch(e){}
- try{
- this.param[a.id].resValue.v.v = a.lastValue
- this.param[a.id].insResult.v.v = a.insResult
- }catch(e){
- }
- })
- this.handleExcelMethod()
- },
- changeInput(m, code) {
- let str = code.split('-')
- let r = str[1]
- let c = str[2]
- let id = str[0]
- let pId = str[3]
- var list = []
- for (let a in this.tableList) {
- if (this.tableList[a].templateId == id) {
- list = this.tableList[a].arr
- break
- }
- }
- this.excelMethodList.forEach(item => {
- if (item.valueList.find(m => m.r == r && m.c == c)) {
- var comValue = {}
- item.valueList.forEach(a => {
- list.forEach(b => {
- if (b[0].r == a.r) {
- b.forEach(c => {
- if (c.c == a.c) {
- if (!isNaN(parseFloat(c.v.v))) {
- var tableCode = ''
- for (var d in this.comparisonList) {
- if (c.c == this.comparisonList[d].value) {
- tableCode = this.comparisonList[d].label
- break
- }
- }
- comValue[(tableCode + (c.r+1))] = parseFloat(c.v.v)
- }
- }
- })
- }
- })
- })
- // console.log('褰撳墠鐨勬柟娉�',item.methodName,item.r,item.c,this.excelMethodList)
- if (item.methodName == '鑷畾涔夋柟娉�' && item.v.ps && item.v.ps.value == '缁撹') {
- if (this.tableList.find(m => m.id == item.i)) {
- let ask = this.tableList.find(m => m.id == item.i).ask.split('&');
- let res = Object.values(comValue)[0]
- let comp = ask.map((m, i) => {
- if (m.includes('=')) {
- return res == m.split('=')[1]
- }
- if (m.includes('鈮�')) {
- return res >= m.split('鈮�')[1]
- }
- if (m.includes('鈮�')) {
- return res <= m.split('鈮�')[1]
- }
- if (m.includes('<')) {
- return res < m.split('<')[1]
- }
- if (m.includes('>')) {
- return res > m.split('>')[1]
- }
- })
- if (comp.every(m => m)) {
- item.v.v = 1
- } else {
- item.v.v = 0
- }
- this.$axios.post(this.$api.insOrderPlan.saveInsContext, this.param, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res=>{
- if(res.code==201){
- this.$message.error('淇濆瓨澶辫触')
- return
- }
- this.$message.success('宸蹭繚瀛�')
- })
- }
- } else {
- let comResult = 0;
- switch (item.methodName) {
- case 'AVERAGE':
- let num = 0
- for (var a in comValue) {
- num += comValue[a]
- }
- comResult = num / Object.keys(comValue).length
- break;
- case 'SUM':
- let sum = 0
- for (var a in comValue) {
- sum += comValue[a]
- }
- comResult = sum
- break;
- default:
+ }
+ set.add(b.r)
+ if (b.v.f) {
+ this.excelMethodList.push(b)
+ }
+ })
+ set = Array.sort(set)
+ set.forEach(b => {
+ let arr = []
+ a.template.forEach(c => {
+ if (c.r === b) {
+ if (arr.length === 0) {
+ if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.push(c)
+ } else {
+ for (let d = 0; d < arr.length; d++) {
+ if (c.c < arr[d].c) {
+ if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.splice(d, 0, c)
+ break
+ }
+ if (d === arr.length - 1) {
+ if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.push(c)
+ break
+ }
+ }
+ }
+ }
+ })
+ arrs.push(arr)
+ })
+ a.arr = arrs
+ })
+ this.currentSample.insProduct.forEach(a => {
+ try {
+ let comValue = JSON.parse(a.insProductResult.comValue)
+ for (var i = 0; i < comValue.length; i++) {
+ this.param[a.id].comValue[i].v.v = comValue[i].v
+ }
+ } catch (e) {}
+ try {
+ let insValue = JSON.parse(a.insProductResult.insValue)
+ for (var i = 0; i < insValue.length; i++) {
+ this.param[a.id].insValue[i].v.v = insValue[i].v
+ this.param[a.id].insValue[i].u = insValue[i].u
+ }
+ } catch (e) {}
+ try {
+ this.param[a.id].equipValue.v.v = a.insProductResult.equipValue
+ } catch (e) {}
+ try {
+ this.param[a.id].resValue.v.v = a.lastValue
+ this.param[a.id].insResult.v.v = a.insResult
+ } catch (e) {}
+ })
+ this.handleExcelMethod()
+ },
+ changeInput(m, code) {
+ let str = code.split('-')
+ let r = str[1]
+ let c = str[2]
+ let id = str[0]
+ let pId = str[3]
+ var list = []
+ for (let a in this.tableList) {
+ if (this.tableList[a].templateId == id) {
+ list = this.tableList[a].arr
+ break
+ }
+ }
+ this.excelMethodList.forEach(item => {
+ if (item.valueList.find(m => m.r == r && m.c == c)) {
+ var comValue = {}
+ item.valueList.forEach(a => {
+ list.forEach(b => {
+ if (b[0].r == a.r) {
+ b.forEach(c => {
+ if (c.c == a.c) {
+ if (!isNaN(parseFloat(c.v.v))) {
+ var tableCode = ''
+ for (var d in this.comparisonList) {
+ if (c.c == this.comparisonList[d].value) {
+ tableCode = this.comparisonList[d].label
+ break
+ }
+ }
+ comValue[(tableCode + (c.r + 1))] = parseFloat(c.v.v)
+ }
+ }
+ })
+ }
+ })
+ })
+ // console.log('褰撳墠鐨勬柟娉�',item.methodName,item.r,item.c,this.excelMethodList)
+ if (item.methodName == '鑷畾涔夋柟娉�' && item.v.ps && item.v.ps.value == '缁撹') {
+ if (this.tableList.find(m => m.id == item.i)) {
+ let ask = this.tableList.find(m => m.id == item.i).ask.split('&');
+ let res = Object.values(comValue)[0]
+ let comp = ask.map((m, i) => {
+ if (m.includes('=')) {
+ return res == m.split('=')[1]
+ }
+ if (m.includes('鈮�')) {
+ return res >= m.split('鈮�')[1]
+ }
+ if (m.includes('鈮�')) {
+ return res <= m.split('鈮�')[1]
+ }
+ if (m.includes('<')) {
+ return res < m.split('<')[1]
+ }
+ if (m.includes('>')) {
+ return res > m.split('>')[1]
+ }
+ })
+ if (comp.every(m => m)) {
+ item.v.v = 1
+ } else {
+ item.v.v = 0
+ }
+ this.$axios.post(this.$api.insOrderPlan.saveInsContext, this.param, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('淇濆瓨澶辫触')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
+ }
+ } else {
+ let comResult = 0;
+ switch (item.methodName) {
+ case 'AVERAGE':
+ let num = 0
+ for (var a in comValue) {
+ num += comValue[a]
+ }
+ comResult = num / Object.keys(comValue).length
+ break;
+ case 'SUM':
+ let sum = 0
+ for (var a in comValue) {
+ sum += comValue[a]
+ }
+ comResult = sum
+ break;
+ default:
let valueList = [];
item.valueList.forEach(a => {
valueList.push({
- name:`${this.comparisonList[a.c].label}${a.r+1}`,
- value:0,
+ name: `${this.comparisonList[a.c].label}${a.r+1}`,
+ value: 0,
})
})
for (var a in comValue) {
valueList.forEach(b => {
- if(b.name==a){
+ if (b.name == a) {
b.value = comValue[a]
}
})
- }
- let str = item.v.f.replace(/=/g,' ');
+ }
+ let str = item.v.f.replace(/=/g, ' ');
valueList.forEach(b => {
- str = str.replace(b.name,b.value)
+ str = str.replace(b.name, b.value)
})
comResult = eval(str)
- break;
- }
- list.forEach(a => {
- if (a[0].r == item.r) {
- for (var b in a) {
- if (a[b].c == item.c) {
- a[b].v.v = parseFloat(comResult.toFixed(2))
- break
- }
- }
- }
- })
- this.changeInput(comResult, `${code.split('-')[0]}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
- }
- }
- })
- },
- handleExcelMethod() {
- if (this.excelMethodList.length > 0) {
- this.excelMethodList.map(item => {
- item.methodName = item.v.f.split('=').length > 1 && item.v.f.split('=')[1].split('(') && item.v.f.split(
- '=')[1].split('(')[0] ? item.v.f.split('=')[1].split('(')[0] : '鑷畾涔夋柟娉�';
- let valueList = [];
- if (item.v.f.includes(':')) {
- valueList = [];
- let r0 = null;
- let c0 = null;
- let r1 = null;
- let c1 = null;
- let mode = item.v.f.split('(')[1].split(')')[0];
- let start = mode.split(':')[0]
- let end = mode.split(':')[1]
- c0 = this.comparisonList.find(j => j.label == start.split('')[0]).value
- r0 = start.split('')[1] - 1
- c1 = this.comparisonList.find(j => j.label == end.split('')[0]).value
- r1 = end.split('')[1] - 1
- for (let i = Number(r0); i <= r1; i++) {
- for (let u = c0; u <= c1; u++) {
- valueList.push({
- r: i,
- c: u
- })
- }
- }
- item.valueList = valueList;
- } else {
- valueList = []
- let regex = /[=\+\-\*\%\(\)\/\s]/g
- let mode = item.v.f.replace(regex, ' ').split(' ');
- mode.filter(m => m&&!Number(m)).forEach(m => {
- let r = m.split('')[1] - 1
- let c = this.comparisonList.find(j => j.label == m.split('')[0]).value
- valueList.push({
- c,
- r
- })
- })
- }
- item.valueList = valueList;
- return item;
- })
- }
- },
- getInspectionValueType(id) {
- for (var a in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[a].id == id) {
- return this.currentSample.insProduct[a].inspectionValueType
- }
- }
- },
- getInspectionItemType(id) {
- for (var a in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[a].id == id) {
- return this.currentSample.insProduct[a].inspectionItemType
- }
- }
- },
- getAsk(id) {
- for (var a in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[a].id == id) {
- return this.currentSample.insProduct[a].ask
- }
- }
- },
- getSystemValue(n) {
- try{
- if(this.param[n.i].equipValue.v.v == null||this.param[n.i].equipValue.v.v == ''){
- this.$message.error('璇峰厛閫夋嫨閲囬泦鐨勮澶�')
- return
- }
- }catch(e){
- this.$message.error('鎵句笉鍒拌澶囧唴瀹�')
- }
- this.$message.error('閲囬泦澶辫触銆愬凡寮�鏀炬墜鍔ㄦ柟寮忋��')
- for (var a in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[a].id == n.i) {
- this.currentSample.insProduct[a].inspectionItemType = 0
- }
- }
- },
- getEquipOptions(e,id){
- if(e){
- let category = this.currentSample.insProduct.find(m=>m.id==id).deviceGroup
- this.$axios.post(this.$api.deviceScope.selectDeviceByCategory, {category}).then(res => {
+ break;
+ }
+ list.forEach(a => {
+ if (a[0].r == item.r) {
+ for (var b in a) {
+ if (a[b].c == item.c) {
+ a[b].v.v = parseFloat(comResult.toFixed(2))
+ break
+ }
+ }
+ }
+ })
+ this.changeInput(comResult, `${code.split('-')[0]}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
+ }
+ }
+ })
+ },
+ handleExcelMethod() {
+ if (this.excelMethodList.length > 0) {
+ this.excelMethodList.map(item => {
+ item.methodName = item.v.f.split('=').length > 1 && item.v.f.split('=')[1].split('(') && item.v.f.split(
+ '=')[1].split('(')[0] ? item.v.f.split('=')[1].split('(')[0] : '鑷畾涔夋柟娉�';
+ let valueList = [];
+ if (item.v.f.includes(':')) {
+ valueList = [];
+ let r0 = null;
+ let c0 = null;
+ let r1 = null;
+ let c1 = null;
+ let mode = item.v.f.split('(')[1].split(')')[0];
+ let start = mode.split(':')[0]
+ let end = mode.split(':')[1]
+ c0 = this.comparisonList.find(j => j.label == start.split('')[0]).value
+ r0 = start.split('')[1] - 1
+ c1 = this.comparisonList.find(j => j.label == end.split('')[0]).value
+ r1 = end.split('')[1] - 1
+ for (let i = Number(r0); i <= r1; i++) {
+ for (let u = c0; u <= c1; u++) {
+ valueList.push({
+ r: i,
+ c: u
+ })
+ }
+ }
+ item.valueList = valueList;
+ } else {
+ valueList = []
+ let regex = /[=\+\-\*\%\(\)\/\s]/g
+ let mode = item.v.f.replace(regex, ' ').split(' ');
+ mode.filter(m => m && !Number(m)).forEach(m => {
+ let r = m.split('')[1] - 1
+ let c = this.comparisonList.find(j => j.label == m.split('')[0]).value
+ valueList.push({
+ c,
+ r
+ })
+ })
+ }
+ item.valueList = valueList;
+ return item;
+ })
+ }
+ },
+ getInspectionValueType(id) {
+ for (var a in this.currentSample.insProduct) {
+ if (this.currentSample.insProduct[a].id == id) {
+ return this.currentSample.insProduct[a].inspectionValueType
+ }
+ }
+ },
+ getInspectionItemType(id) {
+ for (var a in this.currentSample.insProduct) {
+ if (this.currentSample.insProduct[a].id == id) {
+ return this.currentSample.insProduct[a].inspectionItemType
+ }
+ }
+ },
+ getAsk(id) {
+ for (var a in this.currentSample.insProduct) {
+ if (this.currentSample.insProduct[a].id == id) {
+ return this.currentSample.insProduct[a].ask
+ }
+ }
+ },
+ getSystemValue(n) {
+ try {
+ if (this.param[n.i].equipValue.v.v == null || this.param[n.i].equipValue.v.v == '') {
+ this.$message.error('璇峰厛閫夋嫨閲囬泦鐨勮澶�')
+ return
+ }
+ } catch (e) {
+ this.$message.error('鎵句笉鍒拌澶囧唴瀹�')
+ }
+ this.$message.error('閲囬泦澶辫触銆愬凡寮�鏀炬墜鍔ㄦ柟寮忋��')
+ for (var a in this.currentSample.insProduct) {
+ if (this.currentSample.insProduct[a].id == n.i) {
+ this.currentSample.insProduct[a].inspectionItemType = 0
+ }
+ }
+ },
+ getEquipOptions(e, id) {
+ if (e) {
+ let category = this.currentSample.insProduct.find(m => m.id == id).deviceGroup
+ this.$axios.post(this.$api.deviceScope.selectDeviceByCategory, {
+ category
+ }).then(res => {
if (res.code === 200 && res.data) {
- this.equipOptions = res.data.map(m=>{
+ this.equipOptions = res.data.map(m => {
m.value = m.id
m.label = m.deviceName
return m
@@ -831,21 +851,21 @@
})
}
},
- getUserInfo() {
- this.$axios.get(this.$api.user.getUserInfo).then(res => {
- this.userId = res.data.id
- })
- },
+ getUserInfo() {
+ this.$axios.get(this.$api.user.getUserInfo).then(res => {
+ this.userId = res.data.id
+ })
+ },
// 澶嶆牳
- upInsReview(e){
- if(e==1){
+ upInsReview(e) {
+ if (e == 1) {
// 閫氳繃
this.reviewLoading = true;
this.$axios.post(this.$api.insOrderPlan.verifyPlan, {
- orderId:this.orderId,
- type:1,
- laboratory:this.sonLaboratory,
- tell:null
+ orderId: this.orderId,
+ type: 1,
+ laboratory: this.sonLaboratory,
+ tell: null
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -856,19 +876,19 @@
console.error(error)
this.reviewLoading = false;
})
- }else{
+ } else {
// 涓嶉�氳繃
this.reviewDia = true;
}
},
- handleReviewDia(){
- if(this.noReason){
+ handleReviewDia() {
+ if (this.noReason) {
this.reviewLoading = true;
this.$axios.post(this.$api.insOrderPlan.verifyPlan, {
- orderId:this.orderId,
- type:0,
- laboratory:this.sonLaboratory,
- tell:this.noReason
+ orderId: this.orderId,
+ type: 0,
+ laboratory: this.sonLaboratory,
+ tell: this.noReason
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -879,15 +899,15 @@
console.error(error)
this.reviewLoading = false;
})
- }else{
+ } else {
this.$message.error('鏈緭鍏ヤ笉閫氳繃鍘熷洜')
}
},
- submit(){
+ submit() {
this.submitLoading = true;
this.$axios.post(this.$api.insOrderPlan.submitPlan, {
- orderId:this.orderId,
- laboratory:this.sonLaboratory,
+ orderId: this.orderId,
+ laboratory: this.sonLaboratory,
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -899,6 +919,6 @@
this.submitLoading = false;
})
}
- }
-}
+ }
+ }
</script>
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 6dd3bbc..8e820b8 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -190,8 +190,8 @@
unit: {select:[]},
dic:{select:[]},
},
- requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample'],
- requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample']
+ requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample'],
+ requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample']
},
testObjectData: {
entity: {
diff --git a/src/components/view/a7-standard-method.vue b/src/components/view/a7-standard-method.vue
index 9bd74b1..47379a7 100644
--- a/src/components/view/a7-standard-method.vue
+++ b/src/components/view/a7-standard-method.vue
@@ -115,6 +115,16 @@
value: 1,
label: '鏄�'
}]
+ },
+ isUse: {
+ select: [{
+ value: 0,
+ type: 'info',
+ label: '鍚�'
+ }, {
+ value: 1,
+ label: '鏄�'
+ }]
}
},
selectField: {
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 6271490..ce94306 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -130,15 +130,15 @@
<div class="right">
<el-row class="title">
<el-col :span="24" style="font-size: 14px;color: #999;">{{selectTree}}</el-col>
- <!-- <el-col :span="selectTree==''?24:14" style="text-align: right;" v-if="selectTree!=''">
- <el-button size="small" type="primary" @click="addStandardDia = true"
+ <!-- <el-col :span="selectTree==''?24:14" style="text-align: right;" v-if="selectTree!=''"> -->
+ <!-- <el-button size="small" type="primary" @click="addStandardDia = true"
v-if="addStandardMethod">鏂板鏍囧噯</el-button>
<el-button size="small" type="primary" @click="addProductDia = true" v-if="addStandardProduct">鏂板椤圭洰</el-button>
<el-button size="small" @click="delStandardProductByIds" v-if="delStandardProduct">
<i class="el-icon-delete" style="color: #3A7BFA;"></i>
<span style="color: #3A7BFA;">鍒犻櫎</span>
- </el-button>
- </el-col> -->
+ </el-button> -->
+ <!-- </el-col> -->
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
<el-table class="el-table" :data="standardList" style="width: 100%;" height="220px" tooltip-effect="dark"
@@ -186,7 +186,15 @@
<span v-else>{{scope.row.ask}}</span>
</template>
</el-table-column>
- <el-table-column prop="method" label="璇曢獙鏂规硶" width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="method" label="璇曢獙鏂规硶" width="200">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.methodS" size="small" placeholder="璇曢獙鏂规硶"
+ @change="(value)=>upStandardProductListOfMethodS(value,scope.row.id)" v-if="upStandardProduct">
+ <el-option v-for="(a,i) in JSON.parse(scope.row.method)" :key="i" :label="a" :value="a"></el-option>
+ </el-select>
+ <span v-else>{{scope.row.methodS}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="鍗曚环(鍏�)" width="90" show-overflow-tooltip></el-table-column>
<el-table-column prop="manHour" label="宸ユ椂(H)" width="90" show-overflow-tooltip></el-table-column>
@@ -677,6 +685,22 @@
this.$message.success('宸蹭繚瀛�')
})
},
+ upStandardProductListOfMethodS(value, index) {
+ this.$axios.post(this.$api.standardTree.upStandardProductList, {
+ id: index,
+ methodS: value
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('鏈繚瀛�')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
+ },
delStandardMethodByFLSSM(id) {
this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
confirmButtonText: "纭畾",
--
Gitblit v1.9.3