From e3fd4f635af4a4d05d5fe99e88124d1ad3ba0e0b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 八月 2025 09:36:11 +0800
Subject: [PATCH] 检验任务新增人员筛选+检验和复核的时候支持样品编号修改
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 51 +++++++++++++++++++++++++
src/components/view/b1-inspect-order-plan.vue | 12 +++++
src/assets/api/controller.js | 1
3 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 57ea39a..4cc9cba 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -277,6 +277,7 @@
upPlanUser2: "/insOrderPlan/upPlanUser2", //浠诲姟浜ゆ帴
verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔�
submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜�
+ changeSampleCode: "/insOrderPlan/changeSampleCode", //鏍峰搧缂栧彿鏇存敼
inspectionOrderDetailsTaskSwitching:
"/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 妫�楠屽崟璇︽儏-浠诲姟鍒囨崲
getInsProduct: "/insOrderPlan/getInsProduct", // 鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 86f67e1..4179148 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -315,6 +315,7 @@
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
<!-- <el-button size="small" type="primary" @click="sampleVisible=true;uploadSample()">鏍峰搧鍒囨崲</el-button> -->
+ <el-button size="small" type="primary" @click="showSampleChangeDialog" >鏍峰搧缂栧彿鏇存敼</el-button>
<el-button size="small" type="primary" @click="taskVisible = true" v-show="!isLook">浠诲姟鍒囨崲</el-button>
<el-button size="small" type="primary" @click="handleSubmit" v-if="state == 1"
:loading="submitLoading">鎻愪氦</el-button>
@@ -1168,6 +1169,21 @@
<el-button type="primary" @click="upInsReview" :loading="reviewLoading">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <el-dialog
+ title="淇敼鏍峰搧缂栧彿"
+ :visible.sync="changeSampleDialog"
+ width="30%"
+ :before-close="handleCloseSampleChangeDialog">
+ <el-form ref="changeSampleFormRef" :model="changeSampleForm" :rules="{sampleCode:[{required:true,message:'璇疯緭鍏ユ牱鍝佺紪鍙�',trigger:'blur'}]}">
+ <el-form-item label="鏍峰搧缂栧彿:" prop="sampleCode" >
+ <el-input clearable v-model="changeSampleForm.sampleCode" placeholder='鏍峰搧缂栧彿'></el-input>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="handleCloseSampleChangeDialog">鍙� 娑�</el-button>
+ <el-button type="primary" @click="confirmChangeSample">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -1206,6 +1222,10 @@
},
data() {
return {
+ changeSampleDialog: false,
+ changeSampleForm:{
+ sampleCode:null,
+ },
lookFileVisible: false, //棰勮鏂囦欢
experimentDia: false,
experimentDia0: false,
@@ -1645,6 +1665,37 @@
this.stopWorker();
},
methods: {
+ handleCloseSampleChangeDialog(){
+ this.changeSampleForm = {sampleChange:null}
+ this.$refs.changeSampleFormRef.resetFields();
+ this.changeSampleDialog = false
+ },
+ //纭淇敼鏍峰搧缂栧彿
+ confirmChangeSample(){
+ this.$refs.changeSampleFormRef.validate((valid)=>{
+ if(valid){
+ this.$axios.post(this.$api.insOrderPlan.changeSampleCode,{
+ id:this.currentSample.id,
+ sampleCode:this.changeSampleForm.sampleCode
+ },{
+ headers:{"Content-Type":"application/json"}
+ }).then(res=>{
+ if(res.code==200){
+ this.$message.success("淇敼鎴愬姛")
+ //璋冪敤鍒锋柊鏂规硶
+ this.currentSample.sampleCode = this.changeSampleForm.sampleCode
+ }
+ this.$nextTick(()=>{
+ this.handleCloseSampleChangeDialog()
+ })
+ })
+ }
+ })
+ },
+ //鏄剧ず淇敼鏍峰搧缂栧彿
+ showSampleChangeDialog(){
+ this.changeSampleDialog = true
+ },
// 鏁版嵁閲囬泦
getDataAcquisitionDevice() {
if (
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 1011779..5db17c9 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -143,7 +143,7 @@
<div class="search_thing">
<div class="search_label">妫�楠岀姸鎬侊細</div>
<div class="search_input">
- <el-select size="small" v-model="componentData.entity.insState" style="width: 100%;"
+ <el-select size="small" v-model="componentData.entity.insState" clearable style="width: 100%;"
@change="refreshTable()">
<el-option v-for="(a, i) in insStateList" :key="i" :label="a.label" :value="a.value"></el-option>
</el-select>
@@ -156,6 +156,16 @@
@keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
+ <div class="search_thing">
+ <div class="search_label">浜哄憳锛�</div>
+ <div class="search_input">
+ <el-select size="small" v-model="componentData.entity.userName" filterable clearable style="width: 100%;"
+ @change="refreshTable()">
+ <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.label">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
--
Gitblit v1.9.3