From ceec89801ad69708c33babb90d4f9d9ebfd8e3f9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 27 八月 2026 16:20:42 +0800
Subject: [PATCH] fix(order): -移除英文字段验证 - 删除与OA流程相关的无用代码和组件 - 移除系统用户管理中的获取三方人员功能 - 更新设备二维码链接使用动态API地址 - 清理不合格处理页面中的OA相关功能和字段 - 移除登录页面的集团集成登录按钮 - 删除未使用的API接口和组件引用
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 713b339..47361c1 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -13,7 +13,7 @@
style="display: inline;margin-right: 8px"
:action="uploadAction1"
:before-upload="beforeUpload1" :headers="token" :on-error="onError1"
- :on-success="handleSuccessUp" :show-file-list="false" accept='.doc,.docx,.xls,.xlsx'>
+ :on-success="handleSuccessUp1" :show-file-list="false" accept='.doc,.docx,.xls,.xlsx'>
<el-button size="small" type="primary">瀵煎叆</el-button>
</el-upload>
<el-button size="small" type="primary" v-if="radio === 1" @click="uploadDia = true">瀵煎叆</el-button>
@@ -33,14 +33,24 @@
v-model="itemParameterForm.inspectionItemSubclass" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
- <el-form-item label="妫�楠屽璞�" prop="specimenName">
+ <el-form-item label="妫�楠屽璞�" prop="sample" v-if="radio===0">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="itemParameterForm.sample" @keyup.enter.native="refreshTable()">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="妫�楠屽璞�" prop="specimenName" v-if="radio===1">
<el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="itemParameterForm.specimenName" @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
+ <el-form-item label="闆朵欢鍙�" prop="partNo" v-if="radio===1">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="itemParameterForm.partNo" @keyup.enter.native="refreshTable()">
+ </el-input>
+ </el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
</el-form-item>
</el-form>
<!-- 妫�楠岄」鐩弬鏁拌〃鏍�-->
@@ -59,6 +69,7 @@
<!--浜у搧缁存姢寮规-->
<el-dialog title="浜у搧缁存姢" :visible.sync="diaProduct" width="900px">
<lims-table :tableData="productData" :column="productColumn" height="460"
+ @pagination="productPagination"
:page="productPage" :tableLoading="productableLoading"></lims-table>
<span slot="footer" class="dialog-footer">
<el-button @click="diaProduct = false">鍙� 娑�</el-button>
@@ -126,6 +137,7 @@
import { obtainItemParameterList } from '@/api/structural/laboratoryScope'
export default {
+ name: 'Capability',
components: {limsTable, EditForm, testObjectEditForm, BindPartDialog, BindSupplierDensityDialog},
data() {
return {
@@ -195,7 +207,7 @@
return null
}
// if (params == 1) {
- // return '瑁呭鐢电紗璇曢獙瀹�'
+ // return '鐢电紗璇曢獙瀹�'
// } else if (params == 5) {
// return '閫氫俊浜у搧瀹為獙瀹�'
// } else if (params == 6) {
@@ -296,7 +308,9 @@
itemParameterForm: {
inspectionItem: null,
inspectionItemSubclass: null,
- specimenName: null
+ sample: null,
+ specimenName: null,
+ partNo: null
},
radio: 0,
productLoad: false,
@@ -343,7 +357,8 @@
productPage: {
total:0,
size:10,
- current:0,
+ current:1,
+ partNo: null,
layout: 'total, prev, pager, next'
},
productableLoading: false,
@@ -357,8 +372,7 @@
},
objectId: '',
productRules: {
- name: [{ required: true, message: '璇峰～鍐欎骇鍝佸悕绉�', trigger: 'blur' }],
- nameEn: [{ required: true, message: '璇峰～鍐欎骇鍝佸悕绉癊N', trigger: 'blur' }]
+ name: [{ required: true, message: '璇峰～鍐欎骇鍝佸悕绉�', trigger: 'blur' }]
},
uploadDia: false,
fileList: [],
@@ -430,10 +444,10 @@
return true;
}
},
- handleSuccessUp (response, file, fileList) {
- this.$refs.upload.clearFiles()
- if (response.code === 201) {
- this.$message.error(response.message)
+ handleSuccessUp1 (response, file, fileList) {
+ this.$refs.upload1.clearFiles()
+ if (response.code !== 200) {
+ this.$message.error(response.msg)
return
}
this.$message.success('涓婁紶鎴愬姛')
@@ -538,8 +552,11 @@
upProduct(row) {
this.diaProduct = true
this.objectId = row.id
+ this.productPage.current = 1
+ this.productPage.partNo = this.itemParameterForm.partNo
this.getProductList(row)
},
+ // 鏌ヨ浜у搧缁存姢鍒楄〃鏁版嵁
getProductList () {
const params = {
objectId: this.objectId,
@@ -553,6 +570,11 @@
this.productableLoading = false
})
},
+ // 浜у搧缁存姢鍒楄〃鍒嗛〉
+ productPagination(page) {
+ this.productPage.current = page.page
+ this.getProductList()
+ },
// 浜у搧缁存姢-鏂板-缂栬緫
editProduct (type, row) {
this.productEditDia = true
--
Gitblit v1.9.3