From 36181abc48c6d890efcc56b0e76d600f6d3ecb7f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期日, 07 四月 2024 15:54:30 +0800
Subject: [PATCH] 完成样品管理接口对接
---
src/components/do/b1-sample/detail.vue | 85 +++++---
src/main.js | 2
src/components/view/b1-sample.vue | 410 +++++++++++++++++++++++++++++++++------------
src/assets/api/controller.js | 10 +
4 files changed, 361 insertions(+), 146 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 84495a7..f26b822 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -188,4 +188,14 @@
const warehouse = {
addWarehouse: "/warehouse/addWarehouse", //娣诲姞浠撳簱
selectWarehouse: "/warehouse/selectWarehouse", //鏌ヨ浠撳簱
+ upWarehouse: "/warehouse/upWarehouse", //淇敼浠撳簱
+ delWarehouse: "/warehouse/delWarehouse", //鍒犻櫎浠撳簱
+ addShelf: "/warehouse/addShelf", //娣诲姞璐ф灦
+ upShelf: "/warehouse/upShelf", //淇敼璐ф灦
+ delShelf: "/warehouse/delShelf", //鍒犻櫎璐ф灦
+ getWarehouse: "/warehouse/getWarehouse", //鏌ヨ璐ф灦涓嬬殑瀛樻斁淇℃伅
+ inWarehouse: "/warehouse/inWarehouse", //鏍峰搧鍏ュ簱
+ outWarehouse: "/warehouse/outWarehouse", //鏍峰搧鍑哄簱
+ getSampleRecord: "/warehouse/getSampleRecord", //鏌ヨ鏍峰搧璇︾粏璁板綍
+ searchSampleId: "/warehouse/searchSampleId", //閫氳繃鏍峰搧缂栧彿杩涜妫�绱�
}
diff --git a/src/components/do/b1-sample/detail.vue b/src/components/do/b1-sample/detail.vue
index 69a72bb..5a07876 100644
--- a/src/components/do/b1-sample/detail.vue
+++ b/src/components/do/b1-sample/detail.vue
@@ -13,14 +13,7 @@
<div class="search_label">鏍峰搧缂栧彿锛�</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
- </div>
- </div>
- <div class="search_thing">
- <div class="search_label">鏍峰搧鏁伴噺锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.sampleCode" disabled></el-input>
</div>
</div>
<div class="search_thing">
@@ -31,67 +24,78 @@
</div>
</div>
<div class="search_thing">
+ <div class="search_label">鏍峰搧鏁伴噺锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="entity.num" disabled></el-input>
+ </div>
+ </div>
+ <div class="search_thing">
<div class="search_label">鍗曚綅锛�</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.unit" disabled></el-input>
</div>
</div>
<div class="search_thing">
<div class="search_label">鍏ュ簱鏃堕棿锛�</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.date" disabled></el-input>
</div>
</div>
<div class="search_thing">
<div class="search_label">鍏ュ簱浜猴細</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.user" disabled></el-input>
</div>
</div>
- <div class="search_thing">
+ <div class="search_thing" >
<div class="search_label">搴撲綅鍙凤細</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="entity.sample" disabled></el-input>
+ v-model="entity.code" disabled style="min-width: 230px;"></el-input>
</div>
</div>
</div>
<h4>妫�楠岄」鐩�</h4>
<div class="table">
- <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border>
+ <el-table class="el-table" ref="productTable" :data="products" height="380px" tooltip-effect="dark" border>
<el-table-column type="index" align="center" label="搴忓彿" width="70" :key="Math.random()">
</el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」" min-width="100"
+ <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="100"
show-overflow-tooltip></el-table-column>
- <el-table-column prop="sonLaboratory" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="method" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="laboratory" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="price" label="璁惧" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manDay" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manHourGroup" label="妫�楠屼汉" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="section" label="妫�楠屾椂闂�" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="ask" label="缁撹" min-width="100">
+ <el-table-column prop="equipValue" label="璁惧" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="entrustCode" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="updateUserName" label="妫�楠屼汉" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="updateTime" label="妫�楠屾椂闂�" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="insResult" label="缁撹" min-width="100">
<template slot-scope="scope">
<el-tag
- :type="scope.row.type" size="medium">{{scope.row.label}}</el-tag>
+ :type="scope.row.insResult==1?'success':'danger'" size="medium">{{scope.row.insResult==1?'鍚堟牸':'涓嶅悎鏍�'}}</el-tag>
</template>
</el-table-column>
</el-table>
</div>
<h4>鍑哄叆搴撳巻鍙�</h4>
<div class="table" style="margin-bottom: 20px;">
- <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border>
+ <el-table class="el-table" ref="productTable" :data="histories" height="380px" tooltip-effect="dark" border>
<el-table-column type="index" align="center" label="搴忓彿" width="70" :key="Math.random()">
</el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="绫诲瀷"
- show-overflow-tooltip></el-table-column>
- <el-table-column prop="sonLaboratory" label="鎿嶄綔浜�" show-overflow-tooltip></el-table-column>
- <el-table-column prop="method" label="鎿嶄綔鏃堕棿" show-overflow-tooltip></el-table-column>
- <el-table-column prop="unit" label="搴撲綅鍙�" show-overflow-tooltip></el-table-column>
- <el-table-column prop="price" label="瀛樻斁鍛ㄦ湡锛坔锛�" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="state" label="绫诲瀷"
+ show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-tag :type="scope.row.state==1?'success':'danger'">{{ scope.row.state==1?'鍏ュ簱':'鍑哄簱' }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createUserName" label="鎿嶄綔浜�" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="createTime" label="鎿嶄綔鏃堕棿" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="warehouseCode" label="搴撲綅鍙�" show-overflow-tooltip></el-table-column>
+ <!-- <el-table-column prop="price" label="瀛樻斁鍛ㄦ湡锛坔锛�" show-overflow-tooltip></el-table-column> -->
</el-table>
</div>
</div>
@@ -99,15 +103,32 @@
<script>
export default {
+ props:['id'],
data(vm) {
return{
- entity:{},
- productList:[]
+ entity:{
+ num:1,
+ },
+ products:[],
+ histories:[]
}
+ },
+ mounted(){
+ this.getInfo()
},
methods:{
hanldeBack(){
this.$emit('hanldeBack')
+ },
+ getInfo(){
+ this.$axios.post(this.$api.warehouse.getSampleRecord, {
+ id: this.id
+ }).then(res => {
+ let {histories,insSample,sampleHistory,products} = res.data;
+ this.entity = {num:1,...insSample,...sampleHistory};
+ this.histories = histories;
+ this.products = products;
+ })
}
}
}
diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index 40a7e7f..429f833 100644
--- a/src/components/view/b1-sample.vue
+++ b/src/components/view/b1-sample.vue
@@ -65,6 +65,8 @@
vertical-align: top;
border-color: rgb(192, 191, 191) !important;
padding: 5px;
+ box-sizing: border-box;
+ height: 120px;
}
.tables ul {
@@ -82,6 +84,9 @@
justify-content: start;
color: #333333;
cursor: pointer;
+ overflow: hidden; /*瓒呭嚭閮ㄥ垎闅愯棌*/
+ white-space: nowrap; /*绂佹鎹㈣*/
+ text-overflow: ellipsis; /*鐪佺暐鍙�*/
}
.tables h4 {
@@ -99,15 +104,15 @@
margin-right: 6px;
}
- .blue {
+ li:hover {
background: rgba(58, 123, 250, 0.18);
}
- .blue i {
+ li:hover i {
background: #3A7BFA;
}
- .blue .num {
+ li:hover .num {
color: #3A7BFA;
}
@@ -177,10 +182,18 @@
<div class="search_thing">
<div class="search_label">璐ф灦锛�</div>
<div class="search_input">
- <el-select v-model="entity.shelfId" placeholder="閫夋嫨璐ф灦" size="small">
+ <el-select v-model="entity.shelfId" placeholder="閫夋嫨璐ф灦" size="small" @change="handleShelf">
<el-option v-for="item in shelf" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧缂栧彿锛�</div>
+ <div class="search_input">
+ <el-input placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" v-model="searchSampleCode" size="small">
+ <el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
+ </el-input>
</div>
</div>
<!-- <div class="search_thing" style="padding-left: 30px;">
@@ -189,25 +202,33 @@
</div> -->
<div class="btns">
<el-button size="small" style="color:#3A7BFA" @click="keepVisible=true">缁存姢</el-button>
- <el-button size="small" style="color:#3A7BFA" @click="warehouseVisible=true">娣诲姞浠撳簱</el-button>
- <el-button size="small" style="color:#3A7BFA" @click="shelvesVisible=true"
+ <el-button size="small" style="color:#3A7BFA" @click="warehouseVisible=true,isEdit=false">娣诲姞浠撳簱</el-button>
+ <el-button size="small" style="color:#3A7BFA" @click="shelvesVisible=true,isEdit=false"
:disabled="entity.warehouseId==null">娣诲姞璐ф灦</el-button>
</div>
</div>
- <div class="table">
- <table border="1" class="tables" cellpadding="10">
+ <div class="table" v-loading="tableLoading">
+ <table border="1" class="tables" cellpadding="10" style="table-layout:fixed;">
<tbody>
<tr v-for="(item,index) in tableList" :key="index">
<td v-for="(m,i) in item" :key="i" class="content">
- <h4>{{ m.title }}</h4>
+ <h4 v-if="m.row!=undefined">{{ m.row }} - {{ m.col }}</h4>
<ul>
- <li v-for="(n,j) in m.list" :key="j" :class="{blue:n.type==0,green:n.type==1}"
- @click="handelDetail(n)">
- <i></i>
- <span>{{ n.name }}</span>
- <span> ({{ n.specs }}) </span>
- <span class="num"> x{{ n.num }}</span>
- </li>
+ <el-tooltip
+ effect="dark"
+ placement="top"
+ v-for="(n,j) in m.samples"
+ :key="j" :disabled="`${n.sample}${n.model}`.length<10">
+ <div slot="content"><span>{{ n.sample }}</span>
+ <span> ({{ n.model }}) [{{ n.sampleCode }}]</span></div>
+ <li class="green"
+ @click="handelDetail(n)">
+ <i></i>
+ <span>{{ n.sample }}</span>
+ <span> ({{ n.model }}) [{{ n.sampleCode }}]</span>
+ <!-- <span class="num"> x{{ n.num }}</span> -->
+ </li>
+ </el-tooltip>
</ul>
</td>
</tr>
@@ -219,7 +240,7 @@
</table>
</div>
</div>
- <Detail v-else @hanldeBack="isDetail=false" />
+ <Detail v-else @hanldeBack="isDetail=false" :id="currentId" />
<el-dialog title="鏍峰搧鍏ュ簱" :visible.sync="storageVisible" width="350px">
<div class="shaoma">
<img src="../../../static/img/鎵爜.svg" alt="" style="margin-right: 5px;">
@@ -229,19 +250,20 @@
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
<div class="search_input">
- <el-input v-model="value" size="small"></el-input>
+ <el-input v-model="sampleCode" size="small"></el-input>
</div>
</el-col>
</el-row>
- <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }" node-key="label"
+ <el-tree :data="storageList" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
:filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
- @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="storageVisible">
+ @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="storageVisible"
+ empty-text="鏆傛棤鏁版嵁">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row>
<el-col :span="24">
<span><i
- :class="`node_i ${data.children != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
- {{ data.code }} {{ data.label }}</span>
+ :class="`node_i ${data.warehouseShelfList != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
+ {{ data.name }}</span>
</el-col>
</el-row>
</div>
@@ -260,7 +282,7 @@
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
<div class="search_input">
- <el-input v-model="value" size="small"></el-input>
+ <el-input v-model="sampleCode" size="small"></el-input>
</div>
</el-col>
</el-row>
@@ -272,13 +294,14 @@
<el-dialog title="搴撲綅缁存姢" :visible.sync="keepVisible" width="350px">
<el-tree :data="warehouse" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
:filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
- @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="keepVisible">
+ @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="keepVisible"
+ empty-text="鏆傛棤鏁版嵁">
<div class="custom-tree-node" style="width: 100%;" slot-scope="{ node, data }">
<el-row style="width: 100%;display: flex;align-items: center;">
<el-col :span="20">
<span><i
- :class="`node_i ${data.children != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
- {{ data.name }}</span>
+ :class="`node_i ${node.level<2 ? 'el-icon-folder-opened': 'el-icon-tickets'}`"></i>
+ {{ data.name }}{{ node.level }}</span>
</el-col>
<el-col :span="4" v-if="node.level<3">
<el-button type="text" size="mini" icon="el-icon-edit" @click.stop="handleEdit(data,node.level)">
@@ -299,7 +322,7 @@
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>浠撳簱鍚嶇О锛�</div>
<div class="search_input">
- <el-input v-model="value" size="small" @keyup.enter.native="confirmWarehouse"></el-input>
+ <el-input v-model="name" size="small" @keyup.enter.native="confirmWarehouse"></el-input>
</div>
</el-col>
</el-row>
@@ -313,7 +336,7 @@
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>璐ф灦鍚嶇О锛�</div>
<div class="search_input">
- <el-input v-model="value" size="small"></el-input>
+ <el-input v-model="shelves.name" size="small"></el-input>
</div>
</el-col>
</el-row>
@@ -321,7 +344,7 @@
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>璐ф灦灞傛暟锛�</div>
<div class="search_input">
- <el-input v-model="value" size="small"></el-input>
+ <el-input v-model="shelves.row" size="small"></el-input>
</div>
</el-col>
</el-row>
@@ -329,7 +352,7 @@
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>璐ф灦鍒楁暟锛�</div>
<div class="search_input">
- <el-input v-model="value" size="small"></el-input>
+ <el-input v-model="shelves.col" size="small"></el-input>
</div>
</el-col>
</el-row>
@@ -355,6 +378,7 @@
},
warehouse: [],
shelf: [],
+ storageList:[],
storageVisible: false,
exportVisible: false,
keepVisible: false,
@@ -819,36 +843,19 @@
},
]
],
- rowList: [
- '1鍒�',
- '2鍒�',
- '3鍒�',
- '4鍒�',
- '5鍒�',
- '6鍒�',
- '7鍒�',
- ],
+ rowList: [],
value: '',
- list: [{
- code: 1,
- label: '鐖剁骇',
- children: [{
- code: 1,
- label: '瀛愮骇1',
- children: [{
- code: 1,
- label: '瀛愮骇2',
- children: [{
- code: 1,
- label: '瀛愮骇3',
- }]
- }]
- }]
- }],
- selectTree: null,
+ name:'',
+ shelves:{},
+ selectTree: [],
expandedKeys: [],
isEdit: false, //寮规--鏄惁鏄慨鏀�,榛樿涓篺alse
isDetail: false, //璇︽儏--鏄惁灞曠ず涓鸿鎯呴〉闈紝榛樿涓篺alse
+ currentEdit:null,//褰撳墠瑕佺淮鎶ょ殑淇℃伅
+ tableLoading:true,
+ sampleCode:'',
+ currentId:null,
+ searchSampleCode:''
}
},
mounted() {
@@ -858,6 +865,36 @@
selectList() {
this.$axios.get(this.$api.warehouse.selectWarehouse).then(res => {
this.warehouse = res.data
+ this.storageList = this.HaveJson(res.data).map(item=>{
+ item.warehouseShelfList&&item.warehouseShelfList.length>0&&item.warehouseShelfList.map(m=>{
+ let warehouseShelfList = [];
+ for (let i=1;i<m.row+1;i++){
+ let warehouseShelfList0 = []
+ for (let j=1;j<m.col+1;j++){
+ warehouseShelfList0.push({
+ name:j+' 鍒�',
+ id:j,
+ })
+ }
+ warehouseShelfList.push({
+ name:i+' 灞�',
+ id:i,
+ warehouseShelfList:warehouseShelfList0
+ })
+ }
+ m.warehouseShelfList = warehouseShelfList;
+ return m;
+ })
+ return item;
+ })
+ if(!this.entity.warehouseId&&this.warehouse.length>0){
+ this.entity.warehouseId = this.warehouse[0].id
+ this.warehouseChange(this.entity.warehouseId)
+ if(this.shelf.length>0){
+ this.entity.shelfId = this.shelf[0].id
+ this.handleShelf(this.entity.shelfId)
+ }
+ }
})
},
selectStandardTreeList() {
@@ -870,88 +907,165 @@
})
})
},
- refreshTable() {
- this.selectList()
- },
- refresh() {
- this.entity = this.HaveJson(this.entity)
- },
- handleClose() {
- this.upLoad = false;
- },
// 鍏ュ簱
confirmStorage() {
- if (!this.value) {
+ if (!this.sampleCode) {
this.$message.error('璇峰～鍐欐牱鍝佺紪鍙�')
return
}
- let trees = this.selectTree.split(" - ")
- if (trees.length < 4) {
- this.$message.error('鏈�夋嫨鏍峰搧')
+ if (this.selectTree.length < 4) {
+ this.$message.error('璇烽�夋嫨鏍峰搧鍏ュ簱浣嶇疆')
return
}
this.upLoadStorage = true;
+ this.$axios.post(this.$api.warehouse.inWarehouse, {
+ trees: this.selectTree.join('-'),
+ sampleCode:this.sampleCode
+ }).then(res => {
+ this.upLoadStorage = false;
+ this.storageVisible = false
+ this.sampleCode = '';
+ this.selectTree = []
+ if (res.code == 201) {
+ this.$message.error('鍏ュ簱澶辫触')
+ return
+ }
+ this.$message.success('鍏ュ簱鎴愬姛')
+ this.handleShelf(this.entity.shelfId)
+ })
},
// 鍑哄簱
confirmExport() {
- if (!this.value) {
+ if (!this.sampleCode) {
this.$message.error('璇峰～鍐欐牱鍝佺紪鍙�')
return
}
this.upLoadExport = true;
+ this.$axios.post(this.$api.warehouse.outWarehouse, {
+ sampleCode:this.sampleCode
+ }).then(res => {
+ this.upLoadExport = false;
+ this.exportVisible = false
+ this.sampleCode = '';
+ if (res.code == 201) {
+ this.$message.error('鍑哄簱澶辫触')
+ return
+ }
+ this.$message.success('鍑哄簱鎴愬姛')
+ this.handleShelf(this.entity.shelfId)
+ })
},
// 缁存姢
confirmKeep() {
this.upLoadKeep = true;
},
- // 娣诲姞浠撳簱
+ // 娣诲姞/淇敼浠撳簱
confirmWarehouse() {
- if (!this.value) {
+ if (!this.name) {
this.$message.error('璇峰～鍐欎粨搴撳悕绉�')
return
}
this.upLoadWarehouse = true;
- this.$axios.post(this.$api.warehouse.addWarehouse, {
- name: this.value
- }).then(res => {
- this.upLoadWarehouse = false;
- this.warehouseVisible = false
- if (res.code == 201) {
- this.$message.error('娣诲姞澶辫触')
- return
- }
- this.$message.success('娣诲姞鎴愬姛')
- this.selectList()
- })
+ if(this.currentEdit&&this.currentEdit.id){
+ // 淇敼浠撳簱
+ this.$axios.post(this.$api.warehouse.upWarehouse, {
+ name: this.name,
+ id:this.currentEdit.id
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.upLoadWarehouse = false;
+ this.warehouseVisible = false
+ this.currentEdit = null;
+ if (res.code == 201) {
+ this.$message.error('淇敼澶辫触')
+ return
+ }
+ this.$message.success('淇敼鎴愬姛')
+ this.selectList()
+ })
+ }else{
+ // 鏂板浠撳簱
+ this.$axios.post(this.$api.warehouse.addWarehouse, {
+ name: this.name
+ }).then(res => {
+ this.upLoadWarehouse = false;
+ this.warehouseVisible = false
+ if (res.code == 201) {
+ this.$message.error('娣诲姞澶辫触')
+ return
+ }
+ this.$message.success('娣诲姞鎴愬姛')
+ this.selectList()
+ })
+ }
+ this.name = ''
+ this.warehouseChange(this.entity.warehouseId)
},
- // 娣诲姞璐ф灦
+ // 娣诲姞/淇敼璐ф灦
confirmShelves() {
- if (!this.value) {
+ if (!this.shelves.name) {
this.$message.error('璇峰～鍐欒揣鏋跺悕绉�')
return
}
+ if (!this.shelves.row) {
+ this.$message.error('璇峰～鍐欒揣鏋跺眰鏁�')
+ return
+ }
+ if (!this.shelves.col) {
+ this.$message.error('璇峰～鍐欒揣鏋跺垪鏁�')
+ return
+ }
this.upLoadShelves = true;
+ if(this.currentEdit&&this.currentEdit.id){
+ // 淇敼
+ this.$axios.post(this.$api.warehouse.upShelf, {
+ id:this.currentEdit.id,...this.shelves
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.upLoadShelves = false;
+ this.shelvesVisible = false
+ if (res.code == 201) {
+ this.$message.error('娣诲姞澶辫触')
+ return
+ }
+ this.$message.success('娣诲姞鎴愬姛')
+ this.selectList()
+ this.currentEdit ={};
+ })
+ }else{
+ // 鏂板
+ this.$axios.post(this.$api.warehouse.addShelf, {
+ warehouseId: this.entity.warehouseId,...this.shelves
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.upLoadShelves = false;
+ this.shelvesVisible = false
+ if (res.code == 201) {
+ this.$message.error('娣诲姞澶辫触')
+ return
+ }
+ this.$message.success('娣诲姞鎴愬姛')
+ this.selectList()
+ this.shelves = {}
+ })
+ }
+ this.warehouseChange(this.entity.warehouseId)
},
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
handleNodeClick(val, node, el) { //鏍戠殑鍊�
- this.selectTree = ''
- this.getNodeParent(node)
- this.selectTree = this.selectTree.replace(' - ', '')
- 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) {
- this.selectTree += ' - ' + val.label
- this.getNodeParent(val.parent)
- }
+ this.selectTree[node.level-1] = val.id;
},
nodeOpen(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
@@ -965,17 +1079,34 @@
cancelButtonText: "鍙栨秷",
type: "warning"
}).then(() => {
- this.$axios.post(this.$api.insOrder.delInsOrderTemplate, {
- id: row.id
- }).then(res => {
- if (res.code === 201) {
- return
- }
- this.$message.success('鎴愬姛')
- // this.selectInsOrderTemplate()
- }).catch(e => {
- this.$message.error('澶辫触')
- })
+ if (level == 1) {
+ // 鍒犻櫎浠撳簱
+ this.$axios.post(this.$api.warehouse.delWarehouse, {
+ id: row.id
+ }).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('鎴愬姛')
+ this.selectList()
+ }).catch(e => {
+ this.$message.error('澶辫触')
+ })
+ }else{
+ // 鍒犻櫎璐ф灦
+ this.$axios.post(this.$api.warehouse.delShelf, {
+ id: row.id
+ }).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('鎴愬姛')
+ this.selectList()
+ }).catch(e => {
+ this.$message.error('澶辫触')
+ })
+ }
+ this.warehouseChange(this.entity.warehouseId)
}).catch(() => {})
},
handleEdit(data, level) {
@@ -983,19 +1114,72 @@
// 鍒ゆ柇鏄鍑犲眰绾э紝绗竴灞傜骇锛屼慨鏀逛粨搴擄紝绗簩灞傜骇淇敼璐ф灦
if (level == 1) {
this.warehouseVisible = true;
+ this.currentEdit = data;
+ this.name = data.name
} else {
this.shelvesVisible = true;
+ this.currentEdit = data;
+ this.shelves = {
+ name:data.name,
+ row:data.row,
+ col:data.col,
+ warehouseId:data.warehouseId
+ }
}
},
// 鏌ョ湅璇︽儏
handelDetail(row) {
+ this.currentId = row.id;
this.isDetail = true;
},
warehouseChange(val) {
let map = this.warehouse.find(a => {
return a.id === val ? a : null
})
- this.shelf = map.warehouseShelfList
+ this.shelf = map.warehouseShelfList;
+ this.entity.shelfId = '';
+ },
+ handleShelf(e){
+ this.tableLoading = true;
+ this.$axios.get(this.$api.warehouse.getWarehouse+'?shelfId='+e).then(res => {
+ let data = res.data;
+ let set =new Set()
+ this.tableList = [];
+ let arr = []
+ data.forEach(m=>{
+ set.add(m.col)
+ if(arr.length>0){
+ if(arr.find(n=>n.row==m.row)){
+ arr.push(m)
+ }else{
+ this.tableList.push(arr)
+ arr = []
+ arr.push(m)
+ }
+ }else{
+ arr.push(m)
+ }
+ })
+ this.tableList.push(arr)
+ this.rowList = [];
+ for(let i=0;i<set.size;i++){
+ this.rowList.push(`${i+1} 鍒梎)
+ }
+ this.tableLoading = false;
+ })
+ },
+ handleSearch(){
+ if(!this.searchSampleCode){
+ this.$message.error('璇疯緭鍏ユ牱鍝佺紪鍙�')
+ return;
+ }
+ this.$axios.post(this.$api.warehouse.searchSampleId, {
+ sampleCode: this.searchSampleCode}).then(res => {
+ if(res.code==200){
+ this.currentId = res.data;
+ this.isDetail = true;
+ }
+ })
}
}
}
diff --git a/src/main.js b/src/main.js
index 41bde4c..018e938 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,7 +13,7 @@
//鏈湴
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-const javaApi = 'http://192.168.0.161:8001';//鏉�
+const javaApi = 'http://192.168.0.24:8001';//鏉�
// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
--
Gitblit v1.9.3