From b1187d1141a17fea3a7c184db73f232ca9877a85 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期六, 15 二月 2025 15:41:39 +0800 Subject: [PATCH] 能力范围-零件绑定联调 --- src/views/structural/capabilityAndLaboratory/capability/index.vue | 125 +++++++++++++++++++++++++++++++++-------- 1 files changed, 99 insertions(+), 26 deletions(-) diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue index 9916b1e..d026e38 100644 --- a/src/views/structural/capabilityAndLaboratory/capability/index.vue +++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue @@ -3,7 +3,7 @@ <div> <el-row class="title"> <el-col :span="12" style="text-align: left"> - <el-radio-group v-model="radio" size="medium" fill="#409EFF"> + <el-radio-group v-model="radio" size="medium" fill="#409EFF" @change="refreshTable"> <el-radio-button :label="0">妫�楠岄」鐩弬鏁�</el-radio-button> <el-radio-button :label="1">妫�楠屽璞�</el-radio-button> </el-radio-group> @@ -43,10 +43,12 @@ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button> </el-form-item> </el-form> +<!-- 妫�楠岄」鐩弬鏁拌〃鏍�--> <div class="table" v-if="radio===0"> <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"></lims-table> </div> +<!-- 妫�楠屽璞¤〃鏍�--> <div class="table" v-if="radio===1"> <lims-table :tableData="testObjectTableData" :column="testObjectColumn" :page="testObjectPage" :tableLoading="tableLoading"></lims-table> @@ -64,8 +66,8 @@ </span> </el-dialog> <!--浜у搧缁存姢缂栬緫--> - <el-dialog title="缂栬緫浜у搧缁存姢" :visible.sync="productEditDia" width="400px"> - <el-form :model="productEditForm" ref="productEditForm" :rules="productRules"> + <el-dialog title="鎿嶄綔浜у搧缁存姢" :visible.sync="productEditDia" width="400px"> + <el-form :model="productEditForm" ref="productEditForm" :rules="productRules" label-position="right" label-width="100px"> <el-form-item label="浜у搧鍚嶇О" prop="name"> <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="productEditForm.name"></el-input> </el-form-item> @@ -96,8 +98,8 @@ </span> </el-dialog> <!--妫�楠岄」鐩弬鏁�-缂栬緫寮规--> - <EditForm ref="editForm" @refreshTable="refreshTable"></EditForm> - <testObjectEditForm ref="testObjectEditForm"></testObjectEditForm> + <EditForm ref="editForm" @refreshList="refreshList1"></EditForm> + <testObjectEditForm ref="testObjectEditForm" @refreshList="refreshList"></testObjectEditForm> <BindPartDialog v-if="bindPartDialog" :bindPartDialog="bindPartDialog" :currentRow="currentRow" :type="type" @@ -113,8 +115,9 @@ import BindPartDialog from "@/components/capability/bindPartDialog.vue" import BindSupplierDensityDialog from "@/components/capability/bindSupplierDensityDialog.vue" import { + addProduct, delItemParameter, delProduct, delTestObject, selectItemParameterList, selectProductListByObjectId, - selectTestObjectList, + selectTestObjectList, upProduct, } from "@/api/structural/capability"; import limsTable from "@/components/Table/lims-table.vue"; import EditForm from "@/components/capability/EditForm.vue"; @@ -151,10 +154,12 @@ dataType: 'action', fixed: 'right', label: '鎿嶄綔', + width: '140px', operation: [ { name: '缂栬緫', type: 'text', + icon: 'el-icon-edit', clickFun: (row) => { this.editForm(row); }, @@ -162,6 +167,7 @@ { name: '鍒犻櫎', type: 'text', + icon: 'el-icon-delete', clickFun: (row) => { this.delete(row); }, @@ -240,10 +246,12 @@ dataType: 'action', fixed: 'right', label: '鎿嶄綔', + width: '240px', operation: [ { name: '缂栬緫', type: 'text', + icon: 'el-icon-edit', clickFun: (row) => { this.editTestObjectForm(row); }, @@ -251,6 +259,7 @@ { name: '鍒犻櫎', type: 'text', + icon: 'el-icon-delete', clickFun: (row) => { this.deleteTest(row); }, @@ -300,6 +309,7 @@ { name: '缂栬緫', type: 'text', + icon: 'el-icon-edit', clickFun: (row) => { this.editProduct('edit', row); }, @@ -307,6 +317,7 @@ { name: '鍒犻櫎', type: 'text', + icon: 'el-icon-delete', clickFun: (row) => { this.deleteProduct(row); }, @@ -336,10 +347,14 @@ }, productableLoading: false, productEditDia: false, + operationType: '', productEditForm: { + objectId: '', + id: '', name: '', nameEn: '' }, + objectId: '', productRules: { name: [{ required: true, message: '璇峰~鍐欎骇鍝佸悕绉�', trigger: 'blur' }], nameEn: [{ required: true, message: '璇峰~鍐欎骇鍝佸悕绉癊N', trigger: 'blur' }] @@ -355,7 +370,7 @@ type: null, // 闆朵欢缁戝畾鐨勭被鍨�--0锛氭楠屽璞★紝1锛氫骇鍝佺淮鎶� } }, - mounted() { + created() { this.refreshTable() }, computed: { @@ -365,7 +380,7 @@ }, methods: { submitUpload() { - if (this.$refs.upload.uploadFiles.length == 0) { + if (this.$refs.upload.uploadFiles.length === 0) { this.$message.error('鏈�夋嫨鏂囦欢') return } @@ -376,7 +391,7 @@ this.$refs.upload.clearFiles() this.uploadDia = false this.uploading = false - if (response.code == 201) { + if (response.code === 201) { this.$message.error(response.message) return } @@ -414,11 +429,17 @@ }, handleSuccessUp (response, file, fileList) { this.$refs.upload.clearFiles() - if (response.code == 201) { + if (response.code === 201) { this.$message.error(response.message) return } this.$message.success('涓婁紶鎴愬姛') + this.refreshTable() + }, + refreshList () { + this.refreshTable() + }, + refreshList1 () { this.refreshTable() }, refreshTable() { @@ -463,12 +484,23 @@ }, // 妫�楠岄」鐩弬鏁�-鍒犻櫎 delete (row) { - this.$modal.confirm('鏄惁纭鍒犻櫎姝ゆ暟鎹」锛�').then(function() { - return delItemParameter(row.id); + this.$confirm('姝ゆ搷浣滃皢鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' }).then(() => { - this.getList(); - this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => {}); + delItemParameter({id:row.id}).then(res => { + if (res.code === 200) { + this.$message.success('鍒犻櫎鎴愬姛') + this.refreshTable(); + } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑堝垹闄�' + }); + }) }, // 妫�楠屽璞�-鎵撳紑淇敼寮规 editTestObjectForm (row) { @@ -476,16 +508,28 @@ }, // 妫�楠岄」鐩弬鏁�-鍒犻櫎 deleteTest (row) { - this.$modal.confirm('鏄惁纭鍒犻櫎姝ゆ暟鎹」锛�').then(function() { - return delTestObject(row.id); + this.$confirm('姝ゆ搷浣滃皢鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' }).then(() => { - this.getList(); - this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => {}); + delTestObject({id:row.id}).then(res => { + if (res.code === 200) { + this.$message.success('鍒犻櫎鎴愬姛') + this.refreshTable(); + } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑堝垹闄�' + }); + }) }, // 浜у搧缁存姢 upProduct(row) { this.diaProduct = true + this.objectId = row.id this.getProductList(row) }, getProductList (row) { @@ -506,6 +550,7 @@ // 浜у搧缁存姢-鏂板-缂栬緫 editProduct (type, row) { this.productEditDia = true + this.operationType = type if (type === 'edit') { this.productEditForm = row } @@ -514,7 +559,24 @@ submitProduct () { this.$refs['productEditForm'].validate((valid) => { if (valid) { - + this.productEditForm.objectId = this.objectId + if (this.operationType === 'add') { + addProduct(this.productEditForm).then(res => { + if (res.code === 200) { + this.$message.success('鏂板鎴愬姛') + this.productEditDia = false + this.refreshTable(); + } + }) + } else { + upProduct(this.productEditForm).then(res => { + if (res.code === 200) { + this.$message.success('鏂板鎴愬姛') + this.productEditDia = false + this.refreshTable(); + } + }) + } } }) }, @@ -524,12 +586,23 @@ }, // 浜у搧缁存姢-鍒犻櫎 deleteProduct (row) { - this.$modal.confirm('鏄惁纭鍒犻櫎姝ゆ暟鎹」锛�').then(function() { - return delProduct(row.id); + this.$confirm('姝ゆ搷浣滃皢鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' }).then(() => { - this.getList(); - this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => {}); + delProduct({id:row.id}).then(res => { + if (res.code === 200) { + this.$message.success('鍒犻櫎鎴愬姛') + this.refreshTable(); + } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑堝垹闄�' + }); + }) }, // 闆朵欢缁戝畾 bindPartFirst (row) { -- Gitblit v1.9.3