From 4bf10a1ba42ddaeab565c105b376c5732b0f3dab Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 09 四月 2024 11:47:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silk-web
---
src/views/productManage/productRegisterForm/addProductRegisterPage.vue | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
index ce36553..51564e9 100644
--- a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
+++ b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
@@ -5,7 +5,7 @@
<el-button type="primary" size="small">鏀惧純</el-button>
<el-button type="primary" size="small">淇濆瓨</el-button>
<el-divider direction="vertical"></el-divider>
- <el-button type="primary" size="small">閫�鍑�</el-button>
+ <el-button type="primary" size="small" @click="quitClick">閫�鍑�</el-button>
</div>
<div class="t-right">
<div class="t-right-circle" :class="isDeviceConnectStatus ? 't-r-bg-green ' : 't-r-bg-red '"></div>
@@ -75,7 +75,7 @@
</el-col>
<el-col :span="3">
<el-form-item label="缁勫埆" prop="group">
- <el-select v-model="ruleForm.group" placeholder="璇烽�夋嫨杞﹂棿" size="small">
+ <el-select v-model="ruleForm.group" placeholder="璇烽�夋嫨缁勫埆" size="small">
<el-option
v-for="item in groupOptions"
:key="item.id"
@@ -168,7 +168,7 @@
</el-form>
</div>
<div class="b-t-right">
- <div class="b-t-r-icon" :class="isDeviceConnectStatus ? 'c-p' : 'c-n'">
+ <div class="b-t-r-icon" :class="isDeviceConnectStatus ? 'c-p' : 'c-n'" @click="deviceConnectClick">
<i class="el-icon-d-arrow-left"></i>
</div>
</div>
@@ -211,19 +211,22 @@
</el-table>
</div>
</div>
+ <!-- 浠櫒杩炴帴姝ｅ父寮圭獥 -->
+ <addProductDialog ref="addProductDialog" />
</div>
</template>
<script>
+import addProductDialog from "./components/addProductDialog"
export default {
name: "addProductRegisterPage",
props: {},
mixins: [],
- components: {},
+ components: { addProductDialog },
computed: {},
data() {
return {
- isDeviceConnectStatus: false,
+ isDeviceConnectStatus: true,
ruleForm: {
number: "",
productTime: "",
@@ -271,7 +274,19 @@
}
},
created() {},
- methods: {}
+ methods: {
+ // 浠櫒杩炴帴寮圭獥
+ deviceConnectClick() {
+ console.log("dddd")
+ if (this.isDeviceConnectStatus) {
+ this.$refs.addProductDialog.editDialogVisible = true
+ }
+ },
+ // 閫�鍑�
+ quitClick() {
+ this.$router.go(-1)
+ }
+ }
}
</script>
--
Gitblit v1.8.0