From 243be3ed28d20bbb9bba8850afb3b1fa21c6a6f9 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 24 Feb 2023 15:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=8F=B7=E8=AE=B0=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/booknumber/index.vue | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/booknumber/index.vue b/src/views/booknumber/index.vue
index 35cb18c..b19d885 100644
--- a/src/views/booknumber/index.vue
+++ b/src/views/booknumber/index.vue
@@ -74,6 +74,7 @@
         <el-button type="primary" @click="handleSubmit">提交</el-button>
       </div>
       <div class="button_box" v-show="!isShow">
+        <el-button @click="goBefore">上一步</el-button>
         <el-button @click="closeDraw">取消</el-button>
         <el-button type="primary" @click="clickSubmit">提交</el-button>
       </div>
@@ -266,6 +267,7 @@ export default {
               column: [
                 {
                   label:'上午',
+                  labelWidth:60,
                   prop: 'addData',
                   type: 'dynamic',
                   span:24,
@@ -310,6 +312,7 @@ export default {
                 },
                 {
                   label:'下午',
+                  labelWidth:60,
                   prop: 'addData1',
                   type: 'dynamic',
                   span:24,
@@ -399,13 +402,15 @@ export default {
     },
     // 点击新增按钮
     addNumber(){
+      this.tabArr = this.tabArr1
       this.activeName = this.tabArr[0].dictValue;
+      console.log(this.tabArr)
+      console.log(this.activeName)
       this.isNumber = true;
       this.isShow = true;
       this.isEdit = false
       this.deptName = '';
 
-      this.tabArr = this.tabArr1
       this.tabArr.map(item =>{
         item.addForm={
               addData: [
@@ -623,10 +628,10 @@ export default {
         console.log(this.userInfo)
         this.deptName = this.userInfo.dept_id 
       }
+      let tmp = this.tabArr.find(item => item.addForm.addData.length != 0)
+      let tmp1 = this.tabArr.find(item => item.addForm.addData1.length != 0)
       
-      if(this.tabArr[0].addForm.addData.length == 0 && this.tabArr[1].addForm.addData.length == 0 
-        && this.tabArr[2].addForm.addData.length == 0 && this.tabArr[0].addForm.addData1.length == 0
-        &&  this.tabArr[1].addForm.addData1.length == 0 && this.tabArr[2].addForm.addData1.length == 0){
+      if(tmp == undefined && tmp1 == undefined){
         this.$message.error('请至少添加一条数据');
         done()
       }else if(this.count == 0){
@@ -749,6 +754,9 @@ export default {
        }
       })
     },
+    goBefore(){
+      this.isShow = true
+    },
     closeDraw(){
       this.isNumber = false
     },
@@ -851,6 +859,9 @@ export default {
   }
 </style>
 <style lang="scss">
+.el-drawer .avue-form{
+  padding: 0 !important;
+}
 .dialog_box{
     right: 10%;
     position: absolute;
@@ -859,7 +870,7 @@ export default {
 }
 .el-drawer__wrapper{
   .number_box{
-    width: 45% !important;
+    width: 800px !important;
     overflow: hidden !important;
     .el-drawer__body{
       overflow: hidden;