From 4944f8d2aec1ebd5eb18afa7b500c0c27edbbade Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 22 三月 2024 16:28:15 +0800
Subject: [PATCH] 功能调整
---
src/components/tool/value-table.vue | 4 ++--
src/components/do/b1-inspect-order-plan/Inspection.vue | 16 ++++++++++++++--
src/components/view/b1-inspect-order-plan.vue | 13 ++++++++++---
src/assets/api/controller.js | 3 ++-
4 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 28c7850..61f59e7 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -14,7 +14,7 @@
StandardTemplate,
insOrder,
sampleOrder,
- insOrderPlan
+ insOrderPlan
}
}
@@ -133,6 +133,7 @@
const insOrderPlan = {
selectInsOrderPlanList: "/insOrderPlan/selectInsOrderPlanList", //鏌ヨ妫�楠屼换鍔�
claimInsOrderPlan: "/insOrderPlan/claimInsOrderPlan",//璁ら妫�楠屼换鍔�
+ doInsOrder: "/insOrderPlan/doInsOrder",//鎵ц妫�楠屾搷浣�
}
const systemLog = {
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 62d69ab..4167ba1 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -140,7 +140,9 @@
state: null
},
productList:[],
- id: 0
+ id: 0,
+ insOrder: {},
+ sampleProduct: []
}
},
created() {
@@ -148,6 +150,16 @@
},
mounted() {
+ },
+ watch:{
+ id(val){
+ this.$axios.post(this.$api.insOrderPlan.doInsOrder,{
+ id: val
+ }).then(res=>{
+ this.insOrder = res.data.insOrder
+ this.sampleProduct = res.data.sampleProduct
+ })
+ }
},
methods: {
handleChangeSample(row){
@@ -157,7 +169,7 @@
handleChangeTask(row){
console.log(222222222,row)
this.taskVisible = false;
- }
+ },
}
}
</script>
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 889071c..8bbfbb7 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -55,11 +55,11 @@
} */
.value-table .highlight-danger-row-border td:first-child {
- border-left: 4px solid red;
+ border-left: 4px solid #f56c6c;
}
.value-table .highlight-danger-row-border td:last-child {
- border-right: 4px solid red;
+ border-right: 4px solid #f56c6c;
}
.value-table .el-upload {
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 4cba208..cc2bd16 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -164,7 +164,7 @@
<div style="width: 100%;height: 100%;" v-if="activeFace >0">
<Add :active="activeFace" :currentId="currentId"/>
</div>
- <Inspection v-if="state==1" @goback="state=0" :orderId="orderId"/>
+ <Inspection v-if="state==1" @goback="goback" :orderId="orderId"/>
</div>
</template>
@@ -209,7 +209,10 @@
id: '',
font: '妫�楠�',
type: 'text',
- method: 'handleInspection'
+ method: 'handleInspection',
+ disabFun: (row, index) => {
+ return row.userId == null
+ }
}, {
id: '',
font: '浜ゆ帴',
@@ -270,7 +273,7 @@
activeFace: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
currentId: null,
entityCopy: {},
- orderId: 0
+ orderId: 0,
}
},
created() {
@@ -413,6 +416,10 @@
playOrder(num) {
this.activeFace = num
},
+ goback() {
+ this.state = 0
+ this.refreshTable()
+ },
handleInspection(row){
this.state = 1;
this.orderId = row.id
--
Gitblit v1.9.3