From cb57bc6b4abf45dbb0605c94359c63e3b31b4b87 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 10 九月 2024 15:55:57 +0800
Subject: [PATCH] 优化报告生成、修改电路下单传参
---
src/components/view/b1-inspect-order-plan.vue | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 5aa83ee..ba7325f 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -153,7 +153,7 @@
<el-col :span="3">
<div class="center-title">
<span>鎬昏浠诲姟鏁伴噺:</span>
- <span v-if="$refs.insOrderPlan != undefined">{{$refs.insOrderPlan.total}}</span>
+ <span>{{total}}</span>
</div>
</el-col>
</el-row>
@@ -164,12 +164,13 @@
:key="upIndex"/> -->
<el-table
:data="tableData"
- ref="table"
+ ref="table0"
border
style="width: 100%;"
height="calc(100% - 80px)"
:row-class-name="rowClassName"
v-loading="tableLoading"
+ row-key="orderStateId"
>
<el-table-column
prop="entrustCode"
@@ -200,7 +201,7 @@
width="100px"
>
<template slot-scope="scope">
- <el-tag :type="typeList.find(m=>m.value==scope.row.insState).type" size="small">{{ typeList.find(m=>m.value==scope.row.insState).label }}</el-tag>
+ <el-tag :type="insStateList.find(m=>m.value==scope.row.insState).type" size="small">{{ insStateList.find(m=>m.value==scope.row.insState).label }}</el-tag>
</template></el-table-column>
<el-table-column
prop="userName"
@@ -297,7 +298,7 @@
<div style="width: 100%;height: 100%;" v-if="activeFace >0">
<Add :active="activeFace" :currentId="currentId" :examine="examine"/>
</div>
- <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
+ <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state" :orderStateId="orderStateId" :version="version"/>
<el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
<div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
<ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
@@ -323,6 +324,8 @@
},
data() {
return {
+ orderStateId:null,
+ version:null,
examine: null,
inspectorList: [],//妫�楠屼汉鍛樺垪琛�
alone: false,
@@ -540,13 +543,13 @@
}
},
methods: {
+ // 鎷栨嫿
initializeSortable() {
- const tableBody = this.$refs.table.$el.querySelector('.el-table__body-wrapper > table > tbody');
-
+ const tableBody = this.$refs.table0.$el.querySelector('.el-table__body-wrapper > table > tbody');
if (tableBody) {
Sortable.create(tableBody, {
handle: '.el-table__row', // 鎷栧姩鎵嬫焺
- animation: 150,
+ animation: 200,
onEnd: this.handleSortEnd,
});
} else {
@@ -557,9 +560,14 @@
const oldIndex = evt.oldIndex;
const newIndex = evt.newIndex;
const movedItem = this.tableData[oldIndex];
+ if (oldIndex !== newIndex) {
+ this.tableData.splice(oldIndex, 1);
+ this.tableData.splice(newIndex, 0, movedItem);
+ }
+ this.upIndex++
this.$axios.post(this.$api.insOrderPlan.jumpTeam,
{
- id: movedItem.id,
+ id: movedItem.orderStateId,
sort: newIndex+1,
...this.page
}, {
@@ -567,7 +575,9 @@
'Content-Type': 'application/json'
}
}
- ).then(res => {})
+ ).then(res => {
+
+ })
},
rowClassName({ row, rowIndex }) {
return 'draggable-row';
@@ -671,6 +681,7 @@
this.tableLoading = false
this.total = res.data.body.total
this.tableData = res.data.body.records
+ // this.$refs.table0.doLayout()
})
},
changeRowClass({
@@ -781,8 +792,10 @@
inspectorList.push(user.name)
}
this.inspectorList = inspectorList
- this.state = 1;
this.orderId = row.id
+ this.version = row.version
+ this.orderStateId = row.orderStateId
+ this.state = 1;
},
handleConnect(row){
this.orderId = row.id
@@ -832,6 +845,8 @@
handleReview(row){
this.state = 2;
this.orderId = row.id
+ this.version = row.version
+ this.orderStateId = row.orderStateId
},
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
--
Gitblit v1.9.3