From 904710d226d8dd5253937cbd572ca208be804ea5 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 17:10:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
index 1e54f5e..bd776c7 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
@@ -1,12 +1,12 @@
<template>
<el-dialog :visible.sync="dialogVisible" title="鏍囧噯鐗╄川楠屾敹璁板綍" width="70%">
- <!-- <el-steps :active="currentStep" finish-status="success">
+ <el-steps :active="currentStep" finish-status="success">
<el-step class="cursor-pointer" v-for="(item, index) in steps" :key="index" :title="item">
</el-step>
- </el-steps> -->
-<!-- <el-form :model="model" label-width="140px" size="small">-->
-<!-- <Step1 :model.sync="model"></Step1>-->
-<!-- </el-form>-->
+ </el-steps>
+ <el-form :model="model" label-width="140px" size="small">
+ <Step1 :model.sync="model"></Step1>
+ </el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="submit">淇� 瀛�</el-button>
@@ -15,16 +15,16 @@
</template>
<script>
-// import Step1 from './Step/Step1.vue'
+import Step1 from './Step1.vue'
export default {
components: {
- // Step1
+ Step1
},
data() {
return {
dialogVisible: false,
currentStep: 0, // 姝ラ鏉℃樉绀虹鍑犳
- // steps: ['鎻愪氦', '寮�绠遍獙鏀跺鏍�', '瀹夎楠屾敹妫�鏌�', '瀹夎楠屾敹澶嶆牳', '楠屾敹鏍告煡', '楠屾敹鏍告煡瀹℃牳'],
+ steps: ['鎻愪氦', '寮�绠遍獙鏀跺鏍�', '瀹夎楠屾敹妫�鏌�', '瀹夎楠屾敹澶嶆牳', '楠屾敹鏍告煡', '楠屾敹鏍告煡瀹℃牳'],
model: {
acceptance: {
id: undefined,
--
Gitblit v1.9.3