From dc3af0cbb4a6d105bdff497b510cc0a87b3e8d0a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 28 二月 2025 17:53:44 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/productOrder/components/add.vue | 56 ++++++++------------------------------------------------
1 files changed, 8 insertions(+), 48 deletions(-)
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 4a13829..93e2d2c 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -547,7 +547,7 @@
selectStandardTreeList2
} from "@/api/business/rawMaterialOrder";
import {
- addInsOrder, delInsOrderTemplate,
+ addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
getQuarterOnOrder,
selectOrderManDay,
updateInsOrder,
@@ -933,7 +933,7 @@
this.getCompanyList()
},
getCompanyList () {
- selectCustomPageList().then(res => {
+ selectCustomPageList({...this.page1}).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
this.tableData1 = res.data.records
@@ -1634,17 +1634,14 @@
sampleList: this.sampleList,
selectTree:this.selectTree
})
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res => {
- if (res.code == 201) return
this.templateLoading = false;
this.templateDia = false;
this.$message.success('淇濆瓨鎴愬姛')
this.selectInsOrderTemplate()
this.templateName = ''
+ }).catch(e => {
+ this.templateLoading = false;
})
} else {
this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
@@ -1947,7 +1944,7 @@
},
// 杈呭姪绾胯姱閰嶇疆
openAuxiliaryCore () {
- if (this.active === 1) {
+ if (this.active == 1) {
if (this.sampleIds.length === 0) {
this.$message.error("鏈�夋嫨鏍峰搧")
} else if (this.sampleIds.length === 1) {
@@ -1975,7 +1972,7 @@
}
},
openCableConfig() {
- if (this.active === 1) {
+ if (this.active == 1) {
if (this.sampleIds.length === 0) {
this.$message.error("鏈�夋嫨鏍峰搧")
} else if (this.sampleIds.length === 1) {
@@ -2146,51 +2143,14 @@
this.productList0.splice(index,1)
},
goBack () {
- const obj = { path: "/business/productOrder" };
- this.$tab.closeOpenPage(obj);
+ this.$router.go(-1)
}
}
}
</script>
<style scoped>
-.ins_order_add .el-input-group__append,
-.el-input-group__prepend {
- padding: 0 10px;
-}
-
-.ins_order_add .el-tree-node__content {
- height: 32px;
- font-size: 14px;
- border-radius: 2px;
-}
-
-.ins_order_add .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+.el-table .warning-row .cell {
color: #3A7BFA;
-}
-
-.ins_order_add .has-gutter .el-table__cell .cell {
- line-height: 30px;
- background-color: #fafafa;
-}
-
-.ins_order_add .has-gutter .el-table__cell {
- background-color: #fafafa !important;
-}
-
-.ins_order_add .el-table__row .cell {
- font-size: 12px;
-}
-
-.ins_order_add .el-table .warning-row .cell {
- color: #3A7BFA;
-}
-
-.ins_order_add .el-select .is-disabled {
- background: transparent !important;
-}
-
-.ins_order_add .el-select .is-disabled .el-input__inner {
- background: transparent !important;
}
</style>
--
Gitblit v1.9.3