From 6816ee4cbdaa253c2cd452e0e582a351860ffbe7 Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期一, 07 四月 2025 16:35:36 +0800 Subject: [PATCH] 成品检验项分配人员 --- src/views/business/productOrder/index.vue | 95 +++++++++++++++++++++++++---------------------- 1 files changed, 50 insertions(+), 45 deletions(-) diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue index 8083832..80e631e 100644 --- a/src/views/business/productOrder/index.vue +++ b/src/views/business/productOrder/index.vue @@ -33,8 +33,8 @@ <el-form-item> <el-button :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" style="color: #3A7BFA;" type="text" @click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button> - <el-button size="small" @click="refresh()">閲� 缃�</el-button> - <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button> + <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button> + <el-button size="mini" @click="refresh()">閲嶇疆</el-button> </el-form-item> </el-form> </div> @@ -111,7 +111,7 @@ </span> </el-dialog> <!-- 涓嬪彂 --> - <el-dialog :before-close="handleClose" :visible.sync="issuedDialogVisible" title="妫�楠屽垎閰�" width="400px"> + <!-- <el-dialog :before-close="handleClose" :visible.sync="issuedDialogVisible" title="妫�楠屽垎閰�" width="400px"> <div class="body" style="max-height: 60vh;"> <el-row> <el-col class="search_thing" style="width: 95%;"> @@ -151,7 +151,7 @@ <el-button :loading="upLoad" type="primary" @click="submitForm2">纭� 瀹�</el-button> </el-row> </span> - </el-dialog> + </el-dialog> --> <el-dialog :visible.sync="dataDialogVisible" title="鏁版嵁鏌ョ湅" width="80%" @close="closeDia"> <div v-if="dataDialogVisible"> <lims-table :tableData="tableDataLook" :column="tableDataLookColumn" @pagination="tableDataLookPagination" @@ -175,7 +175,7 @@ <el-row> <el-button @click="handleNo">{{ deleteTilte == '鎾ら攢' ? '鍙� 娑�' : '涓嶉�氳繃' }}</el-button> <el-button :loading="printLoading" type="primary" @click="submitDelete">{{ deleteTilte == '鎾ら攢' ? '纭� 瀹�' : - '閫氳繃'}}</el-button> + '閫氳繃' }}</el-button> </el-row> </span> </el-dialog> @@ -300,6 +300,7 @@ @closePrintDialog="closePrintDialog"></print-dialog> <!--娣诲姞閬楁紡妫�楠岄」寮规--> <add-inspection-dia v-if="addInspectionDia" ref="addInspectionDia"></add-inspection-dia> + <issuedDialog ref="issuedDialog" /> <!-- <Inspection v-if="state>0" :key="InspectionKey" :inspectorList="inspectorList" :orderId="orderId"--> <!-- :sonLaboratory="sonLaboratory" :state="state"--> <!-- :typeSource="typeSource" @goback="goback" @refreshView="refreshView"/>--> @@ -312,6 +313,7 @@ import PrintDialog from "@/views/business/productOrder/components/printDialog.vue"; import AddInspectionDia from "@/views/business/productOrder/components/addInspectionDia.vue"; import limsTable from "@/components/Table/lims-table.vue"; +import issuedDialog from './components/issuedDialog.vue' import { checkUpdate, delInsOrder, rawAllInsOrderExport, @@ -328,7 +330,8 @@ limsTable, AddInspectionDia, PrintDialog, - vueQr + vueQr, + issuedDialog }, data() { return { @@ -505,7 +508,7 @@ this.handleIssued(row); }, disabled: (row, index) => { - return row.state != 1 || !!row.assign + return row.state != 1 }, showHide: (row) => { return this.tabIndex === 1 @@ -542,8 +545,8 @@ state: 0,// 0:鍙拌处椤碉紝1锛氭楠岄〉闈�,2妫�楠岄〉闈�(澶嶆牳)锛岄粯璁や负0,3鏁版嵁鏌ョ湅 InspectionKey: 1, inspectorList: [],//妫�楠屼汉鍛樺垪琛� - sonLaboratory: null,// 0:濮旀墭锛�1锛氬師杈呮枡 - typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮枡涓嬪崟 + sonLaboratory: null,// 0:濮旀墭锛�1锛氬師鏉愭枡 + typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟 deleteTilte: '鎾ら攢', examine: null, deleteList: [], @@ -607,6 +610,7 @@ } } }, + { label: "妫�楠屼汉", prop: "checkUserName" }, ], filesDialogVisible: false, // 闄勪欢鏌ョ湅寮规 tableDataFile: [], @@ -673,7 +677,7 @@ entrustCodeInfo: {}, submitCodeLoading: false, // 浜哄憳鍒楄〃 - personList: [], + // personList: [], orderId: '', revocationInsProductIds: '', componentDataDelete: [], @@ -760,7 +764,7 @@ }, mounted() { this.refreshTable() - this.getAuthorizedPerson() + // this.getAuthorizedPerson() }, activated() { this.refreshTable() @@ -921,18 +925,18 @@ this.printDialog = false }, // 鑾峰彇鎸囨淳浜哄憳涓嬫媺鍒楄〃 - getAuthorizedPerson() { - selectUserCondition({ type: 1 }).then(res => { - let data = [] - res.data.forEach(a => { - data.push({ - label: a.name, - value: a.id - }) - }) - this.personList = data - }) - }, + // getAuthorizedPerson() { + // selectUserCondition({ type: 1 }).then(res => { + // let data = [] + // res.data.forEach(a => { + // data.push({ + // label: a.name, + // value: a.id + // }) + // }) + // this.personList = data + // }) + // }, handleClose() { this.verifyDialogVisible = false; this.quashDialogVisible = false; @@ -1111,28 +1115,29 @@ }, // 涓嬪彂 handleIssued(row) { - this.issuedDialogVisible = true; - selectOrderManDay({ - id: row.id - }).then(res => { - this.distributeData.orderId = row.id - this.distributeData.sampleId = row.sampleId - this.distributeData.appointed = res.data - this.distributeData.type = row.type - }) - upPlanUser2({ - orderId: row.id, - }).then(res => { - if (res.code === 200 && res.data.length > 0) { - this.sonLaboratoryList = []; - res.data.forEach(m => { - this.sonLaboratoryList.push({ - value: m, - label: m - }) - }) - } - }) + // this.issuedDialogVisible = true; + this.$refs.issuedDialog.init(row) + // selectOrderManDay({ + // id: row.id + // }).then(res => { + // this.distributeData.orderId = row.id + // this.distributeData.sampleId = row.sampleId + // this.distributeData.appointed = res.data + // this.distributeData.type = row.type + // }) + // upPlanUser2({ + // orderId: row.id, + // }).then(res => { + // if (res.code === 200 && res.data.length > 0) { + // this.sonLaboratoryList = []; + // res.data.forEach(m => { + // this.sonLaboratoryList.push({ + // value: m, + // label: m + // }) + // }) + // } + // }) }, submitForm2() { if (this.distributeData.appointed == null || this.distributeData.appointed == '') { -- Gitblit v1.9.3