From eec77847922467a0ed5631794dbfe9ea2e367032 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 08 九月 2023 11:11:48 +0800
Subject: [PATCH] 设备维护，标准Bom
---
src/components/view/standard.vue | 39 +++++++++---
src/components/view/laboratoryManagement.vue | 24 ++++---
src/main.js | 3
src/components/view/technical.vue | 27 +++++++-
src/components/view/standard-table/technology.vue | 35 +++++++++++
src/assets/api/controller.js | 1
6 files changed, 100 insertions(+), 29 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a4df82f..f57edf9 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -13,6 +13,7 @@
//璁㈠崟BOM
delDevice:"/device/delDeviceById",//璁㈠崟Bom
+ compile:"/orders/compile",//缂栧埗
}
// 鍘熸潗鏂欐楠�
const raw = {
diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index 55d2727..aaa4a0f 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -427,7 +427,7 @@
equr:1,
},
delete:{},
- equip:[],
+ equip:1,
rules: {
name: [
{ required: true, message: "璇疯緭鍏ヤ华鍣ㄨ澶囩紪鍙�", trigger: "blur" },
@@ -465,12 +465,20 @@
}
};
},
+ mounted() {
+ // 鍒濆鍖栬皟鐢ㄤ簩绾ф爲
+ this.twoTreeApi();
+ // 鍒濆鍖栬皟鐢ㄨ〃鏍兼暟鎹�
+ // this.tableDataApi();
+ this.selectDevice()//鍙宠竟
+ },
methods: {
selectDevice() {//鍙宠竟鏁版嵁
- console.log(this.$api.url.selectDevice);
+ console.log(this.ruleForm.treedata.father);
+ console.log(this.equip);
this.$axios.get(this.$api.url.selectDevice,{
params:{
- father:this.treedata.father,
+ father:this.ruleForm.treedata.father,
type:this.equip,
}
}).then(res =>{
@@ -582,7 +590,7 @@
},
handleNodeClick(data) {
console.log(data);
- this.treedata = data
+ // this.treedata = data
this.selectDevice()
},
handlerDeptList() {
@@ -720,13 +728,7 @@
});
}
},
- mounted() {
- // 鍒濆鍖栬皟鐢ㄤ簩绾ф爲
- this.twoTreeApi();
- // 鍒濆鍖栬皟鐢ㄨ〃鏍兼暟鎹�
- this.tableDataApi();
- this.selectDevice()//鍙宠竟
- },
+
watch: {
"ruleForm.rawInsProductId": {
//鐩戝惉ruleForm.rawInsProductId
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index 8cdabda..edde54e 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -44,7 +44,7 @@
<template>
<div class="standard">
- <el-table :data="tableData" border style="width: 100%" row-key="id"
+ <!-- <el-table :data="tableData" border style="width: 100%" row-key="id"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" width="50">
</el-table-column>
@@ -80,7 +80,38 @@
<el-table-column prop="quota" label="宸ユ椂瀹氶">
</el-table-column>
</template>
- </el-table>
+ </el-table> -->
+ <div>
+ <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
+ @selection-change="handleSelectionChange" default-expand-all
+ :tree-props="{ children: 'name', hasChildren: 'children' }">
+ <el-table-column type="selection" width="55">
+ </el-table-column>
+ <el-table-column type="index" width="50" label="搴忓彿">
+ </el-table-column>
+ <el-table-column prop="name" label="宸ュ簭" sortable width="300px">
+ <template slot-scope="scope">
+ <el-tag>
+ <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
+ {{ scope.row.children ? "01" : "02" }}
+ </div>
+ </el-tag>
+ <span style="color: black">{{ scope.row.name }}</span>
+
+ </template>
+ </el-table-column>
+ <el-table-column prop="" sortable label="宸ヨ壓鍚嶇О">
+ </el-table-column>
+ <el-table-column prop="" label="鎸囨爣鍚嶇О">
+ </el-table-column>
+ <el-table-column prop="" label="鍗曚綅">
+ </el-table-column>
+ <el-table-column prop="" label="鍐呮帶鍊�">
+ </el-table-column>
+ <el-table-column prop="unit" label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table>
+ </div>
</div>
</template>
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 731daef..94c7173 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -52,7 +52,20 @@
璇�</span></el-button>
</div>
- <div>
+ <!-- <div v-if="this.typeselect == 0">
+ 宸ヨ壓璺嚎
+ </div>
+ <div v-if="this.typeselect == 1">
+ 鎶�鏈寚鏍�
+ </div>
+ <div v-if="this.typeselect == 2">
+ 鐗╂枡娓呭崟
+ </div>
+ <div v-if="this.typeselect == 3">
+ 鐢熶骇宸ヨ壓
+ </div> -->
+
+ <!-- <div>
<el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
@selection-change="handleSelectionChange" default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
@@ -61,7 +74,7 @@
<el-table-column type="index" width="50" label="搴忓彿">
</el-table-column>
<el-table-column prop="name" label="宸ュ簭" sortable width="300px">
- <!-- <template slot-scope="scope">
+ <template slot-scope="scope">
<el-tag>
<div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
{{ scope.row.children ? "01" : "02" }}
@@ -69,7 +82,7 @@
</el-tag>
<span style="color: black">{{ scope.row.name }}</span>
- </template> -->
+ </template>
</el-table-column>
<el-table-column prop="" sortable label="宸ヨ壓鍚嶇О">
</el-table-column>
@@ -82,7 +95,8 @@
<el-table-column prop="unit" label="鏍囧噯鍊�">
</el-table-column>
</el-table>
- </div>
+ </div> -->
+
<div class="table">
<technology v-if="tableData.length !== 0" :tableType="tableType" :tableData="tableData"></technology>
</div>
@@ -93,7 +107,7 @@
<div class="bom-add-model">
<el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="30%">
<el-form>
-
+
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
@@ -119,12 +133,14 @@
tableData: [],
bomAddModelVisible: false,// 鎺у埗bom鏂板妯℃�佹鏄惁鏄剧ず
list: [],
- typeselect: {},
- returntree: {},
+ typeselect: 0,
+ returntree: {
+ id:28,
+ },
version: {},
VER: {},
verdata: {},
- character: '',
+ character: 0,
}
},
// watch: {
@@ -137,6 +153,8 @@
// },
mounted() {
this.selectMaterialTree()
+ this.selectVersion()
+ this.selectAll()
},
methods: {
handleSelectionChange() {
@@ -145,14 +163,15 @@
TYPE(val) {//绫诲瀷.鏁版嵁
console.log(val);
this.typeselect = val
- console.log(this.typeselect);
+
+ // console.log(this.typeselect);
this.selectVersion()
},
handleNodeClick(val) {//鏍戠殑鍊�
console.log(val);
this.returntree = val
},
- selectVersion() {
+ selectVersion() {//鐗堟湰
this.$axios.get(this.$api.url.selectVersion, {
params: {
specificationsId: this.returntree.id,
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 8ec3eb3..5b5a65b 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -74,20 +74,22 @@
label="浜よ揣鏃ユ湡">
</el-table-column>
<el-table-column
- prop="type"
label="鐘舵��"
width="85"
>
<template slot-scope="scope">
- {{scope.state==0?'寰呯紪鍒�':'宸茬紪鍒�'}}
+ <span :style="{'color': scope.row.type==0 ? 'red':'green'}">
+ {{scope.row.type==0?'寰呯紪鍒�':'宸茬紪鍒�'}}
+ </span>
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
width="194">
<template slot-scope="scope">
- <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
- <el-button type="text" size="small">缂栬緫闄勪欢</el-button>
+ <!-- <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" size="small">缂栬緫闄勪欢</el-button> -->
+ <el-button type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
</template>
</el-table-column>
</el-table>
@@ -222,6 +224,7 @@
id:'',
date:''
},
+ compiledata:{},
technicalTable: [],
showDetail: false,
selectedRow: {},
@@ -236,6 +239,22 @@
this.getTechnicalTableData()
},
methods: {
+ authorizedstrength(row) {
+ this.compiledata = row
+ this.compile()
+ // let ccc = row
+ // console.log(row);
+ },
+ //缂栧埗
+ compile() {
+ console.log();
+ this.$axios.post(this.$api.url.compile,{
+ id:this.compiledata.id
+ }).then( res =>{
+ this.$message.success('缂栧埗瀹屾垚')
+ })
+ this.getTechnicalTableData()
+ },
async showDetails(row){
this.showDetail = true
const res = await this.$axios.get(this.$api.url.selectOrderById,{params:{id:row.id}})
diff --git a/src/main.js b/src/main.js
index f3d0d1e..4df962d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,8 +23,7 @@
Vue.use(qs);
Vue.use(api);
-// const javaApi = 'http://127.0.0.1:8001/'
-const javaApi = 'http://127.0.0.1:8001/'
+const javaApi = 'http://192.168.0.23:8001'
--
Gitblit v1.9.3