From 2d55ed180fddd028bf4f839345bf0ef4d2f032e7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 13:34:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/materialOrder/copperOrder.vue | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 07ecb07..8227fdd 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -99,7 +99,7 @@
</el-col>
<el-col :span="6">
<el-form-item class="addObj-form-item" label="澶囨敞:">
- <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :placeholder="active>1 ? '' : '璇疯緭鍏�'" :readonly="active>1" clearable
+ <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :placeholder="active>1 ? '' : '璇疯緭鍏�'" :disabled="active>1" clearable
size="small" type="textarea"></el-input>
</el-form-item>
</el-col>
@@ -421,17 +421,13 @@
}
export default {
+ name: 'CopperOrder',
components: {},
dicts: ['check_type', 'urgency_level'],
- props: {
- currentId: {
- type: Number,
- default: () => 0
- }
- },
data() {
return {
active: '',
+ currentId: '',
sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
editTable:[],
noNeedCheckLoad: false, // 鍏嶆鎸夐挳loading
@@ -620,12 +616,21 @@
},
mounted() {
this.active = this.$route.query.active
- this.getUserNowInfo()
- this.selectStandardTreeList()
- this.selectStandardMethods()
- this.getInfo() // 鑾峰彇鏁版嵁
+ this.currentId = this.$route.query.currentId
+ this.getInfoRow();
+ },
+ activated() {
+ this.active = this.$route.query.active
+ this.currentId = this.$route.query.currentId
+ this.getInfoRow();
},
methods: {
+ getInfoRow() {
+ this.getUserNowInfo()
+ this.selectStandardTreeList()
+ this.selectStandardMethods()
+ this.getInfo() // 鑾峰彇鏁版嵁
+ },
// 鎷嗗垎
handleSplitCountNum () {
this.sample.joinName = null
@@ -725,9 +730,8 @@
})
}).then(res => {
this.noNeedCheckLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.noNeedCheckLoad = false
})
@@ -1166,10 +1170,9 @@
})
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.saveLoad = false
})
@@ -1191,7 +1194,7 @@
},
getProNum() {
this.sampleSelectionList.forEach((m, i) => {
- Vue.set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
+ Vue.set(this.sampleSelectionList[i], 'proNum', 1)
})
this.$refs.sampleTable.doLayout()
},
@@ -1785,9 +1788,16 @@
},
goBack () {
- const obj = { path: "/business/materialOrder" };
- this.$tab.closeOpenPage(obj);
- }
+ if (this.active == 1) {
+ this.$router.go(-1)
+ } else {
+ this.closeOpenPage()
+ }
+ },
+ closeOpenPage() {
+ this.$router.go(-1)
+ this.$tab.closeOpenPage()
+ },
}
}
</script>
--
Gitblit v1.9.3