From 2902cd8d2b36f66ea5162ae91d9a5a51912758fa Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 31 三月 2025 16:04:04 +0800
Subject: [PATCH] Merge branch 'dev_test' into dev
---
src/views/business/materialOrder/customsInspectionView.vue | 8
src/views/business/materialOrder/copperOrder.vue | 6
src/views/business/productOrder/components/addOrder.vue | 8
src/views/business/inspectionReview/index.vue | 6
src/views/business/reportPreparation/index.vue | 6
src/views/business/productOrder/components/addView.vue | 9
src/views/business/materialOrder/copperView.vue | 1799 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/views/business/productOrder/index.vue | 6
src/router/index.js | 49 +
src/views/business/inspectionTask/index.vue | 6
src/views/business/materialOrder/customsInspectionOrder.vue | 8
src/views/business/materialOrder/index.vue | 9
12 files changed, 1,857 insertions(+), 63 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index e2b4cf6..682a3e4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -112,13 +112,25 @@
permissions: ["business:order"],
children: [
{
- // 鍘熸潗鏂欎笅鍗�
- path: "customsInspection",
+ // 鍘熸潗鏂欎笅鍗�-杩涜涓嬪崟
+ path: "customsInspectionOrder",
component: () =>
- import("@/views/business/materialOrder/customsInspection"),
- name: "CustomsInspection",
+ import("@/views/business/materialOrder/customsInspectionOrder"),
+ name: "CustomsInspectionOrder",
meta: {
- title: "鍘熸潗鏂欎笅鍗曡鎯�",
+ title: "杩涜鍘熸潗鏂欎笅鍗�",
+ activeMenu: "/business/materialOrder",
+ keepAlive: true
+ },
+ },
+ {
+ // 鍘熸潗鏂欎笅鍗�-鏌ョ湅璇︽儏
+ path: "customsInspectionView",
+ component: () =>
+ import("@/views/business/materialOrder/customsInspectionView"),
+ name: "CustomsInspectionView",
+ meta: {
+ title: "鏌ョ湅鍘熸潗鏂欎笅鍗曡鎯�",
activeMenu: "/business/materialOrder",
keepAlive: true
},
@@ -128,7 +140,14 @@
path: "copperOrder",
component: () => import("@/views/business/materialOrder/copperOrder"),
name: "CopperOrder",
- meta: { title: "閾滄潗鏂欎笅鍗�", activeMenu: "/business/materialOrder",keepAlive: true },
+ meta: { title: "杩涜閾滄潗鏂欎笅鍗�", activeMenu: "/business/materialOrder",keepAlive: true },
+ },
+ {
+ // 閾滄潗鏂欎笅鍗�-鏌ョ湅璇︽儏
+ path: "copperView",
+ component: () => import("@/views/business/materialOrder/copperView"),
+ name: "CopperView",
+ meta: { title: "鏌ョ湅閾滄潗鏂欎笅鍗曡鎯�", activeMenu: "/business/materialOrder",keepAlive: true },
},
],
},
@@ -140,12 +159,20 @@
permissions: ["business:productOrder"],
children: [
{
- // 鎴愬搧涓嬪崟璇︽儏
- path: "add",
+ // 鏌ョ湅鎴愬搧涓嬪崟璇︽儏
+ path: "addView",
component: () =>
- import("@/views/business/productOrder/components/add.vue"),
- name: "Add",
- meta: { title: "鎴愬搧涓嬪崟璇︽儏", activeMenu: "/business/productOrder",keepAlive: true },
+ import("@/views/business/productOrder/components/addView.vue"),
+ name: "AddView",
+ meta: { title: "鏌ョ湅鎴愬搧涓嬪崟璇︽儏", activeMenu: "/business/productOrder",keepAlive: true },
+ },
+ {
+ // 杩涜涓嬪崟-鎴愬搧涓嬪崟
+ path: "addOrder",
+ component: () =>
+ import("@/views/business/productOrder/components/addOrder.vue"),
+ name: "AddOrder",
+ meta: { title: "杩涜鎴愬搧涓嬪崟", activeMenu: "/business/productOrder",keepAlive: true },
},
],
},
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index 5f85966..567885f 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -315,7 +315,7 @@
case 0:
// 鍘熸潗鏂�
this.$router.push({
- path: "/materialOrder/customsInspection", query: {
+ path: "/materialOrder/customsInspectionView", query: {
customsInspection: row,
active: this.activeFace,
currentId: this.currentId,
@@ -326,7 +326,7 @@
case null:
// 鎴愬搧
this.$router.push({
- path: "/productOrder/add", query: {
+ path: "/productOrder/addView", query: {
examine: this.examine,
active: this.activeFace,
currentId: this.currentId
@@ -336,7 +336,7 @@
case 1:
// 閾滄潗
this.$router.push({
- path: "/materialOrder/copperOrder", query: {
+ path: "/materialOrder/CopperView", query: {
active: this.activeFace,
currentId: this.currentId
}
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 6d01292..29e15e7 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -735,7 +735,7 @@
case 0:
// 鍘熸潗鏂�
this.$router.push({
- path: "/materialOrder/customsInspection", query: {
+ path: "/materialOrder/customsInspectionView", query: {
customsInspection: row,
active: this.activeFace,
currentId: this.currentId,
@@ -746,7 +746,7 @@
case null:
// 鎴愬搧
this.$router.push({
- path: "/productOrder/add", query: {
+ path: "/productOrder/addView", query: {
examine: this.examine,
active: this.activeFace,
currentId: this.currentId
@@ -756,7 +756,7 @@
case 1:
// 閾滄潗
this.$router.push({
- path: "/materialOrder/copperOrder", query: {
+ path: "/materialOrder/CopperView", query: {
active: this.activeFace,
currentId: this.currentId
}
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 3e72596..7613887 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -605,12 +605,6 @@
this.getInfoRow();
},
activated() {
- this.$refs.addObj.resetFields()
- this.addObj.createTime = ''
- this.addObj.id = ''
- this.addObj.updateTime = ''
- this.sampleList = []
- this.productList = []
this.active = this.$route.query.active
this.currentId = this.$route.query.currentId
this.getInfoRow();
diff --git a/src/views/business/materialOrder/copperView.vue b/src/views/business/materialOrder/copperView.vue
new file mode 100644
index 0000000..7a5a8f8
--- /dev/null
+++ b/src/views/business/materialOrder/copperView.vue
@@ -0,0 +1,1799 @@
+<!--閾滃崟涓濅笅鍗�-->
+<template>
+ <div class="app-container">
+ <div class="header">
+ <div>
+ <span>閾滃崟涓濅笅鍗�</span>
+ </div>
+ <div>
+ <el-button v-show="active==1 && addObj.orderType === '杩涘巶妫�楠�'" :loading="noNeedCheckLoad" size="small" type="primary" @click="noNeedCheck">鍏嶆</el-button>
+ <el-button v-show="active==1" :loading="saveLoad" size="small" type="primary" @click="save">鎻愪氦</el-button>
+ <el-button size="small" @click="goBack">
+ <span style="color: #3A7BFA;">杩斿洖</span>
+ </el-button>
+ </div>
+ </div>
+ <div class="container">
+ <div class="search">
+ <el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="90px">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="鏍峰搧鍚嶇О:" prop="sample">
+ <el-input v-model="addObj.sample" readonly size="small" style="width: 208px">
+ <template slot="append"><el-button slot="append" :disabled="active>1" icon="el-icon-search"
+ @click="selectStandardTree = true"></el-button></template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="鍒拌揣鏁伴噺:" prop="qtyArrived" required>
+ <el-input v-model="addObj.qtyArrived" :disabled="active > 1" class="addObj-info"
+ clearable placeholder="" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="鍗曚綅:" prop="buyUnitMeas">
+ <el-input v-model="addObj.buyUnitMeas" :disabled="active > 1" clearable class="addObj-info" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="鎵规鍙�:" prop="updateBatchNo">
+ <el-input v-model="addObj.updateBatchNo" :disabled="active > 1" class="addObj-info" clearable size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="妫�楠岀被鍨�:">
+ <el-select v-model="addObj.orderType" clearable disabled size="small" style="width: 100%">
+ <el-option v-for="(a, ai) in dict.type.check_type" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="绾﹀畾鏃堕棿:" prop="appointed">
+ <el-date-picker
+ v-model="addObj.appointed"
+ :disabled="active > 1"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ size="small"
+ style="width: 100%"
+ type="date"
+ value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="鏉愭枡鍘傚:" prop="supplierName">
+ <el-input v-model="addObj.supplierName" :disabled="active > 1" class="addObj-info" clearable placeholder="" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="鎶芥鏁伴噺:" prop="testQuantity">
+ <el-input v-model="addObj.testQuantity" :disabled="active > 1" class="addObj-info" clearable placeholder="" size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="瑙勬牸鍨嬪彿:" placeholder="璇峰～鍐�" prop="partDetail">
+ <el-tooltip :content="addObj.partDetail" :disabled="!addObj.partDetail">
+ <el-input v-model="addObj.partDetail" :disabled="active > 1" clearable class="addObj-info" size="small"></el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="鍒拌揣鏃堕棿:" prop="declareDate">
+ <el-date-picker
+ v-model="addObj.declareDate"
+ :disabled="active > 1"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ size="small"
+ style="width: 100%"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="addObj-form-item" label="澶囨敞:">
+ <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :placeholder="active>1 ? '' : '璇疯緭鍏�'" :disabled="active>1" clearable
+ size="small" type="textarea"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ <div style="display: flex;justify-content: space-between;background-color: #F5F7FB;margin-bottom: 6px">
+ <div v-if="active==1">
+ <el-form :inline="true" :model="addObj1" label-width="90px">
+ <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px;margin-top: 6px">
+ <el-select v-model="model" :placeholder="active>1 ? '' : '璇疯緭鍏�'"
+ allow-create clearable default-first-option filterable
+ size="small"
+ @change="changeModel">
+ <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="妫�楠屾爣鍑�:" style="margin-bottom: 6px;margin-top: 6px">
+ <el-select v-model="standardMethodListId" :loading="methodLoad"
+ :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"
+ @change="changeStandardMethodListId" @focus="methodFocus">
+ <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div style="margin-bottom: 6px;margin-top: 6px">
+ <el-button v-show="active==1" :disabled="sampleList.length === 3" size="small" type="primary" @click="handleSplitCountNum">鎷嗗垎</el-button>
+ </div>
+ </div>
+ <div style="height: auto;">
+ <el-table ref="sampleTable" :data="sampleList" class="el-table sampleTable" highlight-current-row
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
+ <el-table-column v-if="active==1" :selectable="selectable" type="selection" width="60"></el-table-column>
+ <el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
+ <el-table-column align="center" label="鏍峰搧鍚嶇О" min-width="100" prop="sample">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.sample" :readonly="active>1" clearable size="small"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鏍峰搧缂栧彿" min-width="140" prop="sampleCode">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.sampleCode" :readonly="active>1" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
+ size="small"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鏍峰搧鍨嬪彿" min-width="100" prop="model">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.model" :disabled="active>1" allow-create default-first-option filterable
+ placeholder="鏍峰搧鍨嬪彿" size="small" style="width: 100%;" @change="handleChangeModel">
+ <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="!(active>1)" align="center" label="鍨嬪彿鍙傛暟" prop="modelNum" width="130">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.modelNum" :disabled="active>1|| scope.$index !== 0" clearable placeholder="闈炲繀濉�"
+ size="small"
+ @input="methodChange(scope.row.standardMethodListId, scope.row)"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="妫�楠屾爣鍑�" min-width="100" prop="standardMethodListId">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1 || scope.$index !== 0"
+ :loading="methodLoad" :readonly="active>1" clearable placeholder="妫�楠屾爣鍑�"
+ size="small" style="width: 100%;" @change="(value)=>methodChange(value, scope.row)" @clear="productList = []" @focus="methodFocus">
+ <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="addObj.mating==1" align="center" label="閰嶅鏍峰搧鍚嶇О" prop="joinName" width="140">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.joinName" :autosize="{ minRows: 1, maxRows: 1}" size="small"
+ type="textarea"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="addObj.mating==1" align="center" label="閰嶅鏍峰搧鍨嬪彿" prop="joinModel" width="140">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.joinModel" :autosize="{ minRows: 1, maxRows: 1}" size="small"
+ type="textarea"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="addObj.mating==1" align="center" label="閰嶅鏍峰搧鏁伴噺" prop="joinNum" width="140">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.joinNum" :controls="false" :max="100" :min="1" :precision="0"
+ size="small" style="width: 80%;"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="寰呮椤规暟閲�" prop="quantity" width="105"></el-table-column>
+ </el-table>
+ <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" class="el-table"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
+ @select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
+ <el-table-column v-if="active==1" :selectable="selectable" type="selection" width="65"></el-table-column>
+ <el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column>
+ <el-table-column label="妫�楠岄」" min-width="140" prop="inspectionItem" show-overflow-tooltip>
+ <template slot="header" slot-scope="scope">
+ <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
+ <span>妫�楠岄」</span>
+ <el-input
+ v-if="active==1"
+ v-model="inspectionItem"
+ placeholder="璇疯緭鍏�"
+ size="mini"
+ @input="searchFilterList"/>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="妫�楠岄」瀛愰」" min-width="140" prop="inspectionItemSubclass"
+ show-overflow-tooltip>
+ <template slot="header" slot-scope="scope">
+ <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
+ <span>妫�楠岄」瀛愰」</span>
+ <el-input
+ v-if="active==1"
+ v-model="inspectionItemSubclass"
+ placeholder="璇疯緭鍏�"
+ size="mini"
+ @input="searchFilterList"/>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="瑕佹眰鍊�" min-width="220px" prop="ask">
+ <template slot-scope="scope">
+ <el-input v-if="active==1&&isAskOnlyRead&&scope.row.inspectionValueType!='5'" v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鍊�"
+ size="small" type="textarea"
+ @change="e=>requestChange(e,scope.row,'ask')"></el-input>
+ <span v-else>
+ <!-- <template v-if="(scope.row.ask.indexOf('D')>-1
+ ||scope.row.ask.indexOf('W')>-1
+ ||scope.row.ask.indexOf('X')>-1
+ ||scope.row.ask.indexOf('RTS')>-1
+ ||scope.row.ask.indexOf('H')>-1
+ ||scope.row.ask.indexOf('L')>-1)&&active==1">
+ <input class="askRts" v-model="scope.row.rts" /><br />{{ scope.row.ask }}
+ </template>
+ <template v-else>{{ scope.row.ask }}</template> -->
+ <template >{{ scope.row.ask }}</template>
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="瑕佹眰鎻忚堪" min-width="220px" prop="tell">
+ <template slot-scope="scope">
+ <el-input v-if="active==1&&isAskOnlyRead" v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鎻忚堪"
+ size="small" type="textarea"
+ @change="e=>requestChange(e,scope.row,'tell')"></el-input>
+ <span v-else>
+ <template >{{ scope.row.tell }}</template>
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
+ <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
+ <template slot="header" slot-scope="scope">
+ <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
+ <span>璇曢獙鏂规硶</span>
+ <el-input
+ v-if="active==1"
+ v-model="methodS"
+ placeholder="璇疯緭鍏�"
+ size="mini"
+ @input="searchFilterList"/>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="璁￠噺鍗曚綅" prop="unit" show-overflow-tooltip width="100"></el-table-column>
+ <el-table-column label="鍗曚环" prop="price" show-overflow-tooltip width="100"></el-table-column>
+ <!-- <el-table-column prop="manDay" label="棰勮鏃堕棿(澶�)" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="100" show-overflow-tooltip></el-table-column> -->
+ <!-- <el-table-column prop="deviceGroup" label="璁惧缁�" width="120" show-overflow-tooltip></el-table-column> -->
+ <el-table-column label="鍖洪棿" min-width="120" prop="section" show-overflow-tooltip></el-table-column>
+ <el-table-column :filter-method="filterHandler" :filters="filters" label="瀛愬疄楠屽" min-width="130" prop="sonLaboratory"
+ show-overflow-tooltip></el-table-column>
+ </el-table>
+ </div>
+ </div>
+ <el-dialog :visible.sync="selectStandardTree" title="閫夋嫨鏍峰搧" width="500px">
+ <div v-if="selectStandardTree" v-loading="selectStandardTreeLoading" class="body" style="height: 60vh;overflow-y: auto;user-select: none;">
+ <el-row>
+ <el-col :span="24">
+ <el-input v-model="search" clearable placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�" size="small"
+ style="margin-bottom: 5px;" suffix-icon="el-icon-search" @blur="searchFilter" @clear="searchFilter"
+ @keyup.enter.native="searchFilter"></el-input>
+ </el-col>
+ </el-row>
+ <el-tree ref="tree" :data="list" :default-expanded-keys="expandedKeys" :filter-node-method="filterNode"
+ :props="{ children: 'children', label: 'label' }" highlight-current node-key="label" @node-click="handleNodeClick"
+ @node-expand="nodeOpen" @node-collapse="nodeClose" @dblclick.native="activeStandardTree">
+ <div slot-scope="{ node, data }" class="custom-tree-node">
+ <el-row>
+ <el-col :span="24">
+ <span><i
+ :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
+ {{ data.code }} {{ data.label }}</span>
+ </el-col>
+ </el-row>
+ </div>
+ </el-tree>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="selectStandardTree = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="activeStandardTree">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <!--鐗规畩鍊煎鐞嗘-->
+ <el-dialog :before-close="beforeClose" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"
+ :visible.sync="bsm1DiaAll"
+ min-width="400px"
+ title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨">
+ <div v-for="(item, index) in bsm1DiaList" :key="item.id" class="body" style="max-height: 60vh;">
+ <span>{{item.inspectionItem}}</span>
+ <el-row v-if="item.bsm1">
+ <el-col :span="24" class="search_thing" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;"><span class="required-span">* </span>閫夐」锛�</div>
+ <div class="search_input">
+ <el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
+ <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ <el-col :span="24" class="search_thing" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;">瑕佹眰鍊硷細</div>
+ <div class="search_input">
+ <el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
+ <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai"
+ :label="a">{{JSON.parse(item.bsmRow.askCopy)[ai]}}</el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button :loading="saveLoad" type="primary" @click="save1">纭� 瀹�</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
+ :show-close="false" :visible.sync="bsm3Dia"
+ title="鍖洪棿鍊煎～鍐�" width="800px">
+ <el-table
+ :data="editTable"
+ height="80vh" style="width: 100%">
+ <!-- inspectionItemList -->
+ <el-table-column
+ label="妫�楠岄」"
+ prop="inspectionItemList"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ label="鏍峰搧缂栧彿"
+ prop="sampleCode"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ label="鏍峰搧鍨嬪彿"
+ prop="model"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ label="璇嗗埆绗﹀彿"
+ prop="symbolItem">
+ </el-table-column>
+ <el-table-column
+ label="璇嗗埆绗﹀��"
+ prop="value">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" size="small" @input="inputValueHandler(scope.row,scope.$index)"></el-input>
+ </template>
+ </el-table-column>
+ </el-table>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="bsm3Dia=false">鍙� 娑�</el-button>
+ <el-button :loading="saveLoad" type="primary" @click="save0">纭� 瀹�</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
+ <el-dialog
+ :visible.sync="noNeedCheckDia"
+ title="鍏嶆鎻愮ず"
+ width="32%">
+ <span>纭鍏嶆褰撳墠妫�楠屽崟锛�</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button :loading="noNeedCheckLoad" @click="noNeedCheckDia = false">鍙� 娑�</el-button>
+ <el-button :loading="noNeedCheckLoad" type="primary" @click="handleNoNeedCheck">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import {
+ addRawCopperOrder,
+ getInsOrder,
+ getUserNow,
+ addRawCopperOrderExemptionOrder,
+ selectStandardTreeList2,
+ selectsStandardMethodByFLSSM,
+ selectInsOrderTemplate,
+ selectStandardProductList,
+ selectStandardMethodEnum
+} from "@/api/business/rawMaterialOrder";
+
+var validateSixDecimalPositives = (rule, value, callback) => {
+ if (value == 0 || value == null) {
+ callback(new Error('璇疯緭鍏ユ纭殑鏁板瓧鎴栧皬鏁�'))
+ } else if (!/^[0-9]+.?[0-9]*$/.test(value)) {
+ callback(new Error('璇疯緭鍏ユ暟瀛楁垨灏忔暟'))
+ } else {
+ callback()
+ }
+}
+
+export default {
+ name: 'CopperView',
+ components: {},
+ dicts: ['check_type', 'urgency_level'],
+ data() {
+ return {
+ active: '',
+ currentId: '',
+ sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
+ editTable:[],
+ noNeedCheckLoad: false, // 鍏嶆鎸夐挳loading
+ template: null,
+ templates: [],
+ addObj: {
+ testQuantity: null, // 鎶芥鏁伴噺
+ custom: null,
+ company: null,
+ userId: null,
+ companyId: '',
+ type: '0', // 绱ф�ョ▼搴�
+ code: null,
+ remark: null, // 澶囨敞
+ mating: 0,
+ sample: null, // 鏍峰搧鍚嶇О
+ appointed: '', // 绾﹀畾鏃堕棿
+ buyUnitMeas: null, // 鍗曚綅
+ updateBatchNo: null, // 鎵规鍙�
+ partDetail: null, // 瑙勬牸鍨嬪彿
+ declareDate: '', // 鍒拌揣鏃堕棿
+ factory: null,
+ laboratory: null,
+ sampleType: null,
+ sampleNum: 1,
+ unit: null,
+ model: null,
+ method: null,
+ phone: null,
+ processing: 1,
+ isLeave: 0,
+ orderType: '杩涘巶妫�楠�', // 妫�楠岀被鍨�
+ supplierName: null, // 鏉愭枡鍘傚
+ qtyArrived: null, // 鍒拌揣鏁伴噺
+ },
+ sample: {
+ sampleCode: null,
+ laboratory: null,
+ factory: null,
+ sampleType: null,
+ sample: null,
+ model: null,
+ modelNum: null,
+ sampleNum: 1,
+ isLeave: 0,
+ unit: null
+ },
+ selectStandardTree: false,
+ search: null,
+ list: [],
+ selectStandardTreeLoading: false,
+ selectTree: null,
+ expandedKeys: [],
+ sampleList: [],
+ sampleIds: [],
+ methodList: [],
+ addSampleDia: false,
+ count: 1,
+ productList: [],
+ productList0: [],
+ bsm1DiaList: [],
+ productIds: [],
+ productListSelected: [],
+ getProductLoad: false,
+ saveLoad: false,
+ templateDia: false,
+ templateLoading: false,
+ templateName: '',
+ upLoad: false,
+ units: [],
+ models: [],
+ methods: [],
+ methodLoad: false,
+ filters: [],
+ currentMethod: null,
+ isAskOnlyRead: false,
+ sampleId: null,
+ bsmRow: null,
+ bsm1: false,
+ bsm1Val: null,
+ bsm1DiaAll: false,
+ bsm2: false,
+ bsm2Val: null,
+ bsm2Dia: false,
+ bsmRow3: null,
+ bsm3Val: null,
+ bsm3Dia: false,
+ // total: 0,
+ RTS: '',
+ totalArr: [],
+ addObj1: {},
+ model: null,
+ standardMethodListId: null,
+ symbolList:['RTS'],
+ inspectionItem:null,
+ inspectionItemSubclass:null,
+ methodS:null,
+ isBsm2Val2:false,
+ isShowInput: false,
+ temId: '',
+ selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
+ addObjRules: { // 琛ㄥ崟鏍￠獙瑙勫垯
+ sample: [
+ { required: true, message: '璇烽�夋嫨鏍峰搧', trigger: 'change' }
+ ],
+ qtyArrived: [
+ { validator: validateSixDecimalPositives, trigger: 'blur' }
+ ],
+ testQuantity: [
+ { required: true, message: '璇峰～鍐欐娊妫�鏁伴噺', trigger: 'blur' }
+ ],
+ supplierName: [
+ { required: true, message: '璇峰～鍐欐潗鏂欏巶瀹�', trigger: 'blur' }
+ ],
+ appointed: [
+ { required: true, message: '璇烽�夋嫨绾﹀畾鏃堕棿', trigger: 'change' }
+ ],
+ buyUnitMeas: [
+ { required: true, message: '璇峰～鍐欏崟浣�', trigger: 'blur' }
+ ],
+ updateBatchNo: [
+ { required: true, message: '璇峰～鍐欐壒娆″彿', trigger: 'blur' }
+ ],
+ partDetail: [
+ { required: true, message: '璇峰～鍐欒鏍煎瀷鍙�', trigger: 'blur' }
+ ],
+ declareDate: [
+ { required: true, message: '璇峰～鍐欏埌璐ф椂闂�', trigger: 'change' }
+ ]
+ },
+ noNeedCheckDia: false,
+ }
+ },
+ watch: {
+ sampleList() {
+ this.addObj.method = null
+ this.productList = []
+ },
+ productList: {
+ deep: true,
+ handler(val) {
+ if (val && val.length > 0) {
+ let arr = [];
+ val.forEach(item => {
+ if (item.sonLaboratory && !arr.find(a => a.value == item.sonLaboratory)) {
+ arr.push({
+ text: item.sonLaboratory,
+ value: item.sonLaboratory
+ })
+ }
+ })
+ this.filters = arr
+ }
+ }
+ },
+ sampleList: {
+ deep: true,
+ handler(val) {
+ this.getTotal()
+ }
+ },
+ 'addObj.sample'(val) {
+ this.model = null
+ this.standardMethodListId = null
+ },
+ 'addObj.sampleNum'(val) {
+ this.model = null
+ this.standardMethodListId = null
+ }
+ },
+ mounted() {
+ this.active = this.$route.query.active
+ this.currentId = this.$route.query.currentId
+ this.getInfoRow();
+ },
+ activated() {
+ this.active = this.$route.query.active
+ this.currentId = this.$route.query.currentId
+ this.getInfoRow();
+ },
+ methods: {
+ getInfoRow() {
+ this.getUserNowInfo()
+ this.selectStandardTreeList()
+ this.selectStandardMethods()
+ this.getInfo() // 鑾峰彇鏁版嵁
+ },
+ // 鎷嗗垎
+ handleSplitCountNum () {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ // 涓ゆ潯鏁版嵁淇濇寔涓�鑷�
+ this.sample.sample = this.sampleList[0].sample
+ this.sample.model = this.sampleList[0].model
+ this.sample.unit = this.sampleList[0].unit
+ this.sample.modelNum = this.sampleList[0].modelNum
+ this.sample.standardMethodListId = this.sampleList[0].standardMethodListId
+ this.sample.insProduct = []
+ this.sample.id = this.count
+ this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
+ this.sampleList.push(this.HaveJson(this.sample))
+ this.sampleList.forEach(item => {
+ item.quantity = 1
+ })
+ this.count++
+ },
+ noNeedCheck () {
+ this.$refs['addObj'].validate((valid) => {
+ if (valid) {
+ if (!this.sampleList.every(m => m.standardMethodListId)) {
+ this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
+ return
+ }
+ // 妫�楠岀被鍨嬩负杩涘巶妫�楠屾椂鍙�夋嫨鍏嶆锛屼絾涓嶈兘閫夋嫨妫�楠岄」
+ const sampleList = this.HaveJson(this.sampleList)
+ sampleList.forEach(item => {
+ item.insProduct = this.productList
+ })
+ this.getTotal(sampleList)
+ let projectNum = this.totalArr.filter(a => a.state == 1).length
+ if (projectNum!=0){
+ this.$message.error('鍏嶆涓嶅彲閫夋嫨妫�楠岄」')
+ return
+ }
+ this.noNeedCheckDia = true
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ handleNoNeedCheck () {
+ const sampleList = this.HaveJson(this.sampleList)
+ sampleList.forEach(item => {
+ item.insProduct = this.productList
+ })
+ this.getTotal(sampleList)
+ let projectNum = this.totalArr.filter(a => a.state == 1).length
+ if (projectNum!=0){
+ this.$message.error('鍏嶆涓嶅彲閫夋嫨妫�楠岄」')
+ } else {
+ let trees = this.selectTree.split(" - ")
+ if (trees.length < 3) {
+ this.$message.error('鏈�夋嫨瀵硅薄')
+ return
+ }
+ this.addObj.factory = trees[0]
+ this.addObj.laboratory = trees[1]
+ this.addObj.sampleType = trees[2]
+ if (trees[3] === undefined || trees[3] === '') {
+ this.addObj.sample = trees[2]
+ } else {
+ this.addObj.sample = trees[3]
+ }
+ this.addObj.model = (trees[4] == undefined ? null : trees[4])
+ this.noNeedCheckLoad = true
+ addRawCopperOrderExemptionOrder({
+ copperInsOrder: this.addObj,
+ sampleList: sampleList.map(a => {
+ if (a.insProduct.length > 0) {
+ a.insProduct.forEach(c => {
+ delete c.id
+ })
+ }
+ if (a.modelNum) {
+ // 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
+ // 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
+ } else {
+ a.model = a.modelNum + a.model
+ }
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
+ a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ return a
+ })
+ }).then(res => {
+ this.noNeedCheckLoad = false
+ this.$message.success('宸叉彁浜�')
+ this.closeOpenPage()
+ }).catch(e=>{
+ this.noNeedCheckLoad = false
+ })
+ }
+ },
+ // 鑾峰彇鏁版嵁
+ getInfo () {
+ if (this.active != 1) {
+ // 鏌ョ湅娴佺▼
+ // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
+ getInsOrder({orderId: this.currentId}).then(res => {
+ this.addObj = {
+ ...res.data.insOrder
+ }
+ this.$set(this.addObj, 'qtyArrived', res.data.insOrderTemplate.qtyArrived)
+ this.$set(this.addObj, 'buyUnitMeas', res.data.insOrderTemplate.buyUnitMeas)
+ this.$set(this.addObj, 'updateBatchNo', res.data.insOrderTemplate.updateBatchNo)
+ this.$set(this.addObj, 'supplierName', res.data.insOrderTemplate.supplierName)
+ this.addObj.type = String(this.addObj.type)
+ this.sampleList = this.HaveJson(res.data.sampleProduct);
+ this.getProNum()
+ this.addObj.sampleNum = this.sampleList.length
+ this.$nextTick(() => {
+ this.$refs.sampleTable.doLayout()
+ if (this.sampleList.length > 0) { // 鏌ョ湅鏃跺鏋滄湁鏍峰搧榛樿閫変腑绗竴鏉�
+ this.productList = this.sampleList[0].insProduct
+ this.$refs.sampleTable.setCurrentRow(this.sampleList[0], true)
+ this.rowClick(this.sampleList[0])
+ }
+ })
+ })
+ }
+ },
+ //鐗规畩鍊煎～鍐欏鐞�
+ inputValueHandler(row,index){
+ if(row){
+ const nextIndex = index+1
+ for (let i = nextIndex; i < this.editTable.length; i++) {
+ const element = this.editTable[i];
+ if(element.model==row.model&&row.symbolItem==element.symbolItem){
+ this.editTable[i].value = row.value
+ }
+ }
+ }
+ },
+ changeProductList0(){
+ this.productList0.forEach(a=>{
+ let obj = this.productList.find(m => m.id == a.id)
+ if(obj){
+ a.state = obj.state
+ a.section = obj.section
+ a.ask = obj.ask
+ a.manHour = obj.manHour
+ a.price = obj.price
+ a.tell = obj.tell
+ }
+ if(a.state == 0&&a.bsmRow){
+ a = this.HaveJson(a.bsmRow)
+ }
+ })
+ },
+ searchFilterList () {
+ const vtw = {
+ inspectionItem: this.inspectionItem, // 妫�楠岄」
+ inspectionItemSubclass: this.inspectionItemSubclass, // 妫�楠岄」瀛愰」
+ methodS: this.methodS, // 璇曢獙鏂规硶
+ }
+ const isHaveValue = Object.values(vtw).some(item => {
+ return item
+ })
+ this.changeProductList0()
+ if (isHaveValue) {
+ for(let i in vtw) {
+ if (vtw[i]) {
+ this.productList = this.productList0.filter((item) => {
+ return item[i] && item[i].includes(vtw[i])
+ })
+ }
+ }
+ this.$nextTick(()=>{
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ })
+ } else {
+ // 娌℃湁鏌ヨ鏉′欢鏃舵覆鏌撴墍鏈夋暟鎹�
+ this.productList = this.productList0
+ this.$nextTick(()=>{
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ })
+ }
+ },
+ containsValue(str) {
+ if(str){
+ let symbolItem = ''
+ this.symbolList.some(value =>{
+ if(str.includes(value)){
+ symbolItem = value
+ return true
+ }
+ })
+ return symbolItem
+ }
+ },
+ handleAsk(ask,symbolItem, value) {
+ try{
+ let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
+ let code2 = ['+', '*', '/', '-']
+ if (ask.includes('&')) {
+ // 澶氫釜鏉′欢
+ let arr0 = ask.split('&')
+ let arr1 = []
+ arr0.forEach(m => {
+ let index = code.findIndex(b => m.includes(b))
+ if (index > -1) {
+ let arr = m.split(code[index]).filter(b => !!b)
+ let num = eval(this.replaceAll(arr[0], symbolItem, value))
+ m = code[index] + '' + num
+ arr1.push(m)
+ }
+ })
+ return arr1.join('&')
+ } else if (ask.includes('锝�') || ask.includes('~')) {
+ let arr0 = []
+ if (ask.includes('锝�')) {
+ arr0 = ask.split('锝�')
+ } else {
+ arr0 = ask.split('~')
+ }
+ // 澶氫釜鏉′欢
+ let arr1 = []
+ arr0.forEach(m => {
+ m = m.replace(symbolItem, value)
+ const index = code2.findIndex(b => m.includes(b))
+ if (index > -1) {
+ m = eval(m)
+ }
+ arr1.push(m)
+ })
+ return arr1.join('锝�')
+ } else {
+ // 鍗曚釜鏉′欢
+ let index = code.findIndex(b => ask.includes(b))
+ if (index > -1) {
+ let arr = ask.split(code[index]).filter(b => !!b)
+ let num = eval(this.replaceAll(arr[0], symbolItem, value))
+ return code[index] + '' + num
+ }
+ }
+ }catch(e){}
+ },
+ handleTell(tell,symbolItem, value){
+ try{
+ let num = this.replaceAll(tell, symbolItem, value)
+ return num
+ }catch(e){}
+ },
+ replaceAll(str,find,value) {
+ if (str === undefined) {
+ return str
+ }
+ return str.replaceAll(find, value);
+ },
+ save() {
+ this.$refs['addObj'].validate((valid) => {
+ if (valid) {
+ if (!this.sampleList.every(m => m.standardMethodListId)) {
+ this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
+ return
+ }
+ const sampleList = this.HaveJson(this.sampleList)
+ sampleList.forEach(item => {
+ item.quantity = 1
+ item.insProduct = this.productList
+ })
+ this.getTotal(sampleList)
+ let projectNum = this.totalArr.filter(a => a.state == 1).length
+ if(projectNum==0){
+ this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ this.saveMethod(sampleList)
+ }).catch(() => {})
+ }else{
+ let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
+ if (isRTS) {
+ this.editTable = this.handleData(sampleList,this.containsValue, 0)
+ this.editTable.forEach(item => {
+ item.value = item.modelNum
+ })
+ this.bsm3Dia = true;
+ return
+ }
+ this.saveMethod(sampleList)
+ }
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ save0(){
+ if(this.editTable.every(m=>m.value)){
+ this.sampleList.forEach(item => {
+ item.quantity = 1
+ item.insProduct = this.productList
+ })
+ let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
+ sampleList.forEach(a => {
+ a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ })
+ this.saveMethod(sampleList)
+ }else{
+ this.$message.error('璇峰～鍐欒瘑鍒鍊�')
+ }
+ },
+ handleData(sampleList,calBack,type){
+ let editTable = []
+ sampleList.forEach(item => {
+ let obj = {
+ sampleCode:item.sampleCode,
+ model:item.model,
+ symbolList:[],
+ sampleId:item.id,
+ modelNum:item.modelNum,
+ }
+ if (item.insProduct && item.insProduct.length > 0) {
+ item.insProduct.forEach(a => {
+ if (a.state == 1) {
+ if(type==0){
+ let str = calBack(a.ask)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:a.inspectionItem,
+ })
+ }else if(type==1){
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ for (var i=0;i<arr.length;i++){
+ if(a.ask){
+ if(a.ask.includes(arr[i].symbolItem)){
+ let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
+ if (ask) {
+ a.ask = ask
+ }
+ let tell = this.handleAsk(a.tell, arr[i].symbolItem,arr[i].value)
+ if (tell) {
+ a.tell = tell
+ }
+ }
+ }else{
+ this.$message.error('瑕佹眰鍊间负绌猴紝闇�瑕佸幓鏍囧噯搴撶淮鎶わ紒')
+ }
+ }
+ }
+ }
+ })
+ }
+ // 鍏夌氦甯﹂」鐩�
+ if (item.bushing && item.bushing.length > 0) {
+ item.bushing.forEach(a => {
+ if (a.fiber && a.fiber.length > 0) {
+ a.fiber.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ if (c.state == 1) {
+ if(type==0){
+ let str = calBack(c.ask)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:c.inspectionItem,
+ })
+ }else if(type==1){
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ arr.forEach(f => {
+ if(c.ask.includes(f.symbolItem)){
+ let ask = calBack(c.ask, f.symbolItem,f.value)
+ if (ask) {
+ c.ask = ask
+ }
+ let tell = this.handleTell(c.tell, f.symbolItem,f.value)
+ if (tell) {
+ c.tell = tell
+ }
+ }
+ })
+ }
+ }
+ })
+ }
+ })
+ }
+ if (a.fibers && a.fibers.length > 0) {
+ a.fibers.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ if (c.state == 1) {
+ if(type==0){
+ let str = calBack(c.ask)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:c.inspectionItem,
+ })
+ }else if(type==1){
+ // let ask = calBack(c.ask, c.rts)
+ // if (ask && c.state == 1) {
+ // c.ask = csk
+ // }
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ arr.forEach(f => {
+ if(c.ask.includes(f.symbolItem)){
+ let ask = calBack(c.ask, f.symbolItem,f.value)
+ if (ask) {
+ c.ask = ask
+ }
+ let tell = this.handleTell(c.tell, f.symbolItem,f.value)
+ if (tell) {
+ c.tell = tell
+ }
+ }
+ })
+ }
+ }
+ })
+ }
+ if (b.fiber && b.fiber.length > 0) {
+ b.fiber.forEach(c => {
+ if (c.productList && c.productList.length > 0) {
+ c.productList.forEach(d => {
+ if (d.state == 1) {
+ if(type==0){
+ let str = calBack(d.ask)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:d.inspectionItem,
+ })
+ }else if(type==1){
+ // let ask = calBack(d.ask, d.rts)
+ // if (ask && d.state == 1) {
+ // d.ask = ask
+ // }
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ arr.forEach(f => {
+ if(d.ask.includes(f.symbolItem)){
+ let ask = calBack(d.ask, f.symbolItem,f.value)
+ if (ask) {
+ d.ask = ask
+ }
+ let tell = this.handleTell(d.tell, f.symbolItem,f.value)
+ if (tell) {
+ d.tell = tell
+ }
+ }
+ })
+ }
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ if(type==0){
+ editTable.push(obj)
+ }
+ })
+ if(type==0){
+ editTable.forEach(a => {
+ a.symbolList.forEach(b => {
+ let arr = a.symbolList.filter(c => c.symbolItem == b.symbolItem);
+ b.inspectionItemList = arr.map(c => c.inspectionItem).join(',')
+ })
+ })
+ editTable.forEach(a => {
+ let mySet = new Set();
+ a.symbolList = a.symbolList.filter(b =>{
+ let num0 = mySet.size;
+ mySet.add(b.symbolItem);
+ let num1 = mySet.size;
+ if(num0!=num1){
+ return true;
+ }else{
+ return false
+ }
+ })
+ })
+ let editTableNew = []
+ editTable.forEach(a => {
+ a.symbolList.forEach(b => {
+ let obj = {
+ sampleCode:a.sampleCode,
+ model:a.model,
+ symbolItem:b.symbolItem,
+ sampleId:a.sampleId,
+ value:null,
+ inspectionItemList:b.inspectionItemList,
+ modelNum:a.modelNum,
+ }
+ editTableNew.push(obj)
+ })
+ })
+ return editTableNew
+ }else{
+ return sampleList
+ }
+ },
+ saveMethod(sampleList){
+ this.saveLoad = true
+ addRawCopperOrder({
+ copperInsOrder: this.addObj,
+ sampleList: sampleList.map(a => {
+ if (a.insProduct.length > 0) {
+ a.insProduct.forEach(c => {
+ delete c.id
+ })
+ }
+ if (a.modelNum) {
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
+ } else {
+ a.model = a.modelNum + a.model
+ }
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
+ a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ return a
+ })
+ }).then(res => {
+ this.saveLoad = false
+ this.$message.success('宸叉彁浜�')
+ this.bsm3Dia = false;
+ this.closeOpenPage()
+ }).catch(e=>{
+ this.saveLoad = false
+ })
+ },
+ getUserNowInfo() {
+ getUserNow().then(res => {
+ let selects = res.data
+ if (selects == null) return
+ this.addObj.userId = selects.id
+ this.addObj.company = selects.company
+ this.addObj.custom = selects.name
+ this.addObj.code = selects.code
+ this.addObj.phone = selects.phone
+ this.addObj.companyId = selects.departId
+ // if(this.active==1){
+ // this.selectInsOrderTemplateInfo()
+ // }
+ })
+ },
+ getProNum() {
+ this.$refs.sampleTable.doLayout()
+ },
+ searchFilter() {
+ this.$refs.tree.filter(this.search)
+ },
+ nodeOpen(data, node, el) {
+ $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
+ },
+ nodeClose(data, node, el) {
+ $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
+ },
+ handleNodeClick(val, node, el) {
+ this.selectTree = ''
+ this.models = val.children
+ this.getNodeParent(node)
+ let flag = false
+ if (node.level == 3) {
+ if(node.data.children.length>0){
+ node.data.children.forEach(a => {
+ let key = Object.keys(a)
+ if(!key.includes('level')) {
+ flag = true
+ }
+ })
+
+ }
+ }
+ this.selectTree = this.selectTree.replace(' - ', '')
+ if(flag) {
+ this.selectTree = ' - - ' + this.selectTree
+ }
+ let data = this.selectTree.split(' - ')
+ let data2 = ''
+ for (let index = data.length - 1; index >= 0; index--) {
+ data2 += " - " + data[index]
+ }
+ this.selectTree = data2.replace(' - ', '')
+ },
+ getNodeParent(val) {
+ if (val.parent != null) {
+ if (val.data.children === null) {
+ this.selectTree += ' - ' + val.label + ' - ' + ''
+ } else {
+ this.selectTree += ' - ' + val.label
+ }
+ this.getNodeParent(val.parent)
+ }
+ },
+ selectStandardTreeList() {
+ this.selectStandardTreeLoading = true
+ selectStandardTreeList2().then(res => {
+ this.list = res.data
+ this.list.forEach(a => {
+ this.expandedKeys.push(a.label)
+ })
+ this.selectStandardTreeLoading=false
+ })
+ },
+ filterNode(value, data) {
+ if (!value) return true;
+ return data.label.indexOf(value) !== -1;
+ },
+ activeStandardTree() {
+ let trees = this.selectTree.split(" - ")
+ if (trees.length < 3) {
+ this.$message.error('鏈�夋嫨瀵硅薄')
+ return
+ }
+ this.addObj.factory = trees[0]
+ this.addObj.laboratory = trees[1]
+ this.addObj.sampleType = trees[2]
+ if (trees[3] === undefined || trees[3] === '' || trees[3] === '- ') {
+ this.addObj.sample = trees[2]
+ } else {
+ this.addObj.sample = trees[3]
+ }
+ this.addObj.model = (trees[4] == undefined ? null : trees[4])
+ this.selectStandardTree = false
+ this.sampleList = []
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.sample = this.addObj.sample
+ this.sample.model = this.addObj.model
+ this.sample.unit = this.addObj.unit
+ this.sample.standardMethodListId = null
+ this.sample.insProduct = []
+ this.sample.id = this.count
+ this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
+ this.sampleList.push(this.HaveJson(this.sample))
+ this.count++
+ }
+ this.$refs.sampleTable.doLayout()
+ // this.selectsStandardMethodByFLSSM()
+ },
+ selectsStandardMethodByFLSSM() {
+ this.methodLoad = true
+ selectsStandardMethodByFLSSM({tree: this.selectTree}).then(res => {
+ this.methodLoad = false
+ try {
+ if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
+ let arr = this.selectTree.split('-')
+ let arr0 = arr.slice(0, arr.length - 1)
+ let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
+ selectsStandardMethodByFLSSM({tree: selectTree}).then(ress => {
+ this.methods = ress.data.standardMethodList
+ })
+ } else {
+ this.methods = res.data.standardMethodList
+ }
+ } catch (e) {}
+ })
+ },
+ addStandardTree() {
+ if (this.selectTree == null) return
+ this.sampleList = []
+ this.productList = []
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sample.joinName = null
+ this.sample.joinModel = null
+ this.sample.joinNum = 1
+ this.sample.sample = this.addObj.sample
+ this.sample.model = this.addObj.model
+ this.sample.unit = this.addObj.unit
+ this.sample.standardMethodListId = null
+ this.sample.insProduct = []
+ this.sample.id = parseInt(i+1)
+ this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
+ this.sampleList.push(this.HaveJson(this.sample))
+ // this.count++
+ }
+ },
+ selectSample(val) {
+ this.sampleIds = []
+ val.forEach(a => {
+ this.sampleIds.push(a.id)
+ })
+ this.sampleSelectionList = val
+ },
+ selectProduct(val) {
+ this.productListSelected = val
+ this.productIds = []
+ val.forEach(a => {
+ this.productIds.push(a.id)
+ })
+ },
+ rowClick(row, column, event) {
+ this.currentMethod = row
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '鎶�鏈姹�') {
+ this.isAskOnlyRead = true
+ } else {
+ this.isAskOnlyRead = false
+ }
+ this.sampleId = row.id
+ if (this.active !== 1) {
+ this.sampleIds = []
+ this.sampleSelectionList.forEach(ele=>{
+ if(ele.id == row.id){
+ this.sampleIds.push(row.id)
+ }
+ })
+ }
+ // this.productList = row.insProduct
+ if (this.productList !== null) {
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
+ }
+ },
+ toggleSelection(row) {
+ this.$refs.productTable.toggleRowSelection(row, true);
+ },
+ selectOne(selection, row) {
+ this.bsm1DiaList = []
+ row.state = row.state == 1 ? 0 : 1
+ if(row.section === null) {
+ row.section = ""
+ }
+ if (row.sectionCopy === undefined && row.section) {
+ if (row.section.indexOf('[') > -1) {
+ this.$set(row, 'sectionCopy', row.section)
+ }
+ }
+ if (row.ask.includes('[')) {
+ this.$set(row, 'askCopy', row.ask)
+ }
+ if (row.tell.includes('[')) {
+ this.$set(row, 'tellCopy', row.tell)
+ }
+ // if (row.manHour.includes('[')) {
+ // this.$set(row, 'manHourCopy', row.manHour)
+ // }
+ // if (row.price.includes('[')) {
+ // this.$set(row, 'priceCopy', row.price)
+ // }
+ let arr = this.productList.filter(m=>m.state==1&&row.sectionCopy&&row.sectionCopy.includes(m.sectionCopy)&&m.ask&&m.sectionCopy.indexOf('[')==-1)
+ if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.sectionCopy !== undefined && row.state === 1&&arr.length==0) {
+ if (row.sectionCopy.indexOf('[') > -1) {
+ row.bsmRow = this.HaveJson(row)
+ }
+ row.bsm1 = true
+ this.bsm1DiaList.push(row)
+ this.bsm1DiaAll = true
+ } else if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.state === 0&&arr.length==0) {
+ row.bsm1 = false
+ }else if(arr.length>0){
+ try{
+ row.bsmRow = this.HaveJson(row)
+ let sectionCopy = arr[0].sectionCopy
+ let arr0 = JSON.parse(row.sectionCopy)
+ let arr1 = JSON.parse(row.ask)
+ // let arr2 = JSON.parse(row.manHour)
+ // let arr3 = JSON.parse(row.price)
+ let arr4 = JSON.parse(row.tell)
+ let index = arr0.indexOf(sectionCopy)
+ row.sectionCopy = sectionCopy
+ row.ask = arr1[index]
+ // row.manHour = arr2[index]
+ // row.price = arr3[index]
+ row.tell = arr4[index]
+ } catch(e) {}
+ }
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ if (m.id == row.id) {
+ m.state = row.state;
+ }
+ return m;
+ })
+ }
+ return item
+ })
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
+ this.getProNum()
+ },
+ permute(nums) {
+ const result = [];
+
+ function backtrack(temp, nums) {
+ if (temp.length === 2) {
+ result.push([...temp]);
+ return;
+ }
+ for (let i = 0; i < nums.length; i++) {
+ if (temp.includes(nums[i])) continue;
+ // 閬垮厤閲嶅鏁板瓧
+ if (temp.length > 0 && nums[i] < temp[temp.length - 1]) continue; // 瑙勫畾椤哄簭锛岄伩鍏嶉噸澶嶇粍鍚�
+ temp.push(nums[i]);
+ backtrack(temp, nums);
+ temp.pop();
+ }
+ }
+ backtrack([], nums);
+ return result;
+ },
+ tableRowClassName({row, rowIndex}) {
+ if (row.state === 0) {
+ return '';
+ }
+ return 'warning-row';
+ },
+ // selectInsOrderTemplateInfo() {
+ // selectInsOrderTemplate({company: this.addObj.company}).then(res => {
+ // this.templates = res.data
+ // })
+ // },
+ methodChange(val, row) {
+ if (val === null || val === '') return
+ if (this.sampleList.length > 1) {
+ // 鏈変袱鏉℃牱鍝佹椂锛岀浜屾潯鏍峰搧淇℃伅鍜岀涓�鏉′繚鎸佷竴鑷�
+ this.sampleList.forEach(item => {
+ item.standardMethodListId = val
+ item.modelNum = row.modelNum
+ })
+ }
+ this.currentMethod = row
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '鎶�鏈姹�') {
+ this.isAskOnlyRead = true
+ } else {
+ this.isAskOnlyRead = false
+ }
+ this.getProductLoad = true
+ let selectTreeList = this.selectTree.split(" - ")
+ this.addObj.model&&(selectTreeList[selectTreeList.length - 1] = this.addObj.model)
+ selectStandardProductList({
+ model: this.addObj.model?this.addObj.model:row.model,
+ modelNum: row.modelNum,
+ standardMethodListId: val,
+ factory: selectTreeList.join(" - "),
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = 0
+ })
+ row.insProduct = this.HaveJson(res.data)
+ this.getProductLoad = false
+ this.productList = row.insProduct
+ this.productList0 = JSON.parse(JSON.stringify(this.productList))
+ this.$refs.sampleTable.setCurrentRow(row)
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
+ })
+ // this.searchTemList()
+ },
+ // searchTemList () {
+ // this.temperatureList = []
+ // this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ // category: "鐢靛姏娓╁害寰幆妫�楠�"
+ // }).then(res => {
+ // if (res.data.length > 0) {
+ // this.temperatureEngList = res.data
+ // res.data.forEach(item => {
+ // this.temperatureList.push(item.label)
+ // })
+ // }
+ // })
+ // },
+ changeModel() {
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if (obj) {
+ a.model = this.model
+ }
+ })
+ },
+ changeStandardMethodListId() {
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if (obj) {
+ a.standardMethodListId = this.standardMethodListId
+ this.methodChange(this.standardMethodListId, a)
+ }
+ })
+ },
+ methodFocus() {
+ this.selectsStandardMethodByFLSSM()
+ },
+ handleChangeModel(e) {
+ this.productList = []
+ let num = this.selectTree.split('-').length;
+ if (num != 5) {
+ this.selectTree = this.selectTree + ' - ' + e
+ } else {
+ let arr = this.selectTree.split('-')
+ let arr0 = arr.slice(0, arr.length - 1)
+ this.selectTree = arr0.join('-') + '- ' + e
+ }
+ },
+ // 瑕佹眰鍊煎彉鍖栨椂
+ requestChange(e, row,type) {
+ //this.currentMethod 褰撳墠鏍峰搧id
+ this.sampleList.forEach(item=>{
+ if(item.id == this.currentMethod.id){
+ item.insProduct.forEach(i=>{
+ if(i.id == row.id){
+ i[type] = e
+ }
+ })
+ }
+ })
+ },
+ selectStandardMethods() {
+ selectStandardMethodEnum().then(res => {
+ this.methods = res.data
+ })
+ },
+ selectable() {
+ if (this.active > 1) {
+ return false
+ } else {
+ return true
+ }
+ },
+ handleAll(e) {
+ if (e.length > 0) {
+ this.productList.map(m => {
+ if(e.find(a=>a.id == m.id)){
+ m.state = 1
+ }
+ return m
+ })
+ } else {
+ this.productList.map(m => {
+ m.state = 0
+ return m
+ })
+ }
+ this.bsmRow3 = [];
+ this.bsm1DiaList = []
+ this.productList.forEach(p => {
+ if (p.sectionCopy === undefined && p.section) {
+ if (p.section.indexOf('[') > -1) {
+ this.$set(p, 'sectionCopy', p.section)
+ }
+ }
+ if (p.ask.includes('[')) {
+ this.$set(p, 'askCopy', p.ask)
+ }
+ if (p.tell.includes('[')) {
+ this.$set(p, 'tellCopy', p.tell)
+ }
+ // if (p.manHour.includes('[')) {
+ // this.$set(p, 'manHourCopy', p.manHour)
+ // }
+ // if (p.price.includes('[')) {
+ // this.$set(p, 'priceCopy', p.price)
+ // }
+ if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
+ if (p.sectionCopy.indexOf('[') > -1) {
+ p.bsmRow = this.HaveJson(p)
+ }
+ p.bsm1 = true
+ this.bsm1DiaList.push(p)
+ this.bsm1DiaAll = true
+ } else if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.state === 0) {
+ p.bsm1 = false
+ }
+ })
+ if (e.length > 0) {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ m.state = 1
+ return m;
+ })
+ }
+ return item
+ })
+ } else {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ m.state = 0
+ return m;
+ })
+ }
+ return item
+ })
+ }
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
+ this.getProNum()
+ this.$nextTick(() => {
+ this.$refs.productTable.doLayout()
+ })
+ },
+ filterHandler(value, row, column) {
+ const property = column['property'];
+ return row[property] === value;
+ },
+ // 鍏ㄩ�夌壒娈婂�煎鐞嗘閫夋嫨瑕佹眰鍊肩殑鍥炶皟
+ upBsmAll (item) {
+ const i = this.bsm1DiaList.findIndex(obj => obj.id === item.id)
+ if (i > -1) {
+ // 鎵惧埌鐩稿簲鐨勬楠岄」璧嬪��
+ this.bsm1DiaList[i].bsm1Val = item.bsm1Val
+ let sections = this.bsm1DiaList[i].bsmRow.sectionCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.sectionCopy);
+ let asks = this.bsm1DiaList[i].bsmRow.askCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.askCopy);
+ let tells = this.bsm1DiaList[i].bsmRow.tellCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.tellCopy);
+ // let manHours = this.bsm1DiaList[i].bsmRow.manHourCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.manHourCopy);
+ // let prices = this.bsm1DiaList[i].bsmRow.priceCopy && JSON.parse(this.bsm1DiaList[i].bsmRow.priceCopy);
+ for (var a in sections) {
+ if (this.bsm1DiaList[i].bsm1Val === sections[a]) {
+ this.productList.forEach(p => {
+ // 灏嗛�夋嫨濂界殑瑕佹眰鍊艰祴鍊煎埌鍒楄〃閲�
+ if (p.id === this.bsm1DiaList[i].bsmRow.id) {
+ p.section = sections[a]
+ p.ask = asks[a]
+ p.tell = tells[a]
+ // p.manHour = manHours[a]
+ // p.price = prices[a]
+ }
+ })
+ break
+ }
+ }
+ }
+ this.changeProductList0()
+ this.currentMethod.insProduct = this.productList0
+ },
+ save1 () {
+ if (this.bsm1DiaList.length > 0) {
+ this.bsm1DiaList.forEach(item => {
+ if (!item.bsm1Val) {
+ throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ }
+ })
+ }
+ this.bsm1DiaAll = false
+ },
+ beforeClose(done) {
+ if (this.bsm1DiaList.length > 0) {
+ this.bsm1DiaList.forEach(item => {
+ if (!item.bsm1Val) {
+ throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ }
+ })
+ }
+ done()
+ },
+ beforeClose0(done) {
+ if (!this.bsm3Val) {
+ this.$message.error('RST蹇呴』濉啓')
+ return
+ } else {
+ if (Array.isArray(this.bsmRow3)) {
+ this.bsmRow3.forEach(item => {
+ item.rts = this.bsm3Val
+ })
+ } else {
+ this.bsmRow3.rts = this.bsm3Val
+ }
+ }
+ done()
+ },
+ getTotal() {
+ this.totalArr = []
+ // this.total = 0;
+ this.sampleList.forEach(item => {
+ if (item.insProduct && item.insProduct.length > 0) {
+ item.insProduct.forEach(a => {
+ this.totalArr.push(a)
+ })
+ }
+ if (item.bushing && item.bushing.length > 0) {
+ item.bushing.forEach(a => {
+ if (a.fiber && a.fiber.length > 0) {
+ a.fiber.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ this.totalArr.push(c)
+ })
+ }
+ })
+ }
+ if (a.fibers && a.fibers.length > 0) {
+ a.fibers.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ this.totalArr.push(c)
+ })
+ }
+ if (b.fiber && b.fiber.length > 0) {
+ b.fiber.forEach(c => {
+ if (c.productList && c.productList.length > 0) {
+ c.productList.forEach(d => {
+ this.totalArr.push(d)
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ let mySet = new Set();
+ let arr0 = this.totalArr.filter(item => {
+ if (item.state == 1) {
+ let num1 = mySet.size
+ if (item.manHourGroup === '' || !item.manHourGroup) {
+ return true
+ } else {
+ mySet.add(item.manHourGroup)
+ let num2 = mySet.size
+ if (num2 > num1) {
+ return true
+ } else {
+ return false
+ }
+ }
+ }
+ })
+ // arr0.forEach(item => {
+ // this.total += Number(item.price)
+ // })
+
+ },
+ goBack () {
+ if (this.active == 1) {
+ this.$router.go(-1)
+ } else {
+ this.closeOpenPage()
+ }
+ },
+ closeOpenPage() {
+ this.$router.go(-1)
+ this.$tab.closeOpenPage()
+ },
+ }
+}
+</script>
+<style scoped>
+.header {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 10px;
+}
+>>>.warning-row {
+ color: #1890FF;
+}
+.node_i {
+ color: orange;
+ font-size: 18px;
+}
+</style>
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspectionOrder.vue
similarity index 99%
rename from src/views/business/materialOrder/customsInspection.vue
rename to src/views/business/materialOrder/customsInspectionOrder.vue
index c95345c..e198c96 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspectionOrder.vue
@@ -449,7 +449,7 @@
} from "@/api/business/rawMaterialOrder";
export default {
- name: "CustomsInspection",
+ name: "CustomsInspectionOrder",
dicts: ['check_type', 'urgency_level'],
components: {},
props: {
@@ -645,12 +645,6 @@
this.getInfo();
},
activated() {
- this.$refs.addObj.resetFields()
- this.addObj.createTime = ''
- this.addObj.id = ''
- this.addObj.updateTime = ''
- this.sampleList = []
- this.productList = []
this.active = this.$route.query.active
this.orderType = this.$route.query.orderType
this.currentId = this.$route.query.currentId
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspectionView.vue
similarity index 99%
copy from src/views/business/materialOrder/customsInspection.vue
copy to src/views/business/materialOrder/customsInspectionView.vue
index c95345c..33b7687 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspectionView.vue
@@ -449,7 +449,7 @@
} from "@/api/business/rawMaterialOrder";
export default {
- name: "CustomsInspection",
+ name: "CustomsInspectionView",
dicts: ['check_type', 'urgency_level'],
components: {},
props: {
@@ -645,12 +645,6 @@
this.getInfo();
},
activated() {
- this.$refs.addObj.resetFields()
- this.addObj.createTime = ''
- this.addObj.id = ''
- this.addObj.updateTime = ''
- this.sampleList = []
- this.productList = []
this.active = this.$route.query.active
this.orderType = this.$route.query.orderType
this.currentId = this.$route.query.currentId
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index a307a3e..b02cb14 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -1125,7 +1125,6 @@
},
// 閾滄潗鏂欎笅鍗�
copper() {
- this.$router.push("/materialOrder/copperOrder");
this.$router.push({ path: "/materialOrder/copperOrder", query: { active: 1 } });
},
// 鎵撳紑鏍囩鎵撳嵃寮规
@@ -1146,20 +1145,20 @@
},
// 涓嬪崟
playOrder(row) {
- this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 0, customsInspection: row, active: 1 } });
+ this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: { orderType: 0, customsInspection: row, active: 1 } });
},
// 瀛ｅ害妫�楠屼笅鍗�
playOrderSec(row) {
- this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 1, customsInspection: row, active: 1 } });
+ this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: { orderType: 1, customsInspection: row, active: 1 } });
},
// 鐐瑰嚮鏍峰搧鍚嶇О鏌ョ湅璇︽儏
selectAllByOne(row) {
if (row.isCopper == 1) {
this.currentId = row.enterOrderId
- this.$router.push({ path: "/materialOrder/copperOrder", query: { customsInspection: row, active: 2, currentId: this.currentId } });
+ this.$router.push({ path: "/materialOrder/CopperView", query: { customsInspection: row, active: 2, currentId: this.currentId } });
} else {
this.currentId = row.insOrderId
- this.$router.push({ path: "/materialOrder/customsInspection", query: { customsInspection: row, active: 2, currentId: this.currentId } });
+ this.$router.push({ path: "/materialOrder/customsInspectionView", query: { customsInspection: row, active: 2, currentId: this.currentId } });
}
},
// 鎵撳紑鍏嶆寮规
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/addOrder.vue
similarity index 99%
copy from src/views/business/productOrder/components/add.vue
copy to src/views/business/productOrder/components/addOrder.vue
index 7b0ad3c..5b9c516 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -600,7 +600,7 @@
import {mapGetters} from "vuex";
export default {
- name: 'Add',
+ name: 'AddOrder',
components: {
limsTable,
cableConfig,
@@ -844,12 +844,6 @@
this.getInfo()
},
activated() {
- this.$refs.addObj.resetFields()
- this.addObj.createTime = ''
- this.addObj.id = ''
- this.addObj.updateTime = ''
- this.sampleList = []
- this.productList = []
this.active = this.$route.query.active
this.tabIndex = this.$route.query.tabIndex
this.currentId = this.$route.query.currentId
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/addView.vue
similarity index 99%
rename from src/views/business/productOrder/components/add.vue
rename to src/views/business/productOrder/components/addView.vue
index 7b0ad3c..b5ba69f 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/addView.vue
@@ -600,7 +600,7 @@
import {mapGetters} from "vuex";
export default {
- name: 'Add',
+ name: 'AddView',
components: {
limsTable,
cableConfig,
@@ -840,16 +840,9 @@
this.active = this.$route.query.active
this.tabIndex = this.$route.query.tabIndex
this.currentId = this.$route.query.currentId
- this.getUserNowData()
this.getInfo()
},
activated() {
- this.$refs.addObj.resetFields()
- this.addObj.createTime = ''
- this.addObj.id = ''
- this.addObj.updateTime = ''
- this.sampleList = []
- this.productList = []
this.active = this.$route.query.active
this.tabIndex = this.$route.query.tabIndex
this.currentId = this.$route.query.currentId
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index eb1e2c2..d8371fb 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -972,7 +972,7 @@
// 鐐瑰嚮鏍峰搧鍚嶇О
selectAllByOne(row) {
this.$router.push({
- path: "/productOrder/add", query: {
+ path: "/productOrder/addView", query: {
examine: 1,
active: 2,
currentId: row.id,
@@ -1243,11 +1243,11 @@
},
// 涓嬪崟
playOrder(num) {
- this.$router.push({ path: "/productOrder/add", query: { examine: 0, active: num, tabIndex: this.tabIndex } });
+ this.$router.push({ path: "/productOrder/addOrder", query: { examine: 0, active: num, tabIndex: this.tabIndex } });
},
// 瀹℃牳
handleVerify(row) {
- this.$router.push({ path: "/productOrder/add", query: { examine: 1, active: 3, currentId: row.id } });
+ this.$router.push({ path: "/productOrder/addView", query: { examine: 1, active: 3, currentId: row.id } });
},
handleTab(i) {
this.tabIndex = i;
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 4e41931..db8311e 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -664,7 +664,7 @@
case 0:
// 鍘熸潗鏂�
this.$router.push({
- path: "/materialOrder/customsInspection", query: {
+ path: "/materialOrder/customsInspectionView", query: {
customsInspection: row,
active: this.activeFace,
currentId: row.insOrderId,
@@ -675,7 +675,7 @@
case null:
// 鎴愬搧
this.$router.push({
- path: "/productOrder/add", query: {
+ path: "/productOrder/addView", query: {
examine: this.examine,
active: this.activeFace,
currentId: row.insOrderId
@@ -685,7 +685,7 @@
case 1:
// 閾滄潗
this.$router.push({
- path: "/materialOrder/copperOrder", query: {
+ path: "/materialOrder/CopperView", query: {
active: this.activeFace,
currentId: row.insOrderId
}
--
Gitblit v1.9.3