From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/standard/standardLibrary/index.vue | 1268 +++++++++++++++++++++++++--------------------------------
1 files changed, 552 insertions(+), 716 deletions(-)
diff --git a/src/views/standard/standardLibrary/index.vue b/src/views/standard/standardLibrary/index.vue
index d57f377..a74d08e 100644
--- a/src/views/standard/standardLibrary/index.vue
+++ b/src/views/standard/standardLibrary/index.vue
@@ -1,7 +1,8 @@
<style scoped>
.standard {
- padding: 10px 0;
+ padding-top: 10px;
display: flex;
+ height: calc(100vh - 90px);
}
.left {
@@ -26,16 +27,6 @@
opacity: 1;
}
-.custom-tree-node .el-icon-edit {
- color: #3a7bfa;
- opacity: 0;
- font-size: 18px;
-}
-
-.custom-tree-node:hover .el-icon-edit {
- opacity: 1;
-}
-
.node_i {
color: orange;
font-size: 18px;
@@ -43,7 +34,7 @@
.right {
margin-left: 5px;
- width: calc(100% - 365px);
+ width: calc(100% - 350px);
height: calc(100% - 40px);
}
@@ -127,8 +118,14 @@
>>> .is-disabled .el-textarea__inner {
background: rgba(0, 0, 0, 0.05) !important;
}
+
+>>> .is-disabled .el-textarea__inner {
+ background: rgba(0, 0, 0, 0.05) !important;
+}
+
>>> .el-table__body-wrapper::-webkit-scrollbar {
- height: 14px; /* 璁剧疆婊氬姩鏉″搴� */
+ height: 6px;
+ /* 璁剧疆婊氬姩鏉″搴� */
}
</style>
<style>
@@ -193,56 +190,52 @@
<el-row>
<el-col :span="20">
<el-input
- v-model="search"
- clearable
placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�"
+ suffix-icon="el-icon-search"
+ v-model="search"
size="small"
style="margin-bottom: 5px"
- suffix-icon="el-icon-search"
+ clearable
@blur="searchFilter"
@clear="searchFilter"
></el-input>
</el-col>
<el-col
- v-if="checkPermi(['standard:standardLibrary:add'])"
:span="4"
style="text-align: center; line-height: 30px"
+ v-if="addPower"
>
<el-button
- circle
+ type="primary"
icon="el-icon-plus"
size="mini"
- type="primary"
+ circle
@click="addDia = true"
></el-button>
</el-col>
</el-row>
<el-tree
- ref="tree"
- v-loading="treeLoad"
- :allow-drop="allowDrop"
:data="list"
- :default-expanded-keys="expandedKeys"
- :draggable="true"
- :filter-node-method="filterNode"
+ ref="tree"
:props="{ children: 'children', label: 'label' }"
- highlight-current
node-key="label"
+ :filter-node-method="filterNode"
+ @node-click="handleNodeClick"
+ highlight-current
+ v-loading="treeLoad"
+ :expand-on-click-node="false"
+ :default-expanded-keys="expandedKeys"
style="
height: calc(100% - 30px);
overflow-y: scroll;
scrollbar-width: none;
"
- @node-click="handleNodeClick"
- @node-expand="nodeOpen"
- @node-collapse="nodeClose"
- @node-drop="handleDrop"
>
- <div slot-scope="{ node, data }" class="custom-tree-node">
+ <div class="custom-tree-node" slot-scope="{ node, data }">
<el-row style="width: 100%">
<el-col
+ :span="21"
:class="{ sort: node.level > 3 }"
- :span="19"
:title="data.label"
style="text-align: left"
>
@@ -260,34 +253,15 @@
</span>
</el-col>
<el-col
- v-if="
- checkPermi(['standard:standardLibrary:delStandardTree']) &&
- (node.data.children === null ||
- node.data.children === undefined)
- "
:span="2"
style="text-align: right"
- >
- <el-button
- size="mini"
- type="text"
- @click="editTreeName(node.data)"
- >
- <i class="el-icon-edit"></i>
- </el-button>
- </el-col>
- <el-col
v-if="
- checkPermi(['standard:standardLibrary:delStandardTree']) &&
- (node.data.children === null ||
- node.data.children === undefined)
+ node.data.children === null || node.data.children === undefined
"
- :span="2"
- style="text-align: right"
>
<el-button
- size="mini"
type="text"
+ size="mini"
@click.stop="remove(node, data)"
>
<i class="el-icon-delete"></i>
@@ -302,32 +276,38 @@
<el-col :span="20" style="font-size: 14px; color: #999">{{
selectTree
}}</el-col>
- <el-col :span="4">
- <el-button
- v-if="isShowCopy"
- size="small"
- style="position: absolute; right: 50px; top: 1px"
- type="primary"
- @click="openCopyDia"
- >鎵归噺澶嶅埗</el-button
- >
- </el-col>
+ <el-button
+ size="small"
+ type="primary"
+ style="position: absolute; right: 100px; top: 1px"
+ @click="uploadDia = true"
+ v-if="inExcelOfTreePower"
+ >瀵煎叆</el-button
+ >
+ <el-button
+ size="small"
+ type="primary"
+ @click="handleMore"
+ style="position: absolute; right: 5px; top: 1px"
+ v-if="upStandardProduct"
+ >鎵归噺缂栬緫</el-button
+ >
</el-row>
- <el-row v-loading="tableLoad" class="standard_table">
+ <el-row class="standard_table" v-loading="tableLoad">
<el-table
- ref="standard"
- :data="standardList"
class="el-table"
- header-row-class-name="header-class"
- height="220"
- highlight-current-row
+ :data="standardList"
style="width: 100%; height: 220px !important"
+ height="220"
tooltip-effect="dark"
+ highlight-current-row
@row-click="rowClick"
+ ref="standard"
+ header-row-class-name="header-class"
>
<el-table-column
- label="鏍囧噯缂栧彿"
prop="code"
+ label="鏍囧噯缂栧彿"
show-overflow-tooltip
width="200"
>
@@ -338,127 +318,111 @@
</template>
</el-table-column>
<el-table-column
- label="鏍囧噯鍚嶇О"
prop="name"
+ label="鏍囧噯鍚嶇О"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="澶囨敞"
prop="remark"
+ label="澶囨敞"
show-overflow-tooltip
></el-table-column>
</el-table>
</el-row>
- <el-row v-loading="tableLoad2" class="product_table">
+ <el-row class="product_table" v-loading="tableLoad2">
<el-table
- id="templateParamTable"
- ref="productTable"
- v-loading="productTableLoading"
:data="productList"
+ ref="productTable"
+ style="width: 100%"
+ height="100%"
+ tooltip-effect="dark"
+ stripe
:fit="true"
- :row-class-name="tableRowClassName"
border
+ @selection-change="handleSelectionChange"
+ :row-class-name="tableRowClassName"
+ @select="upProductSelect"
+ @select-all="handleAll"
class="productTable"
header-row-class-name="header-class"
- height="100%"
- row-key="id"
- stripe
- style="width: 100%"
- tooltip-effect="dark"
- @select="upProductSelect"
- @selection-change="handleSelectionChange"
- @select-all="handleAll"
>
<el-table-column type="selection" width="50"> </el-table-column>
<el-table-column
+ prop="sample"
label="浜у搧"
min-width="100"
- prop="sample"
show-overflow-tooltip
></el-table-column>
<el-table-column
+ prop="model"
label="鍨嬪彿"
min-width="100"
- prop="model"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="妫�楠岄」鍒嗙被"
- min-width="140"
- prop="inspectionItemClass"
- show-overflow-tooltip
- ></el-table-column>
- <el-table-column
+ prop="inspectionItem"
label="妫�楠岄」"
min-width="140"
- prop="inspectionItem"
show-overflow-tooltip
></el-table-column>
+ <!-- <el-table-column prop="inspectionItemClassify" label="妫�楠岄」绫诲瀷" width="120" show-overflow-tooltip></el-table-column> -->
<el-table-column
+ prop="inspectionItemSubclass"
label="妫�楠岄」瀛愰」"
min-width="140"
- prop="inspectionItemSubclass"
show-overflow-tooltip
></el-table-column>
<el-table-column
- label="瀛愬疄楠屽"
prop="sonLaboratory"
- show-overflow-tooltip
+ label="瀛愬疄楠屽"
width="130"
+ show-overflow-tooltip
></el-table-column>
- <el-table-column label="瑕佹眰鍊�" min-width="200px" prop="ask">
+ <el-table-column prop="ask" label="瑕佹眰鍊�" min-width="200px">
<template slot-scope="scope">
<el-input
- v-if="
- checkPermi(['standard:standardLibrary:upStandardProduct'])
- "
- v-model="scope.row.ask"
- :autosize="{ minRows: 1, maxRows: 3 }"
- clearable
- placeholder="瑕佹眰鍊�"
size="small"
- type="textarea"
+ placeholder="瑕佹眰鍊�"
+ v-model="scope.row.ask"
+ clearable
@change="(value) => upStandardProductList(value, scope.row.id)"
+ v-if="upStandardProduct"
+ type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3 }"
></el-input>
<span v-else>{{ scope.row.ask }}</span>
</template>
</el-table-column>
- <el-table-column label="瑕佹眰鎻忚堪" min-width="220px" prop="tell">
+ <el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px">
<template slot-scope="scope">
<el-input
- v-if="
- checkPermi(['standard:standardLibrary:upStandardProduct'])
- "
- v-model="scope.row.tell"
- :autosize="{ minRows: 1, maxRows: 3 }"
- clearable
- placeholder="瑕佹眰鎻忚堪"
size="small"
- type="textarea"
+ placeholder="瑕佹眰鎻忚堪"
+ v-model="scope.row.tell"
+ clearable
@change="
(value) => upStandardProductListOfTell(value, scope.row.id)
"
+ v-if="upStandardProduct"
+ type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3 }"
></el-input>
<span v-else>{{ scope.row.ask }}</span>
</template>
</el-table-column>
- <el-table-column label="璇曢獙鏂规硶" prop="method" width="200">
+ <el-table-column prop="method" label="璇曢獙鏂规硶" width="200">
<template slot-scope="scope">
<el-select
- v-if="
- checkPermi(['standard:standardLibrary:upStandardProduct'])
- "
v-model="scope.row.methodS"
- clearable
- placeholder="璇曢獙鏂规硶"
size="small"
+ placeholder="璇曢獙鏂规硶"
@change="
(value) => upStandardProductListOfMethodS(value, scope.row.id)
"
+ v-if="upStandardProduct"
>
<el-option
- v-for="(a, i) in scope.row.method &&
- JSON.parse(scope.row.method)"
+ v-for="(a, i) in JSON.parse(scope.row.method)"
:key="i"
:label="a"
:value="a"
@@ -468,90 +432,54 @@
</template>
</el-table-column>
<el-table-column
- label="鏉′欢"
- min-width="140"
- prop="radius"
- show-overflow-tooltip
- >
- <template slot-scope="scope">
- <el-select
- v-if="
- checkPermi(['standard:standardLibrary:upStandardProduct'])
- "
- v-model="scope.row.radius"
- clearable
- placeholder="鏉′欢"
- size="small"
- @change="
- (value) => upStandardProductListOfRadius(value, scope.row.id)
- "
- >
- <el-option
- v-for="(a, i) in scope.row.radiusList &&
- JSON.parse(scope.row.radiusList)"
- :key="i"
- :label="a"
- :value="a"
- ></el-option>
- </el-select>
- <span v-else>{{ scope.row.radius }}</span>
- </template>
- </el-table-column>
- <el-table-column
- label="璁￠噺鍗曚綅"
prop="unit"
- show-overflow-tooltip
+ label="璁￠噺鍗曚綅"
width="100"
+ show-overflow-tooltip
></el-table-column>
- <el-table-column label="鍗曚环(鍏�)" prop="price" width="120">
+ <el-table-column prop="price" label="鍗曚环(鍏�)" width="120">
<template slot-scope="scope">
<el-input
- v-if="
- checkPermi(['standard:standardLibrary:upStandardProduct'])
- "
v-model="scope.row.price"
- placeholder="鍗曚环(鍏�)"
size="small"
+ placeholder="鍗曚环(鍏�)"
@change="
(value) => upStandardProductListOfPrice(value, scope.row.id)
"
+ v-if="upStandardProduct"
>
</el-input>
<span v-else>{{ scope.row.price }}</span>
</template>
</el-table-column>
- <el-table-column label="宸ユ椂绯绘暟" prop="manHour" width="120">
+ <el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="120">
<template slot-scope="scope">
<el-input
- v-if="
- checkPermi(['standard:standardLibrary:upStandardProduct'])
- "
v-model="scope.row.manHour"
- placeholder="鍗曚环(鍏�)"
size="small"
+ placeholder="宸ユ椂绯绘暟"
@change="
(value) => upStandardProductListOfManHour(value, scope.row.id)
"
+ v-if="upStandardProduct"
>
</el-input>
<span v-else>{{ scope.row.manHour }}</span>
</template>
</el-table-column>
<el-table-column
- label="宸ユ椂鍒嗙粍"
prop="manHourGroup"
- show-overflow-tooltip
+ label="宸ユ椂鍒嗙粍"
width="100"
+ show-overflow-tooltip
></el-table-column>
- <el-table-column label="妯℃澘" prop="templateId" width="200">
+ <el-table-column prop="templateId" label="妯℃澘" width="200">
<template slot-scope="scope">
<el-select
v-model="scope.row.templateId"
- :disabled="
- !checkPermi(['standard:standardLibrary:upStandardProduct'])
- "
- filterable
size="small"
+ filterable
+ :disabled="!upStandardProduct"
@change="
(value) =>
upStandardProductListOfTemplate(value, scope.row.id)
@@ -567,46 +495,65 @@
</template>
</el-table-column>
<el-table-column
- label="鍖洪棿"
prop="section"
- show-overflow-tooltip
+ label="鍖洪棿"
width="120"
+ show-overflow-tooltip
></el-table-column>
- <el-table-column label="鎿嶄綔" prop="section" width="160">
+ <el-table-column prop="section" label="鎿嶄綔" width="120">
<template slot-scope="scope">
<el-button type="text" @click="sectionUp(scope.row)"
>鍖洪棿璁剧疆</el-button
- >
- <el-button
- type="text"
- @click="bindSupplierDensitySecond(scope.row)"
- >缁戝畾鍘傚</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination
- :current-page="currentPage"
- :page-size="300"
- :total="total"
- layout="total, prev, pager, next, jumper"
style="position: absolute; right: 16px; bottom: 1px"
@current-change="handleCurrentChange"
+ :current-page="currentPage"
+ layout="total, prev, pager, next, jumper"
+ :page-size="50"
+ :total="total"
>
</el-pagination>
</el-row>
</div>
- <el-dialog :visible.sync="addDia" title="鍒嗙被娣诲姞" width="400px">
+ <el-dialog title="鍒嗙被娣诲姞" :visible.sync="addDia" width="400px">
<div class="body">
+ <!-- <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">宸ュ巶锛�</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input size="small" readonly v-model="addOb.factory"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">瀹為獙瀹わ細</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input size="small" readonly v-model="addOb.laboratory"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">鏍峰搧澶х被锛�</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input size="small" readonly v-model="addOb.sampleType"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">鏍峰搧鍚嶇О锛�</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input v-model="addOb.sample" readonly size="small"></el-input>
+ </el-col>
+ </el-row> -->
<el-row style="line-height: 50px">
<el-col :span="6" style="text-align: right">
<span class="required-span">* </span>鍨嬪彿锛�
</el-col>
- <el-col :offset="1" :span="16">
+ <el-col :span="16" :offset="1">
<el-input
v-model="addOb.model"
- clearable
placeholder="璇疯緭鍏ュ瀷鍙�"
+ clearable
size="small"
@keyup.enter.native="addStandardTree"
></el-input>
@@ -615,43 +562,17 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="addDia = false">鍙� 娑�</el-button>
- <el-button :loading="addLoad" type="primary" @click="addStandardTree"
- >纭� 瀹�</el-button
- >
- </span>
- </el-dialog>
- <el-dialog :visible.sync="updateDia" title="鍒嗙被淇敼" width="400px">
- <div class="body">
- <el-row style="line-height: 50px">
- <el-col :span="6" style="text-align: right">
- <span class="required-span">* </span>鍨嬪彿锛�
- </el-col>
- <el-col :offset="1" :span="16">
- <el-input
- v-model="addOb.model"
- clearable
- placeholder="璇疯緭鍏ュ瀷鍙�"
- size="small"
- @keyup.enter.native="updateStandardTree"
- ></el-input>
- </el-col>
- </el-row>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="updateDia = false">鍙� 娑�</el-button>
- <el-button
- :loading="updateLoad"
- type="primary"
- @click="updateStandardTree"
+ <el-button type="primary" @click="addStandardTree" :loading="addLoad"
>纭� 瀹�</el-button
>
</span>
</el-dialog>
<el-dialog
- :visible.sync="moreEdit"
- class="more-edit"
title="鎵归噺缂栬緫"
+ top="5vh"
+ :visible.sync="moreEdit"
width="90%"
+ class="more-edit"
>
<div
class="body"
@@ -666,10 +587,10 @@
>
<el-col :span="16">
<el-input
- v-model="moreInfo.ask"
- :disabled="moreSelects.length == 0"
- clearable
size="small"
+ v-model="moreInfo.ask"
+ clearable
+ :disabled="moreSelects.length == 0"
></el-input>
</el-col>
</el-row>
@@ -683,12 +604,12 @@
style="display: flex; align-items: flex-start; height: 100%"
>
<el-input
- v-model="moreInfo.tell"
- :autosize="{ minRows: 1, maxRows: 3 }"
- :disabled="moreSelects.length == 0"
- clearable
size="small"
+ clearable
type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3 }"
+ v-model="moreInfo.tell"
+ :disabled="moreSelects.length == 0"
></el-input>
</el-col>
</el-row>
@@ -700,11 +621,11 @@
<el-col :span="16">
<el-select
v-model="moreInfo.methodS"
+ size="small"
+ filterable
+ style="width: 100%"
:disabled="moreSelects.length == 0"
clearable
- filterable
- size="small"
- style="width: 100%"
>
<el-option
v-for="(a, ai) in methodList"
@@ -722,10 +643,10 @@
>
<el-col :span="16">
<el-input
- v-model="moreInfo.price"
- :disabled="moreSelects.length == 0"
- clearable
size="small"
+ v-model="moreInfo.price"
+ clearable
+ :disabled="moreSelects.length == 0"
></el-input>
</el-col>
</el-row>
@@ -736,10 +657,10 @@
>
<el-col :span="16">
<el-input
- v-model="moreInfo.manHour"
- :disabled="moreSelects.length == 0"
- clearable
size="small"
+ v-model="moreInfo.manHour"
+ clearable
+ :disabled="moreSelects.length == 0"
></el-input>
</el-col>
</el-row>
@@ -751,11 +672,11 @@
<el-col :span="16">
<el-select
v-model="moreInfo.templateId"
- :disabled="moreSelects.length == 0"
+ size="small"
filterable
placeholder="妯℃澘"
- size="small"
style="width: 100%"
+ :disabled="moreSelects.length == 0"
>
<el-option
v-for="(a, ai) in templateList"
@@ -771,152 +692,151 @@
<el-col :span="16">
<el-select
v-model="moreInfo.state"
+ size="small"
+ filterable
+ placeholder="鏄惁鍚敤"
+ style="width: 100%"
:disabled="moreSelects.length == 0"
clearable
- filterable
- placeholder="妯℃澘"
- size="small"
- style="width: 100%"
>
- <el-option :value="1" label="鍚敤"></el-option>
- <el-option :value="0" label="涓嶅惎鐢�"></el-option>
+ <el-option label="鍚敤" :value="1"></el-option>
+ <el-option label="涓嶅惎鐢�" :value="0"></el-option>
</el-select>
</el-col>
</el-row>
<el-row style="width: 100%; margin-top: 8px">
<el-col
:span="24"
- style="display: flex; align-items: center; justify-content: end"
+ style="
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ "
>
- <el-button size="small" type="danger" @click="clearProduct(1)"
+ <el-button @click="clearProduct(1)" size="small" type="danger"
>閲嶇疆鍗曚环</el-button
>
- <el-button size="small" type="danger" @click="clearProduct(2)"
+ <el-button @click="clearProduct(2)" size="small" type="danger"
>閲嶇疆宸ユ椂绯绘暟</el-button
>
<el-button
- size="small"
type="primary"
+ size="small"
@click="sectionUp(moreSelects)"
>璁剧疆鍖洪棿</el-button
>
- <el-button size="small" @click="moreEdit = false"
+ <el-button @click="moreEdit = false" size="small"
>鍙� 娑�</el-button
>
<el-button
- :loading="moreEditLoad"
- size="small"
type="primary"
@click="subMoreEdit"
+ :loading="moreEditLoad"
+ size="small"
>淇� 瀛�</el-button
>
</el-col>
</el-row>
</div>
</div>
- <div v-loading="productTableLoading0" style="flex: 1; overflow-y: auto">
+ <div style="flex: 1; overflow-y: auto" v-loading="productTableLoading0">
<el-table
- ref="productTable0"
:data="productList0"
- :fit="true"
- :row-key="(row) => row.id"
- border
- header-row-class-name="header-class"
- height="96%"
- highlight-current-row
- stripe
+ ref="productTable0"
style="width: 100%"
+ height="96%"
tooltip-effect="dark"
- @select="handleSelectionChange0"
+ stripe
+ :fit="true"
+ border
@select-all="handleSelectAll0"
+ @select="handleSelectionChange0"
+ header-row-class-name="header-class"
+ :row-key="(row) => row.id"
@filter-change="filterHandler"
+ highlight-current-row
>
<el-table-column type="selection" width="50"> </el-table-column>
<el-table-column
+ prop="sample"
label="浜у搧"
min-width="100"
- prop="sample"
show-overflow-tooltip
></el-table-column>
<el-table-column
+ prop="model"
label="鍨嬪彿"
min-width="100"
- prop="model"
show-overflow-tooltip
></el-table-column>
<el-table-column
- :filter-multiple="false"
- :filters="filters0"
- column-key="inspectionItem"
- filter-placement="bottom-start"
+ prop="inspectionItem"
label="妫�楠岄」"
min-width="140"
- prop="inspectionItem"
show-overflow-tooltip
+ :filters="filters0"
+ :filter-multiple="false"
+ column-key="inspectionItem"
+ filter-placement="bottom-start"
></el-table-column>
<el-table-column
- :filter-multiple="false"
- :filters="filters1"
- column-key="inspectionItemSubclass"
- filter-placement="bottom-start"
+ prop="inspectionItemSubclass"
label="妫�楠岄」瀛愰」"
min-width="140"
- prop="inspectionItemSubclass"
show-overflow-tooltip
+ :filters="filters1"
+ :filter-multiple="false"
+ column-key="inspectionItemSubclass"
+ filter-placement="bottom-start"
></el-table-column>
<el-table-column
+ prop="sonLaboratory"
+ label="瀛愬疄楠屽"
+ width="130"
+ show-overflow-tooltip
+ :filters="dict.type.sys_sub_lab"
:filter-multiple="false"
- :filters="filters"
column-key="sonLaboratory"
filter-placement="bottom-start"
- label="瀛愬疄楠屽"
- prop="sonLaboratory"
- show-overflow-tooltip
- width="130"
></el-table-column>
<el-table-column
+ prop="ask"
label="瑕佹眰鍊�"
min-width="200px"
- prop="ask"
></el-table-column>
<el-table-column
+ prop="tell"
label="瑕佹眰鎻忚堪"
min-width="220px"
- prop="tell"
></el-table-column>
<el-table-column
- label="璇曢獙鏂规硶"
prop="methodS"
+ label="璇曢獙鏂规硶"
width="200"
></el-table-column>
<el-table-column
- label="鏉′欢"
- prop="radius"
- width="200"
- ></el-table-column>
- <el-table-column
- label="璁￠噺鍗曚綅"
prop="unit"
- show-overflow-tooltip
+ label="璁￠噺鍗曚綅"
width="100"
+ show-overflow-tooltip
></el-table-column>
<el-table-column
- label="鍗曚环(鍏�)"
prop="price"
+ label="鍗曚环(鍏�)"
width="120"
></el-table-column>
<el-table-column
- label="宸ユ椂绯绘暟"
prop="manHour"
+ label="宸ユ椂绯绘暟"
width="120"
></el-table-column>
<el-table-column
- label="宸ユ椂鍒嗙粍"
prop="manHourGroup"
- show-overflow-tooltip
+ label="宸ユ椂鍒嗙粍"
width="100"
+ show-overflow-tooltip
></el-table-column>
- <el-table-column label="妯℃澘" prop="templateId" width="200">
+ <el-table-column prop="templateId" label="妯℃澘" width="200">
<template slot-scope="scope">
{{
templateList.find((item) => item.id == scope.row.templateId)
@@ -928,113 +848,126 @@
</template>
</el-table-column>
<el-table-column
- label="鍖洪棿"
prop="section"
- show-overflow-tooltip
+ label="鍖洪棿"
width="120"
+ show-overflow-tooltip
></el-table-column>
</el-table>
<el-pagination
- :current-page="currentPage0"
- :page-size="100"
- :total="total0"
- layout="total, prev, pager, next, jumper"
style="position: absolute; right: 16px; bottom: 4px"
@current-change="handleCurrentChange0"
+ :current-page="currentPage0"
+ layout="total, prev, pager, next, jumper"
+ :page-size="100"
+ :total="total0"
>
</el-pagination>
</div>
</div>
</el-dialog>
<el-dialog
- :close-on-click-modal="false"
- :visible.sync="sectionUpDia"
title="鍖洪棿璁剧疆"
- width="80%"
+ :visible.sync="sectionUpDia"
+ width="70%"
+ :close-on-click-modal="false"
>
+ <div style="width: 100%; text-align: left">
+ <el-button
+ id="copyBtn"
+ v-if="sectionList.length > 0"
+ :data-clipboard-text="JSON.stringify(sectionList)"
+ type="primary"
+ size="mini"
+ @click="copySectionConfig"
+ >澶嶅埗鍖洪棿璁剧疆</el-button
+ >
+ <el-button type="primary" size="mini" @click="openImportSectionsConfig"
+ >瀵煎叆鍖洪棿璁剧疆</el-button
+ >
+ <el-dialog
+ :visible.sync="importSectionsConfigDia"
+ width="30%"
+ title="瀵煎叆鍖洪棿閰嶇疆"
+ >
+ <el-input
+ type="textarea"
+ :rows="3"
+ v-model="sectionsConfigText"
+ ></el-input>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="importSectionsConfigDia = false"
+ >鍙� 娑�</el-button
+ >
+ <el-button type="primary" @click="confirmImportConfig"
+ >纭</el-button
+ >
+ </span>
+ </el-dialog>
+ </div>
<div class="body" style="padding: 5px 0">
- <el-table :data="sectionList" border height="350px" style="width: 100%">
- <el-table-column align="center" label="搴忓彿" type="index" width="70">
+ <el-table :data="sectionList" border style="width: 100%" height="350px">
+ <el-table-column type="index" label="搴忓彿" width="70" align="center">
</el-table-column>
- <el-table-column align="center" label="鍖洪棿">
+ <el-table-column label="鍖洪棿" align="center">
<template slot-scope="scope">
<el-input
+ size="small"
v-model="scope.row.thing"
clearable
placeholder="鍖洪棿"
- size="small"
></el-input>
</template>
</el-table-column>
- <el-table-column align="center" label="鑺暟">
+ <el-table-column label="瑕佹眰鍊�" align="center">
<template slot-scope="scope">
<el-input
- v-model="scope.row.cores"
- clearable
- placeholder="鑺暟"
size="small"
- ></el-input>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瑕佹眰鍊�">
- <template slot-scope="scope">
- <el-input
v-model="scope.row.ask"
clearable
placeholder="瑕佹眰鍊�"
- size="small"
></el-input>
</template>
</el-table-column>
- <el-table-column align="center" label="瑕佹眰鎻忚堪">
+ <el-table-column label="瑕佹眰鎻忚堪" align="center">
<template slot-scope="scope">
<el-input
- v-model="scope.row.tell"
- :autosize="{ minRows: 1, maxRows: 2 }"
- clearable
+ size="small"
placeholder="瑕佹眰鎻忚堪"
- size="small"
+ v-model="scope.row.tell"
+ clearable
type="textarea"
+ :autosize="{ minRows: 1, maxRows: 2 }"
></el-input>
</template>
</el-table-column>
- <el-table-column align="center" label="瀵间綋鏉愯川">
+ <el-table-column label="鍗曚环" align="center" width="120">
<template slot-scope="scope">
<el-input
- v-model="scope.row.conductorMaterial"
- clearable
- placeholder="瀵间綋鏉愯川"
size="small"
+ v-model="scope.row.price"
+ clearable
+ placeholder="鍗曚环"
></el-input>
</template>
</el-table-column>
- <el-table-column align="center" label="瀵间綋绫诲瀷">
+ <el-table-column label="宸ユ椂绯绘暟" align="center" width="120">
<template slot-scope="scope">
<el-input
- v-model="scope.row.conductorType"
- clearable
- placeholder="瀵间綋绫诲瀷"
size="small"
+ v-model="scope.row.manHour"
+ clearable
+ placeholder="宸ユ椂绯绘暟"
></el-input>
</template>
</el-table-column>
- <!-- <el-table-column align="center" label="鍗曚环" width="120">-->
- <!-- <template slot-scope="scope">-->
- <!-- <el-input v-model="scope.row.price" clearable placeholder="鍗曚环" size="small"></el-input>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column align="center" label="宸ユ椂绯绘暟" width="120">-->
- <!-- <template slot-scope="scope">-->
- <!-- <el-input v-model="scope.row.manHour" clearable placeholder="宸ユ椂绯绘暟" size="small"></el-input>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column align="center" label="鎿嶄綔" width="70">
+ <el-table-column label="鎿嶄綔" width="70" align="center">
<template slot-scope="scope">
<el-button
- circle
- icon="el-icon-minus"
size="mini"
type="danger"
+ icon="el-icon-minus"
+ circle
@click="sectionList.splice(scope.$index, 1)"
></el-button>
</template>
@@ -1043,33 +976,37 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="sectionUpDia = false">鍙� 娑�</el-button>
- <el-button :loading="sectionLoad" type="primary" @click="sectionLoadAdd"
+ <el-button type="primary" @click="sectionLoadAdd" :loading="sectionLoad"
>淇� 瀛�</el-button
>
<el-button
- icon="el-icon-plus"
type="primary"
- @click="sectionList.push({ thing: '' })"
+ @click="
+ sectionList.push({
+ thing: '',
+ price: sectionRow.price,
+ manHour: sectionRow.manHour,
+ })
+ "
+ icon="el-icon-plus"
></el-button>
</span>
</el-dialog>
- <el-dialog :visible.sync="uploadDia" title="鏁版嵁瀵煎叆" width="500px">
+ <el-dialog title="鏁版嵁瀵煎叆" :visible.sync="uploadDia" width="500px">
<div style="margin: 0 auto">
<el-upload
ref="upload"
- :action="
- VUE_APP_BASE_API + '/standardTree/inExcelOfTree/' + isEquipment
- "
- :auto-upload="false"
+ drag
+ :action="javaApi + '/standardTree/inExcelOfTree' + '/' + 'false'"
+ :headers="uploadHeader"
:file-list="fileList"
- :headers="token"
+ name="file"
+ :auto-upload="false"
+ accept=".xlsx"
:limit="1"
:on-change="beforeUpload"
- :on-error="onError"
:on-success="onSuccess"
- accept=".xlsx"
- drag
- name="file"
+ :on-error="onError"
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
@@ -1077,26 +1014,17 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="uploadDia = false">鍙� 娑�</el-button>
- <el-button :loading="uploading" type="primary" @click="submitUpload()"
+ <el-button type="primary" @click="submitUpload()" :loading="uploading"
>涓� 浼�</el-button
>
</span>
</el-dialog>
- <!-- <bindSupplierDensityDialogAsk v-if="bindSupplierDensityDialog"
- :bindSupplierDensityDialog="bindSupplierDensityDialog"
- :currentRow="currentSupplierDensityRow"
- @closeBindPartDialog="closeBindSupplierDensityDialog"></bindSupplierDensityDialogAsk> -->
- <!-- <BatchCopy v-if="batchCopyDia" ref="BatchCopy" :selectTree1="selectTree"
- :standardId="standardId" @refreshList="refreshList"></BatchCopy> -->
</div>
</template>
<script>
-import Sortable from "sortablejs";
-import draggable from "vuedraggable";
+import Clipboard from "../../../../public/js/clipboard.min.js";
import {
- updateTreeSort,
- resetTreeDragBatch,
delStandardTree,
selectStandardTreeList,
obtainItemParameterList,
@@ -1104,41 +1032,27 @@
selectStandardMethods,
addStandardMethodList,
addStandardTree,
- updateStandardTree,
- selectsStandardMethodByFLSSM,
upStandardProductList,
delStandardMethodByFLSSM,
delStandardProductByIds,
- addStandardProduct,
selectStandardProductListByMethodId,
- updateSection,
- upStandardProducts,
getStandardTemplate,
- selectStandardProductByMethodId,
- selectStandardProductEnumByMethodId,
resetTreeOfPrice,
resetTreeOfHour,
-} from "@/api/standard/standardLibrary";
-import { checkPermi } from "@/utils/permission"; // 鏉冮檺鍒ゆ柇鍑芥暟
-// import bindSupplierDensityDialogAsk from "../do/a5-capacity-scope/bindSupplierDensityDialogAsk.vue";
-// import BatchCopy from "../do/a5-capacity-scope/BatchCopy.vue";
+ selectsStandardMethodByFLSSM,
+} from "@/api/standard/standardLibrary.js";
+
export default {
- components: {
- // BatchCopy,
- // bindSupplierDensityDialogAsk,
- draggable,
- },
- dicts: ["sys_factory", "sys_sub_lab", "sys_samp_type"],
+ dicts: ["sys_sub_lab"],
data() {
return {
- tableKey: "productList",
+ importSectionsConfigDia: false,
+ sectionsConfigText: "", //瀵煎叆鐨勫尯闂撮厤缃枃鏈�
search: null,
list: [],
selectTree: "",
- factory: [],
+ // factory: [],
addDia: false,
- updateDia: false, // 淇敼鏍戝悕瀛楀脊妗�
- oldModel: "",
addOb: {
factory: null,
laboratory: null,
@@ -1148,26 +1062,30 @@
},
laboratory: [],
addLoad: false,
- updateLoad: false,
- sampleType: [],
+ // sampleType: [],
sample: [],
treeLoad: false,
- addPower: false,
+ addPower: true,
standardList: [],
standardEnum: [],
addStandardDia: false,
+ standardId: null,
+ addStandardMethod: true,
addLoad2: false,
productList: [],
- productTableLoading: false,
tableLoad: false,
tableLoad2: false,
+ upStandardProduct: false,
+ delStandardMethod: false,
selects: [],
+ delStandardProduct: false,
addProductDia: false,
productId: null,
+ addStandardProduct: false,
addLoad3: false,
productEnum: [],
expandedKeys: [],
- filters: [],
+ // filters: [],
sectionUpDia: false,
sectionLoad: false,
sectionRow: null,
@@ -1200,17 +1118,10 @@
inspectionItemSubclass: null,
sonLaboratory: null,
uploadDia: false,
- token: null,
fileList: [],
+ inExcelOfTreePower: true,
uploading: false,
- isEquipment: true,
- isHaveChildren: {},
- sortTable: null,
- currentSupplierDensityRow: {}, // 閫夋嫨闆朵欢缁戝畾鏈潯鏁版嵁鐨勪俊鎭�
- bindSupplierDensityDialog: false,
- isShowCopy: false,
- batchCopyDia: false,
- VUE_APP_BASE_API: process.env.VUE_APP_BASE_API,
+ isEquipment: false,
};
},
watch: {
@@ -1232,105 +1143,73 @@
},
},
mounted() {
- this.selectEnumByCategoryForFactory();
+ // this.getPower();
+ // this.selectEnumByCategoryForFactory();
this.selectStandardTreeList();
this.obtainItemParameterList();
+ // this.selectEnumByCategoryForsampleType()
this.selectTestObjectByName();
this.selectStandardMethods();
- this.selectEnumByCategoryForSonLaboratory();
+ // this.selectEnumByCategoryForDevice();
+ // this.selectEnumByCategory();
+ // this.selectEnumByCategoryForValue();
+ // this.selectEnumByCategoryForSpecial();
+ // this.selectEnumByCategoryForInspectionValueType();
+ // this.selectEnumByCategoryForSonLaboratory();
this.getStandardTemplate();
- this.selectStandardMethodsSec();
- this.token = {
- token: sessionStorage.getItem("token"),
- };
+ this.selectStandardMethods();
},
methods: {
- checkPermi,
- // 淇敼鏈�瀛愮骇鍚嶅瓧
- editTreeName(info) {
- this.updateDia = true;
- this.oldModel = info.label;
- },
- // 鎷栨嫿鏃跺垽瀹氱洰鏍囪妭鐐硅兘鍚﹁鏀剧疆
- // 'prev'銆�'inner' 鍜� 'next'锛屽墠銆佹彃鍏ャ�佸悗
- allowDrop(draggingNode, dropNode, type) {
- if (draggingNode.level !== 3) return;
- if (draggingNode.data.level === dropNode.data.level) {
- if (draggingNode.data.parentId === dropNode.data.parentId) {
- return type === "prev" || type === "next";
- } else {
- return false;
- }
- } else {
- // 涓嶅悓绾ц繘琛屽鐞�
- return false;
- }
- },
- // tree鎷栨嫿鎴愬姛瀹屾垚鏃惰Е鍙戠殑浜嬩欢
- handleDrop(draggingNode, dropNode, dropType, ev) {
- try {
- this.treeLoad = true;
- updateTreeSort(this.list).then((res) => {
- if (res.code === 200) {
- this.$message.success("鎿嶄綔鎴愬姛");
+ confirmImportConfig() {},
+ openImportSectionsConfig() {
+ // this.importSectionsConfigDia = true
+ this.$confirm("纭瀵煎叆澶嶅埗鐨勫尯闂撮厤缃�?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ if (
+ this.sectionsConfigText == null ||
+ this.sectionsConfigText == "" ||
+ this.sectionsConfigText == undefined
+ ) {
+ this.$message.error("鏈瘑鍒埌鍓垏鏉跨殑鏈夋晥鏂囨湰");
+ return;
+ } else {
+ let parseConfig = JSON.parse(this.sectionsConfigText);
+ if (!Array.isArray(parseConfig)) {
+ this.$message.error("閿欒鐨勬暟鎹牸寮�");
+ return;
+ }
+ parseConfig.forEach((ele) => {
+ this.sectionList.push(ele);
+ });
+ this.$message.success("瀵煎叆鎴愬姛");
}
- this.treeLoad = false;
- });
- } catch (e) {
- this.treeLoad = false;
- console.log("e----", e);
- }
+ })
+ .catch(() => {});
},
- rowDrop(methodId) {
- const that = this;
- const tbody = document.querySelector(
- "#templateParamTable .el-table__body-wrapper tbody"
- );
- if (!this.sortTable) {
- this.sortTable = Sortable.create(tbody, {
- animation: 200, //鍔ㄧ敾鏃堕暱
- handle: ".el-table__row", //鍙嫋鎷藉尯鍩焎lass
- //鎷栨嫿涓簨浠�
- onMove: ({ dragged, related }) => {
- const oldRow = that.productList[dragged.rowIndex]; //鏃т綅缃暟鎹�
- const newRow = that.productList[related.rowIndex]; //琚嫋鎷界殑鏂版暟鎹�
- },
- //鎷栨嫿缁撴潫浜嬩欢
- onEnd: (evt) => {
- const curRow = that.productList.splice(evt.oldIndex, 1)[0]; // 褰撳墠琚嫋鎷界殑淇℃伅
- that.productList.splice(evt.newIndex, 0, curRow);
- let arr = [];
- this.productList.forEach((item, index) => {
- const obj = Object.assign({
- sort: index,
- id: item.id,
- });
- arr.push(obj);
- });
- this.productTableLoading = true;
- // 鎷栨嫿瀹屾垚鍚庝紶缁欏悗绔繚瀛樻暟鎹�
- resetTreeDragBatch({ params: arr }).then((res) => {
- if (res.code === 200) {
- this.$message.success("淇濆瓨鎴愬姛");
- }
- this.productTableLoading = false;
- });
- },
- });
- }
- },
- hasChildWithId(nodes, name) {
- for (let node of nodes) {
- const comName = node.label + node.code;
- if (comName == name) {
- //鍒ゆ柇閫掑綊缁撴潫鏉′欢
- this.isHaveChildren = node;
- return node;
- } else if (node.children && node.children.length > 0) {
- //鍒ゆ柇children鏄惁鏈夋暟鎹�
- this.hasChildWithId(node.children, name); //閫掑綊璋冪敤
- }
- }
+ //澶嶅埗鍖洪棿閰嶇疆
+ copySectionConfig() {
+ // 鍒涘缓 clipboard 瀹炰緥,鑾峰彇鎸夐挳鍏冪礌
+ let clipboard = new Clipboard("#copyBtn");
+ /* 娉ㄦ剰姝や簨浠剁洃鍚槸寮傛鐨� */
+ clipboard.on("success", (e) => {
+ this.sectionsConfigText = e.text;
+ e.clearSelection();
+ // 閲婃斁鍐呭瓨
+ clipboard.destroy();
+ // 澶嶅埗鎴愬姛鎻愮ず
+ this.$message.success("宸插鍒跺埌鍓创鏉�");
+ });
+ // 澶嶅埗澶辫触
+ clipboard.on("error", (e) => {
+ // 閲婃斁鍐呭瓨
+ clipboard.destroy();
+ // 澶嶅埗澶辫触鎻愮ず
+ this.$message.error("澶嶅埗澶辫触");
+ });
},
filterNode(value, data) {
if (!value) return true;
@@ -1344,11 +1223,6 @@
},
handleNodeClick(val, node, el) {
//鏍戠殑鍊�
- if (node.childNodes.length === 0) {
- this.isShowCopy = true;
- } else {
- this.isShowCopy = false;
- }
this.total = 0;
this.currentPage = 1;
this.selectTree = "";
@@ -1360,9 +1234,7 @@
data2 += " - " + data[index];
}
this.selectTree = data2.replace(" - ", "");
- if (node.childNodes.length === 0) {
- this.selectsStandardMethodByFLSSM();
- }
+ this.selectsStandardMethodByFLSSM();
let trees = this.selectTree.split(" - ");
this.addOb.factory = trees[0];
this.addOb.laboratory = trees[1];
@@ -1394,11 +1266,12 @@
data2 += " - " + data[index];
}
this.selectTree = data2.replace(" - ", "");
- delStandardTree({ tree: this.selectTree }).then((res) => {
+ delStandardTree({ tree: this.selectTre }).then((res) => {
if (res.code == 201) return;
this.$message.success("宸插垹闄�");
let arr = this.selectTree.split(" - ");
this.deleteStandard(this.list, arr[arr.length - 1]);
+ // this.selectStandardTreeList()
this.selectTree = "";
this.standardList = [];
this.productList = [];
@@ -1415,37 +1288,85 @@
}
});
},
- 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");
- },
- selectEnumByCategoryForFactory() {
- this.getConfigKey("sys_factory").then((response) => {
- this.factory = response.msg;
- });
- },
- selectEnumByCategoryForSonLaboratory() {
- let arr = [];
- this.getConfigKey("sys_sub_lab").then((response) => {
- arr = response.msg;
- });
- arr.forEach((a) => {
- this.filters.push({
- text: a.label,
- value: a.value,
- });
- });
- },
- selectEnumByCategoryForsampleType() {
- this.getConfigKey("sys_samp_type").then((response) => {
- this.sampleType = response.msg;
- });
- },
+ // selectEnumByCategoryForFactory() {
+ // this.$axios
+ // .post(this.$api.enums.selectEnumByCategory, {
+ // category: "宸ュ巶",
+ // })
+ // .then((res) => {
+ // this.factory = res.data;
+ // });
+ // },
+ // selectEnumByCategoryForSonLaboratory() {
+ // this.$axios
+ // .post(this.$api.enums.selectEnumByCategory, {
+ // category: "瀛愬疄楠屽",
+ // })
+ // .then((res) => {
+ // this.factory = [];
+ // res.data.forEach((a) => {
+ // this.filters.push({
+ // text: a.label,
+ // value: a.value,
+ // });
+ // });
+ // });
+ // },
+ // selectEnumByCategoryForsampleType() {
+ // this.$axios
+ // .post(this.$api.enums.selectEnumByCategory, {
+ // category: "鏍峰搧澶х被",
+ // })
+ // .then((res) => {
+ // this.sampleType = res.data;
+ // });
+ // },
+ // selectEnumByCategoryForDevice() {
+ // this.$axios
+ // .post(this.$api.enums.selectEnumByCategory, {
+ // category: "璁惧鍒嗙被",
+ // })
+ // .then((res) => {
+ // this.componentData.tagField.deviceGroup.select = res.data;
+ // });
+ // },
+ // selectEnumByCategory() {
+ // this.$axios
+ // .post(this.$api.enums.selectEnumByCategory, {
+ // category: "妫�楠岄」绫诲瀷",
+ // })
+ // .then((res) => {
+ // res.data[1].type = "info";
+ // this.componentData.tagField.inspectionItemType.select = res.data;
+ // });
+ // },
+ // selectEnumByCategoryForValue() {
+ // this.$axios
+ // .post(this.$api.enums.selectEnumByCategory, {
+ // category: "鍙栧�肩被鍨�",
+ // })
+ // .then((res) => {
+ // this.componentData.tagField.valueType.select = res.data;
+ // });
+ // },
+ // selectEnumByCategoryForSpecial() {
+ // this.$axios
+ // .post(this.$api.enums.selectEnumByCategory, {
+ // category: "鏄惁",
+ // })
+ // .then((res) => {
+ // this.componentData.tagField.bsm.select = res.data;
+ // });
+ // },
+ // selectEnumByCategoryForInspectionValueType() {
+ // this.$axios
+ // .post(this.$api.enums.selectEnumByCategory, {
+ // category: "妫�楠屽�肩被鍨�",
+ // })
+ // .then((res) => {
+ // this.componentData.tagField.inspectionValueType.select = res.data;
+ // });
+ // },
selectStandardTreeList() {
this.treeLoad = true;
selectStandardTreeList().then((res) => {
@@ -1508,7 +1429,6 @@
this.selectsStandardMethodByFLSSM();
});
},
- // 鎻愪氦鍒嗙被娣诲姞
addStandardTree() {
if (this.addOb.sampleType == null || this.addOb.sampleType == "") {
this.$message.error("瀵硅薄涓嶅瓨鍦�");
@@ -1538,38 +1458,11 @@
value: this.addOb.model,
});
this.addLoad = false;
+ this.$tab.refreshPage();
})
.catch((e) => {
this.addDia = false;
this.addLoad = false;
- });
- },
- // 淇敼鍨嬪彿
- updateStandardTree() {
- if (this.addOb.sampleType == null || this.addOb.sampleType == "") {
- this.$message.error("瀵硅薄涓嶅瓨鍦�");
- return;
- }
- if (this.addOb.model == null || this.addOb.model == "") {
- this.$message.error("璇峰～鍐欏瀷鍙�");
- return;
- }
- this.addOb.oldModel = this.oldModel;
- this.updateLoad = true;
- updateStandardTree(this.addOb)
- .then((res) => {
- if (res.code === 201) {
- this.updateLoad = false;
- return;
- }
- this.$message.success("娣诲姞鎴愬姛");
- this.selectStandardTreeList();
- this.updateDia = false;
- this.updateLoad = false;
- })
- .catch((e) => {
- this.updateDia = false;
- this.updateLoad = false;
});
},
selectsStandardMethodByFLSSM() {
@@ -1586,6 +1479,51 @@
this.productList = [];
}
});
+ },
+ getPower() {
+ let power = JSON.parse(sessionStorage.getItem("power"));
+ let add = false;
+ let addStandardMethod = false;
+ let upStandardProduct = false;
+ let delStandardMethod = false;
+ let delStandardProduct = false;
+ let addStandardProduct = false;
+ let delStandardTree = false;
+ let inExcelOfTreePower = false;
+ for (var i = 0; i < power.length; i++) {
+ if (power[i].menuMethod == "addStandardTree") {
+ add = true;
+ }
+ if (power[i].menuMethod == "addStandardMethodList") {
+ addStandardMethod = true;
+ }
+ if (power[i].menuMethod == "upStandardProductList") {
+ upStandardProduct = true;
+ }
+ if (power[i].menuMethod == "delStandardMethodByFLSSM") {
+ delStandardMethod = true;
+ }
+ if (power[i].menuMethod == "delStandardProductByIds") {
+ delStandardProduct = true;
+ }
+ if (power[i].menuMethod == "addStandardProduct") {
+ addStandardProduct = true;
+ }
+ if (power[i].menuMethod == "delStandardTree") {
+ delStandardTree = true;
+ }
+ if (power[i].menuMethod == "inExcelOfTree") {
+ inExcelOfTreePower = true;
+ }
+ }
+ this.addPower = add;
+ this.addStandardMethod = addStandardMethod;
+ this.upStandardProduct = upStandardProduct;
+ this.delStandardMethod = delStandardMethod;
+ this.delStandardProduct = delStandardProduct;
+ this.addStandardProduct = addStandardProduct;
+ this.delStandardTree = delStandardTree;
+ this.inExcelOfTreePower = inExcelOfTreePower;
},
upStandardProductList(value, index) {
upStandardProductList({
@@ -1615,7 +1553,6 @@
this.$message.success("宸蹭繚瀛�");
});
},
- // 鏍囧噯搴撻�夋嫨瀹為獙鏂规硶鐨勫洖璋�
upStandardProductListOfMethodS(value, index) {
upStandardProductList({
str: JSON.stringify({
@@ -1627,22 +1564,7 @@
this.$message.error("鏈繚瀛�");
return;
}
- this.$message.success("宸蹭繚瀛�");
- });
- },
- // 鏍囧噯搴撻�夋嫨鏉′欢鐨勫洖璋�
- upStandardProductListOfRadius(value, index) {
- upStandardProductList({
- str: JSON.stringify({
- id: index,
- radius: value,
- }),
- }).then((res) => {
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
- this.$message.success("宸蹭繚瀛�");
+ // this.$message.success('宸蹭繚瀛�')
});
},
upStandardProductListOfPrice(value, index) {
@@ -1656,7 +1578,7 @@
this.$message.error("鏈繚瀛�");
return;
}
- this.$message.success("宸蹭繚瀛�");
+ // this.$message.success('宸蹭繚瀛�')
});
},
upStandardProductListOfManHour(value, index) {
@@ -1670,7 +1592,7 @@
this.$message.error("鏈繚瀛�");
return;
}
- this.$message.success("宸蹭繚瀛�");
+ // this.$message.success('宸蹭繚瀛�')
});
},
upStandardProductListOfTemplate(value, index) {
@@ -1684,7 +1606,7 @@
this.$message.error("鏈繚瀛�");
return;
}
- this.$message.success("宸蹭繚瀛�");
+ // this.$message.success('宸蹭繚瀛�')
});
},
delStandardMethodByFLSSM(id) {
@@ -1739,38 +1661,31 @@
})
.catch(() => {});
},
- addStandardProductDo() {
- let selects = this.$refs.ValueTable.multipleSelection;
- if (selects.length == 0) {
- this.$message.error("鏈�夋嫨鏁版嵁");
- return;
- }
- let select = [];
- selects.forEach((a) => {
- select.push(a.id);
- });
- this.tableLoad = true;
- addStandardProduct({
- ids: JSON.stringify(select),
- tree: this.selectTree,
- }).then((res) => {
- if (res.code == 201) {
- return;
- }
- this.$message.success("娣诲姞鎴愬姛");
- this.selectsStandardMethodByFLSSM();
- });
- this.addProductDia = false;
- },
- refreshList() {
- this.batchCopyDia = false;
- const index = this.standardList.findIndex(
- (item) => item.id == this.standardId
- );
- if (index > -1) {
- this.rowClick(this.standardList[index]);
- }
- },
+ // addStandardProductDo() {
+ // let selects = this.$refs.ValueTable.multipleSelection;
+ // if (selects.length == 0) {
+ // this.$message.error("鏈�夋嫨鏁版嵁");
+ // return;
+ // }
+ // let select = [];
+ // selects.forEach((a) => {
+ // select.push(a.id);
+ // });
+ // this.tableLoad = true;
+ // this.$axios
+ // .post(this.$api.standardTree.addStandardProduct, {
+ // ids: JSON.stringify(select),
+ // tree: this.selectTree,
+ // })
+ // .then((res) => {
+ // if (res.code == 201) {
+ // return;
+ // }
+ // this.$message.success("娣诲姞鎴愬姛");
+ // this.selectsStandardMethodByFLSSM();
+ // });
+ // this.addProductDia = false;
+ // },
rowClick(row, column, event) {
this.currentPage = 1;
this.tableLoad2 = true;
@@ -1788,31 +1703,6 @@
});
}, 300);
this.tableLoad2 = false;
- const tree = this.selectTree.split(" - ");
- // 閫夋嫨鏈�鍚庝竴灞傛爲鎵嶅彲浠ユ嫋鎷芥帓搴�
- if (tree.length === 4) {
- const name = tree[3] + "[4]";
- this.hasChildWithId(this.list, name);
- if (
- this.isHaveChildren.children &&
- this.isHaveChildren.children.length > 0
- ) {
- if (this.sortTable) {
- this.sortTable.destroy();
- this.sortTable = null;
- }
- return;
- }
- } else if (tree.length < 4) {
- if (this.sortTable) {
- this.sortTable.destroy();
- this.sortTable = null;
- }
- return;
- }
- this.$nextTick(() => {
- this.rowDrop(row.id);
- });
});
},
toggleSelection(row) {
@@ -1876,7 +1766,6 @@
});
}
},
- // 璁剧疆鍖洪棿
sectionUp(row) {
if (Array.isArray(row)) {
// 鍊兼槸涓�涓暟缁�
@@ -1893,96 +1782,55 @@
this.sectionList = [];
if (this.sectionRow.section != null && this.sectionRow.section != "") {
JSON.parse(this.sectionRow.section).forEach((a, ai) => {
- if (this.sectionRow.cores !== null) {
- this.sectionList.push({
- thing: a,
- ask: JSON.parse(this.sectionRow.ask)[ai],
- tell: JSON.parse(this.sectionRow.tell)[ai],
- // price: JSON.parse(this.sectionRow.price)[ai],
- // manHour: JSON.parse(this.sectionRow.manHour)[ai],
- cores: JSON.parse(this.sectionRow.cores)[ai],
- conductorMaterial:
- this.sectionRow.conductorMaterial &&
- JSON.parse(this.sectionRow.conductorMaterial)[ai],
- conductorType:
- this.sectionRow.conductorType &&
- JSON.parse(this.sectionRow.conductorType)[ai],
- });
- } else {
- this.sectionList.push({
- thing: a,
- ask: JSON.parse(this.sectionRow.ask)[ai],
- tell: JSON.parse(this.sectionRow.tell)[ai],
- // price: JSON.parse(this.sectionRow.price)[ai],
- // manHour: JSON.parse(this.sectionRow.manHour)[ai],
- conductorMaterial:
- this.sectionRow.conductorMaterial &&
- JSON.parse(this.sectionRow.conductorMaterial)[ai],
- conductorType:
- this.sectionRow.conductorType &&
- JSON.parse(this.sectionRow.conductorType)[ai],
- });
- }
+ this.sectionList.push({
+ thing: a,
+ ask: JSON.parse(this.sectionRow.ask)[ai],
+ tell: JSON.parse(this.sectionRow.tell)[ai],
+ price: JSON.parse(this.sectionRow.price)[ai],
+ manHour: JSON.parse(this.sectionRow.manHour)[ai],
+ });
});
}
}
},
- // 鎻愪氦鍖洪棿鎵�濉殑鏁版嵁
sectionLoadAdd() {
let sectionList = [];
let askList = [];
let tellList = [];
let priceList = [];
let manHourList = [];
- let coresList = [];
- let conductorMaterialList = [];
- let conductorTypeList = [];
this.sectionList.forEach((a) => {
if (a.thing !== "") {
sectionList.push(a.thing);
askList.push(a.ask);
tellList.push(a.tell);
- // priceList.push(a.price)
- // manHourList.push(a.manHour)
- coresList.push(a.cores);
- conductorMaterialList.push(a.conductorMaterial);
- conductorTypeList.push(a.conductorType);
+ priceList.push(a.price);
+ manHourList.push(a.manHour);
}
});
if (sectionList.length === 0) {
this.sectionRow.section = null;
this.sectionRow.ask = null;
this.sectionRow.tell = null;
- // this.sectionRow.price = null
- // this.sectionRow.manHour = null
- this.sectionRow.cores = null;
- this.sectionRow.conductorMaterial = null;
- this.sectionRow.conductorType = null;
+ this.sectionRow.price = null;
+ this.sectionRow.manHour = null;
} else {
this.sectionRow.section = JSON.stringify(sectionList);
this.sectionRow.ask = JSON.stringify(askList);
this.sectionRow.tell = JSON.stringify(tellList);
- // this.sectionRow.price = JSON.stringify(priceList)
- // this.sectionRow.manHour = JSON.stringify(manHourList)
- this.sectionRow.cores = JSON.stringify(coresList);
- this.sectionRow.conductorMaterial = JSON.stringify(
- conductorMaterialList
- );
- this.sectionRow.conductorType = JSON.stringify(conductorTypeList);
+ this.sectionRow.price = JSON.stringify(priceList);
+ this.sectionRow.manHour = JSON.stringify(manHourList);
}
this.sectionLoad = true;
if (this.moreSelects.length === 0) {
- updateSection({
+ upStandardProductList({
str: JSON.stringify({
id: this.sectionRow.id,
section: this.sectionRow.section,
ask: this.sectionRow.ask,
tell: this.sectionRow.tell,
- // price: this.sectionRow.price,
- // manHour: this.sectionRow.manHour,
- cores: this.sectionRow.cores,
- conductorMaterial: this.sectionRow.conductorMaterial,
- conductorType: this.sectionRow.conductorType,
+ price: this.sectionRow.price,
+ manHour: this.sectionRow.manHour,
}),
}).then((res) => {
this.sectionLoad = false;
@@ -2000,11 +1848,8 @@
section: this.sectionRow.section,
ask: this.sectionRow.ask,
tell: this.sectionRow.tell,
- // price: this.sectionRow.price,
- // manHour: this.sectionRow.manHour,
- cores: this.sectionRow.cores,
- conductorMaterial: this.sectionRow.conductorMaterial,
- conductorType: this.sectionRow.conductorType,
+ price: this.sectionRow.price,
+ manHour: this.sectionRow.manHour,
},
}).then((res) => {
this.sectionLoad = false;
@@ -2021,17 +1866,6 @@
});
});
}
- },
- bindSupplierDensitySecond(row) {
- this.bindSupplierDensity(row);
- },
- // 鎵撳紑鍘傚缁戝畾寮规
- bindSupplierDensity(row) {
- this.currentSupplierDensityRow = row;
- this.bindSupplierDensityDialog = true;
- },
- closeBindSupplierDensityDialog() {
- this.bindSupplierDensityDialog = false;
},
getStandardTemplate() {
getStandardTemplate().then((res) => {
@@ -2055,12 +1889,6 @@
this.tableLoad2 = false;
});
},
- openCopyDia() {
- this.batchCopyDia = true;
- this.$nextTick(() => {
- this.$refs.BatchCopy.getList();
- });
- },
async handleMore() {
if (
(!this.standardId && this.standardId != 0) ||
@@ -2071,7 +1899,7 @@
await this.getList();
this.moreEdit = true;
},
- selectStandardMethodsSec() {
+ selectStandardMethods() {
selectStandardMethods().then((res) => {
let data = [];
res.data.forEach((a) => {
@@ -2108,6 +1936,14 @@
this.rowClick({
id: this.standardId,
});
+ // this.moreInfo = {
+ // ask:'',
+ // tell:'',
+ // methodS:'',
+ // price:'',
+ // manHour:'',
+ // templateId:''
+ // }
});
},
handleSelectAll0(rows) {
--
Gitblit v1.9.3