From 5176aefe7d7e6f77f23dd7059d85bf7b398900f5 Mon Sep 17 00:00:00 2001
From: hailin <1356886193@qq.com>
Date: 星期二, 25 七月 2023 09:17:58 +0800
Subject: [PATCH] 解决设备台账冲突
---
src/views/standardLibrary/index.vue | 38 ++-
src/api/standardLibrary.js | 8
src/views/standardLibrary/SpecificationDetails.vue | 61 +++++-
src/views/laboratory/ledger/index.vue | 332 ++++++++++++++++++++++++++++++++++++++++
src/views/laboratory/personnel/index.vue | 6
src/layout/components/Sidebar/SidebarItem.vue | 4
6 files changed, 405 insertions(+), 44 deletions(-)
diff --git a/src/api/standardLibrary.js b/src/api/standardLibrary.js
index 0363a51..19724bf 100644
--- a/src/api/standardLibrary.js
+++ b/src/api/standardLibrary.js
@@ -119,11 +119,11 @@
}
// 鍒犻櫎鐗╂枡淇℃伅
-export function deleteMaterial(data) {
+export function deleteMaterial(params) {
return request({
url: '/material/delete',
method: 'delete',
- data
+ params
})
}
@@ -164,10 +164,10 @@
}
// 鍒犻櫎瀛愰」鐩俊鎭�
-export function deleteProduct(data) {
+export function deleteProduct(params) {
return request({
url: '/product/delete',
method: 'delete',
- data
+ params
})
}
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index a262e2c..e5b588f 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -4,11 +4,11 @@
<app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
<el-menu-item v-if="onlyOneChild.meta.show==false ?onlyOneChild.meta.show: true" :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
- <!-- <el-menu-item :style="{width:'0px',height:'0px'}" v-if="onlyOneChild.meta.show==false ?onlyOneChild.meta.show: true" :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> -->
+ <!-- <el-menu-item :style="{width:'0px',height:'0px'}" v-if="onlyOneChild.meta.show==false ?onlyOneChild.meta.show: true" :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> -->
<!-- <template slot="title">
<item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
</template> -->
- <item :show="onlyOneChild.meta.show" :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+ <item :show="onlyOneChild.meta.show" :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
<span v-if="onlyOneChild.meta.title==='涓婚〉'">涓婚〉</span>
</el-menu-item>
</app-link>
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 12e19f8..242feea 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -19,14 +19,24 @@
</el-form>
</div>
<div class="serve-btn">
- <el-button type="primary" icon="el-icon-plus">鏂板浜哄憳</el-button>
+ <el-button type="primary" icon="el-icon-plus" @click="drawerFormVisible = true">鏂板浜哄憳</el-button>
</div>
</div>
<div class="content-main">
<div class="library-bom">
- <el-input
- placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
- />
+ <div class="bom-item-search">
+ <el-row>
+ <el-col :span="19">
+ <el-input
+ v-model="filterText"
+ placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+ />
+ </el-col>
+ <el-col :span="5">
+ <el-button type="primary" size="small" @click="FormVisible = true"><i class="el-icon-plus" /></el-button>
+ </el-col>
+ </el-row>
+ </div>
<el-tree
ref="classTree"
:data="classTree"
@@ -70,7 +80,7 @@
<el-table-column
prop="equipment_code"
label="浠櫒璁惧缂栧彿"
- min-width="150"
+ min-width="200"
/>
<el-table-column
prop="equipment_name"
@@ -93,7 +103,7 @@
min-width="200"
/>
<el-table-column
- prop="incumbentStatus"
+ prop="conditions"
label="璁惧鐘舵��"
min-width="120"
>
@@ -110,6 +120,11 @@
min-width="200"
/>
<el-table-column
+ prop="storage_place"
+ label="瀛樻斁鍦�"
+ min-width="200"
+ />
+ <el-table-column
label="鎿嶄綔"
min-width="120"
fixed="right"
@@ -120,6 +135,27 @@
</template>
</el-table-column>
</el-table>
+ <!-- 寮瑰嚭琛ㄥ崟椤� -->
+ <div>
+ <!-- 娣诲姞鍒嗙被 -->
+ <el-dialog title="娣诲姞鍒嗙被" :visible.sync="FormVisible" width="33%">
+ <el-form :model="treeForm">
+ <el-form-item label="鍒嗙被鍚嶇О" label-width="100px">
+ <el-input v-model="treeForm.name" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="鐖剁骇鍒嗙被" label-width="100px">
+ <el-select v-model="treeForm.type" placeholder="璇烽�夋嫨">
+ <el-option label="鍘熸潗鏂�" value="0" />
+ <el-option label="鐢电嚎鐢电紗" value="1" />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="FormVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
+ </div>
<div>
<el-pagination
:current-page="currentPage"
@@ -134,6 +170,179 @@
</div>
</div>
</div>
+ <!-- 鎶藉眽 -->
+ <el-drawer
+ title="鏂板浠櫒璁惧"
+ :before-close="handleClose"
+ :visible.sync="drawerFormVisible"
+ direction="rtl"
+ custom-class="demo-drawer"
+ ref="drawer"
+ size="40%"
+ >
+ <div class="demo-drawer__content">
+ <el-form label-position="top" :model="equipmentform">
+ <el-row :gutter="50">
+ <el-col :span="11">
+ <el-form-item label="鎵�灞炲垎绫伙細" label-width="80">
+ <el-select
+ v-model="equipmentform.classifyId"
+ clearable
+ filterable
+ :allow-create="true"
+ placeholder="璇烽�夋嫨"
+ @blur="productSelect"
+ style="width:100%"
+ >
+ <el-option
+ v-for="item in fatherOpetions"
+ :key="item.id"
+ :label="item.label"
+ :value="item.label"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11">
+ <el-form-item label="璁惧缂栧彿锛�" label-width="80">
+ <el-input v-model="equipmentform.equipmentCode" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="50">
+ <el-col :span="11">
+ <el-form-item label="浠櫒璁惧鍚嶇О锛�" label-width="80">
+ <el-input v-model="equipmentform.name" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="11">
+ <el-form-item label="鐘舵�侊細" label-width="80">
+ <el-select
+ v-model="equipmentform.classifyId"
+ clearable
+ filterable
+ :allow-create="true"
+ placeholder="璇烽�夋嫨浠櫒璁惧鐘舵��"
+ @blur="productSelect"
+ style="width:100%"
+ >
+ <el-option
+ v-for="item in fatherOpetions"
+ :key="item.id"
+ :label="item.label"
+ :value="item.label"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="50">
+ <el-col :span="11">
+ <el-form-item label="鍨嬪彿瑙勬牸锛�" label-width="80">
+ <el-input v-model="equipmentform.specification_models" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="11">
+ <el-form-item label="娴嬮噺鑼冨洿锛�" label-width="80">
+ <el-input v-model="equipmentform.measuringRange" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="50">
+ <el-col :span="11">
+ <el-form-item label="涓嶇‘瀹氬害/鍑嗙‘搴�/鏈�澶у厑璁歌宸細" label-width="80">
+ <el-input v-model="equipmentform.errorRate" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="11">
+ <el-form-item label="鐢熶骇鍘傚锛�" label-width="80">
+ <el-input v-model="equipmentform.manufacturer" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="50">
+ <el-col :span="11">
+ <el-form-item label="瀛樻斁鍦扮偣锛�" label-width="80">
+ <el-input v-model="equipmentform.storagePlace" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="11">
+ <el-form-item label="鍒拌揣鏃ユ湡锛�" label-width="80">
+ <el-date-picker
+ v-model="equipmentform.arrivalDate"
+ type="date"
+ placeholder="璇烽�夋嫨鍒拌揣鏃ユ湡"
+ style="width:100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="50">
+ <el-col :span="11">
+ <el-form-item label="楠屾敹鏃ユ湡锛�" label-width="80">
+ <el-date-picker
+ v-model="equipmentform.acceptanceDate"
+ type="date"
+ placeholder="璇烽�夋嫨楠屾敹鏃ユ湡"
+ style="width:100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11">
+ <el-form-item label="淇濈浜猴細" label-width="80">
+ <el-select
+ v-model="equipmentform.keeper"
+ clearable
+ filterable
+ :allow-create="true"
+ placeholder="璇烽�夋嫨淇濈浜�"
+ @blur="productSelect"
+ style="width:100%"
+ >
+ <el-option
+ v-for="item in fatherOpetions"
+ :key="item.id"
+ :label="item.label"
+ :value="item.label"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="50">
+ <el-col :span="11">
+ <el-form-item label="鏄惁鏀寔鏁伴噰锛�" label-width="80">
+ <el-radio v-model="equipmentform.whetherDataAcquisition" label="1">鏄�</el-radio>
+ <el-radio v-model="equipmentform.whetherDataAcquisition" label="2">鍚�</el-radio>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11">
+ <el-form-item label="浠櫒璁惧璁￠噺锛�" label-width="80">
+ <el-radio v-model="equipmentform.equipmentMeasurement" label="1">闇�瑕�</el-radio>
+ <el-radio v-model="equipmentform.equipmentMeasurement" label="2">涓嶉渶瑕�</el-radio>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="50">
+ <el-col :span="11">
+ <el-form-item label="鎻忚堪锛�" label-width="80">
+ <el-input
+ type="textarea"
+ :rows="2"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ v-model=equipmentform.descriptiveness
+ style="width:217%">
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div class="demo-drawer__footer">
+ <el-button @click="drawerFormVisible = false" class="el-button--default">鍙� 娑�</el-button>
+ <el-button type="primary" class="el-button--primary el-button--medium">纭� 瀹�</el-button>
+ </div>
+ </div>
+ </el-drawer>
<!-- -->
<el-drawer
title="浠櫒璁惧璇︽儏"
@@ -242,6 +451,20 @@
}]
}]
}],
+ treeForm: [{
+ name: '',
+ type: ''
+ }],
+ personnerlTable: [{
+ specification_models: 'WCDMS-1', // 鍨嬪彿瑙勬牸
+ equipment_name: '鏁板瓧鐢垫ˉ', // 浠櫒璁惧鍚嶇О
+ term_validity: 12, // 璁￠噺鎴鏈夋晥鏈�
+ equipment_code: 'JSTC-W1-00001', // 浠櫒璁惧缂栧彿
+ keeper: 0, // 淇濈浜�
+ id: 1, // 搴忓彿
+ conditions: 1, // 璁惧鐘舵��
+ storage_place: '鍦扮悆浜氭床涓浗姹熻嫃鍗楅��' // 瀛樻斁鍦�
+ }],
// tree榛樿鍊�
defaultProps: {
children: 'children',
@@ -255,6 +478,28 @@
radioValue: '鍏ㄩ儴',
// 琛ㄦ牸鎼滅储宸茶繃鏈�
isOut: false,
+ FormVisible: false,
+ drawerFormVisible: false,
+ loading: false,
+ equipmentform: {
+ acceptanceDate: '', // 楠屾敹鏃ユ湡
+ arrivalDate: '', // 鍒拌揣鏃ユ湡
+ classifyId: '', // 鎵�灞炲垎绫�
+ conditions: '', // 鐘舵��
+ descriptiveness: '', // 鎻忚堪
+ equipmentCode: '', // 璁惧缂栧彿
+ equipmentMeasurement: '', // 浠櫒璁惧璁￠噺
+ equipmentName: '', // 浠櫒璁惧鍚嶇О
+ errorRate: '', // 涓嶇‘瀹氬害/鍑嗙‘搴�/鏈�澶у厑璁歌宸�
+ keeper: '', // 淇濈浜�
+ manufacturer: '', // 鐢熶骇鍘傚
+ measuringRange: '', // 娴嬮噺鑼冨洿
+ specificationsModels: '', // 鍨嬪彿瑙勬牸
+ storagePlace: '', // 瀛樻斁鍦扮偣
+ whetherDataAcquisition: '' // 鏄惁鏀寔鏁伴噰
+ },
+ timer: null,
+ formLabelWidth: '80',
detailDrawer: false,
editDrawer: false,
equipmentTable: [],
@@ -313,11 +558,49 @@
handleCurrentChange() {
// 褰撳墠椤垫洿鏀�
}
+ },
+ handleClose(done) {
+ if (this.loading) {
+ return
+ }
+ this.$confirm('纭畾瑕佹彁浜よ〃鍗曞悧锛�')
+ .then(_ => {
+ this.loading = true
+ this.timer = setTimeout(() => {
+ done()
+ // 鍔ㄧ敾鍏抽棴闇�瑕佷竴瀹氱殑鏃堕棿
+ setTimeout(() => {
+ this.loading = false
+ }, 400)
+ }, 2000)
+ })
+ .catch(_ => {})
}
}
</script>
<style lang="scss" scoped>
+.demo-drawer__content{
+ margin-left: 50px;
+ // margin-right: 5px;
+}
+.demo-drawer__footer {
+ display: flex;
+ justify-content: space-between;
+}
+
+.demo-drawer__footer .el-button--default {
+ background-color: #fff;
+ color: #333;
+ width: 45%;
+}
+
+.demo-drawer__footer .el-button--primary {
+ background-color: #409EFF;
+ color: #fff;
+ width: 45%;
+ margin-right: 60px;
+}
.ledger-main{
width: 100%;
height: 100%;
@@ -357,6 +640,43 @@
.library-bom{
flex: 2;
margin-right: 12px;
+ .bom-item-search{
+ margin-bottom: 12px;
+ ::v-deep .el-input{
+ input{
+ height: 33px;
+ line-height: 33px;
+ }
+ }
+ .tips{
+ height: 33px !important;
+ display: flex;
+ height: 24px;
+ align-items: center;
+ font-size: 16px;
+ // margin-bottom: 12px;
+ >span{
+ display: inline-block;
+ margin-right: 10px;
+ width: 4px;
+ height: 16px;
+ background: #0077DB;
+ }
+ >div{
+ height: 100%;
+ line-height: 36px;
+ }
+ .el-button{
+ padding: 0;
+ }
+ }
+ }
+ .bom-item-search .el-row{
+ // display: flex;
+ .el-col{
+ text-align: right;
+ }
+ }
.el-tree {
margin-top: 12px;
::v-deep .el-tree-node__content{
diff --git a/src/views/laboratory/personnel/index.vue b/src/views/laboratory/personnel/index.vue
index ec45299..3312928 100644
--- a/src/views/laboratory/personnel/index.vue
+++ b/src/views/laboratory/personnel/index.vue
@@ -21,8 +21,8 @@
<div class="serve-btn">
<el-button type="primary" icon="el-icon-plus" @click="dialogFormVisible = true">鏂板浜哄憳</el-button>
- <el-dialog title="鏂板浜哄憳" :visible.sync="dialogFormVisible">
- <el-form ref="form" :model="form" :rules="rules">
+ <el-dialog title="鏂板浜哄憳" :visible.sync="dialogFormVisible" width="30%">
+ <el-form :model="form" :rules="rules">
<el-form-item label="璐﹀彿" :label-width="formLabelWidth" prop="account">
<el-input v-model="form.account" autocomplete="off" />
</el-form-item>
@@ -158,7 +158,7 @@
phone: '',
role_id: ''
},
- formLabelWidth: '120px',
+ formLabelWidth: '100px',
rules: {
account: [
{
diff --git a/src/views/standardLibrary/SpecificationDetails.vue b/src/views/standardLibrary/SpecificationDetails.vue
index 30f15fe..5a8eeb7 100644
--- a/src/views/standardLibrary/SpecificationDetails.vue
+++ b/src/views/standardLibrary/SpecificationDetails.vue
@@ -51,7 +51,7 @@
<el-button size="mini" type="text" @click="showChangeMaterial(data)">缂栬緫</el-button>
</div>
<div>
- <el-button size="mini" type="text">鍒犻櫎</el-button>
+ <el-button size="mini" type="text" @click="delmaterialFormVisible=true">鍒犻櫎</el-button>
</div>
</div>
<el-button
@@ -100,7 +100,7 @@
<el-button size="mini" type="text" @click="showChangeProject(data)">缂栬緫</el-button>
</div>
<div>
- <el-button size="mini" type="text">鍒犻櫎</el-button>
+ <el-button size="mini" type="text" @click="delProductFormVisible = true">鍒犻櫎</el-button>
</div>
</div>
<el-button
@@ -143,14 +143,10 @@
<span />
<div>娴嬭瘯鏍囧噯</div>
</div>
- <!-- <div class="tips-btn">
- <span><i class="el-icon-edit" />鎿嶄綔锛�</span>
- <el-button type="text">缂栬緫</el-button>
- </div> -->
</div>
<div class="message">
<div class="message-item">
- <el-tag type="primary"><i class="el-icon-info" :style="{marginRight:'4px', color:'#409EFF'}"/>鍗曚綅锛氭濮�</el-tag>
+ <el-tag type="primary"><i class="el-icon-info" :style="{marginRight:'4px', color:'#409EFF'}" />鍗曚綅锛氭濮�</el-tag>
</div>
<div class="message-item">
<span><i class="el-icon-edit" />鎷涙爣浜哄憳瑕佹眰锛歿{ detailInfo.required }}</span>
@@ -162,7 +158,7 @@
</div>
</div>
<!-- 娣诲姞浠ュ強淇敼鐨勬ā鎬佹 -->
- <el-dialog title="娣诲姞鐗╂枡" :visible.sync="materialFormVisible">
+ <el-dialog title="娣诲姞鐗╂枡" :visible.sync="materialFormVisible" width="35%">
<el-form :model="addMaterialForm">
<el-row :gutter="20">
<el-col :span="12">
@@ -218,7 +214,7 @@
<el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
</div>
</el-dialog>
- <el-dialog title="娣诲姞瀛愰」鐩�" :visible.sync="projectFormVisible">
+ <el-dialog title="娣诲姞瀛愰」鐩�" :visible.sync="projectFormVisible" width="35%">
<el-form :model="addProjectForm">
<el-row :gutter="20">
<el-col :span="12">
@@ -294,7 +290,7 @@
<el-button @click="projectFormVisible = false">鍙� 娑�</el-button>
</div>
</el-dialog>
- <el-dialog title="淇敼鐗╂枡" :visible.sync="changeMaterialFormVisible">
+ <el-dialog title="淇敼鐗╂枡" :visible.sync="changeMaterialFormVisible" width="35%">
<el-form :model="changeMaterialForm">
<el-row :gutter="20">
<el-col :span="12">
@@ -338,7 +334,7 @@
<el-button @click="changeMaterialFormVisible = false">鍙� 娑�</el-button>
</div>
</el-dialog>
- <el-dialog title="淇敼瀛愰」鐩�" :visible.sync="changeProjectFormVisible">
+ <el-dialog title="淇敼瀛愰」鐩�" :visible.sync="changeProjectFormVisible" width="35%">
<el-form :model="changeProjectForm">
<el-row :gutter="20">
<el-col :span="12">
@@ -398,11 +394,33 @@
<el-button @click="projectFormVisible = false">鍙� 娑�</el-button>
</div>
</el-dialog>
+ <el-dialog
+ title="鎻愮ず"
+ :visible.sync="delmaterialFormVisible"
+ width="30%"
+ >
+ <span>纭鍒犻櫎璇ョ墿鏂欏悧锛�</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deleteMaterial">纭� 瀹�</el-button>
+ <el-button @click="delmaterialFormVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="鎻愮ず"
+ :visible.sync="delProductFormVisible"
+ width="30%"
+ >
+ <span>纭鍒犻櫎璇ュ瓙椤圭洰鍚楋紵</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deleleProduct">纭� 瀹�</el-button>
+ <el-button @click="delProductFormVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
<script>
-import { getMaterialList, getProductList, getProductProductId, addMaterial, addProduct, getMaterialDetail, updateMaterial, updateProduct } from '@/api/standardLibrary'
+import { getMaterialList, getProductList, getProductProductId, addMaterial, addProduct, getMaterialDetail, updateMaterial, updateProduct, deleteMaterial, deleteProduct } from '@/api/standardLibrary'
export default {
name: 'SpecificationDetail',
data() {
@@ -427,14 +445,18 @@
materialTreeDefault: [],
projectTreeDefault: [],
materialFormVisible: false,
+ delmaterialFormVisible: false,
changeMaterialFormVisible: false,
projectFormVisible: false,
changeProjectFormVisible: false,
+ delProductFormVisible: false,
addMaterialForm: {},
changeMaterialForm: {},
addProjectForm: {},
changeProjectForm: {},
- fatherOpetions: []
+ fatherOpetions: [],
+ materialId: '',
+ productId: ''
}
},
// 涓轰簡閫変腑绗竴灞傜骇涓嬬殑绗竴涓妭鐐�
@@ -496,7 +518,6 @@
},
// 鑾峰彇椤圭洰tree
async getProjectTreeData(data) {
- //
const { data: projectArr } = await getProductList({ materialId: data.id })
// console.log(projectArr)
projectArr.map((item, index) => {
@@ -515,6 +536,8 @@
materialTreeClick(data, node, element) {
// 鐐瑰嚮鐗╂枡鑺傜偣锛屾煡璇㈠搴旂殑椤圭洰tree鏁版嵁
console.log(data)
+ // 寰楀埌鐗╂枡Id
+ this.materialId = data.id
this.getProjectTreeData(data)
},
// 椤圭洰搴撶殑鑺傜偣鐐瑰嚮
@@ -522,6 +545,7 @@
// 鍏堝垽鏂偣鍑荤殑鏄埗鑺傜偣杩樻槸瀛愯妭鐐�
if (('children' in data)) return
console.log('瀛愰」鐩妭鐐�', data)
+ this.productId = data.id
//
const { data: detailInfo } = await getProductProductId({ productId: data.id })
// console.log('璇︽儏淇℃伅', detailInfo)
@@ -585,6 +609,15 @@
this.changeProjectForm.name = data.name
// console.log('淇敼鍚�', this.changeMaterialForm)
this.changeProjectFormVisible = true
+ },
+ async deleteMaterial() {
+ await deleteMaterial({ materialId: this.materialId })
+ this.delmaterialFormVisible = false
+ },
+ async deleleProduct() {
+ // console.log('productId', this.productId)
+ await deleteProduct({ productId: this.productId })
+ this.delProductFormVisible = false
}
}
}
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index 7e0ba8b..9905c20 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -90,12 +90,12 @@
placement="top"
width="30"
>
- <div @click=" getRowID(scope.row)" style="text-align: center; margin: 0">
+ <div style="text-align: center; margin: 0" @click=" getRowID(scope.row)">
<div>
- <el-button size="mini" @click="dialogFormVisible4=true" type="text">缂栬緫</el-button>
+ <el-button size="mini" type="text" @click="dialogFormVisible4=true">缂栬緫</el-button>
</div>
<div>
- <el-button size="mini" @click="dialogFormVisible5 = true" type="text">鍋滅敤</el-button>
+ <el-button size="mini" type="text" @click="dialogFormVisible5 = true">鍋滅敤</el-button>
</div>
</div>
<el-button slot="reference" type="text"><i class="el-icon-more" /></el-button>
@@ -107,18 +107,18 @@
<!-- 寮瑰嚭琛ㄥ崟椤� -->
<div>
<!-- 娣诲姞鏍囧噯 -->
- <el-dialog title="娣诲姞鏍囧噯" :visible.sync="dialogFormVisible1">
- <el-form ref="standardForm" :model="standardForm" :rules="rulesStandard">
- <el-form-item label="鏍囧噯鍙�" :label-width="formLabelWidth" prop="standardnumber">
+ <el-dialog title="娣诲姞鏍囧噯" :visible.sync="dialogFormVisible1" width="33%">
+ <el-form :model="standardForm" :rules="rulesStandard">
+ <el-form-item label="鏍囧噯鍙�" label-width="100px" prop="standardnumber">
<el-input v-model="standardForm.standardnumber" autocomplete="off" />
</el-form-item>
- <el-form-item label="鏍囧噯鍚嶇О" :label-width="formLabelWidth" prop="standardname">
+ <el-form-item label="鏍囧噯鍚嶇О" label-width="100px" prop="standardname">
<el-input v-model="standardForm.standardname" autocomplete="off" />
</el-form-item>
- <el-form-item label="鑻辨枃鍚嶇О" :label-width="formLabelWidth" prop="standardenname">
+ <el-form-item label="鑻辨枃鍚嶇О" label-width="100px" prop="standardenname">
<el-input v-model="standardForm.engname" autocomplete="off" />
</el-form-item>
- <el-form-item label="鐖剁骇鍒嗙被" :label-width="formLabelWidth">
+ <el-form-item label="鐖剁骇鍒嗙被" label-width="100px">
<el-select v-model="standardForm.type" placeholder="璇烽�夋嫨">
<el-option label="鍘熸潗鏂�" value="0" />
<el-option label="鐢电嚎鐢电紗" value="1" />
@@ -131,7 +131,7 @@
</div>
</el-dialog>
<!-- 娣诲姞鍨嬪彿 -->
- <el-dialog title="娣诲姞鍨嬪彿" :visible.sync="dialogFormVisible2">
+ <el-dialog title="娣诲姞鍨嬪彿" :visible.sync="dialogFormVisible2" width="30%">
<el-form ref="form" :model="modelForm" :rules="rulesModel">
<el-form-item label="鍨嬪彿" :label-width="formLabelWidth" prop="model">
<el-input v-model="modelForm.model" autocomplete="off" />
@@ -146,7 +146,7 @@
</div>
</el-dialog>
<!-- 娣诲姞瑙勬牸 -->
- <el-dialog title="娣诲姞瑙勬牸" :visible.sync="dialogFormVisible3">
+ <el-dialog title="娣诲姞瑙勬牸" :visible.sync="dialogFormVisible3" width="30%">
<el-form ref="form" :model="specificationForm" :rules="rulesspecification">
<el-form-item label="瑙勬牸鍚嶇О" :label-width="formLabelWidth" prop="name">
<el-input v-model="specificationForm.name" autocomplete="off" />
@@ -185,7 +185,7 @@
</div>
</el-dialog>
<!-- 缂栬緫瑙勬牸 -->
- <el-dialog title="缂栬緫瑙勬牸" :visible.sync="dialogFormVisible4">
+ <el-dialog title="缂栬緫瑙勬牸" :visible.sync="dialogFormVisible4" width="30%">
<el-form ref="form" :model="editSpeForm" :rules="rulesspecification">
<el-form-item label="瑙勬牸鍚嶇О" :label-width="formLabelWidth" prop="name">
<el-input v-model="editSpeForm.name" autocomplete="off" />
@@ -234,7 +234,8 @@
<el-dialog
title="鎻愮ず"
:visible.sync="dialogFormVisible5"
- width="30%">
+ width="30%"
+ >
<span>纭鍋滅敤鍚楋紵</span>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible5 = false">鍙� 娑�</el-button>
@@ -327,7 +328,7 @@
spe_state: '',
voltageLevel: ''
}],
- formLabelWidth: '120',
+ formLabelWidth: '100px',
rulesStandard: {
standardnumber: [
{
@@ -417,6 +418,7 @@
// 璺宠浆浜у搧瑙勬牸璇︽儏椤�
this.$router.push(`/standardLibrary/SpecificationDetails/${row.id}`)
},
+ // 鑾峰彇褰撳墠瑙勬牸鐨勮id
getRowID(row) {
// console.log(row.id)
this.id = row.id
@@ -593,7 +595,13 @@
</script>
<style lang="scss" scoped>
-
+// .dialogform {
+// transform: translate(-50%, -50%);
+// top: 50% !important;
+// left: 50% !important;
+// width: 1000px;
+// height: 800px;
+// }
.standard-library-main{
width: 100%;
height: 100%;
--
Gitblit v1.9.3