From 1a7af6fff5185bb257c16b0445140c93263a3331 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 15 一月 2024 11:18:17 +0800
Subject: [PATCH] 修改

---
 web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue b/web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue
index c47d7cf..5f8d7f8 100644
--- a/web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue
@@ -1,7 +1,7 @@
 <template>
   <zt-dialog ref="dialog" column="3" :title="title" :stepMarker="stepMarker" @confirm="formSubmit">
     <el-form ref="dataForm" style="padding-top: 0" :inline="true" :disabled="dataForm.disabled" :model="dataForm"
-             label-width="120px" class="configChangeFormAuto">
+             label-width="120px" class="configOutFormAuto">
       <div>
         <el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
           <span>{{dataForm.configItemOutbound.code || '缂栧彿鑷姩鐢熸垚'}}</span>
@@ -27,20 +27,27 @@
               placeholder="璇烽�夋嫨鐢宠鏃ユ湡">
             </el-date-picker>
           </el-form-item>
+        </div>
           <div class="el-configChangeDialog el-border-bottom">
             <div style="width: 120px;text-align: center;font-weight: 600">
               鍑哄簱鍘熷洜
             </div>
             <div class="el-border-left acceptDate" style="width: 90%;">
               <el-form-item style="width: 100%;padding-left:20px;margin:0;">
-                <el-input v-if="stepMarker=='pzxck_first'" v-model="dataForm.configItemOutbound.outboundReason" placeholder="鍑哄簱鍘熷洜..."></el-input>
-                <span v-else>{{dataForm.configItemOutbound.outboundReason}}</span>
+                <el-input :disabled="stepMarker!=='pzxck_first'" type="textarea" :rows="2" v-model="dataForm.configItemOutbound.outboundReason" placeholder="鍑哄簱鍘熷洜..."></el-input>
+<!--                <span v-else>{{dataForm.configItemOutbound.outboundReason}}</span>-->
               </el-form-item>
             </div>
           </div>
-          <el-form-item class="marginTopAndMarginBottom2" label="搴撶被鍨�" style="width: 99%">
-            <zt-dict :disabled="stepMarker!=='pzxck_first'" v-model="dataForm.configItemOutbound.libraryType" :radio="true" dict="library_type"></zt-dict>
-          </el-form-item>
+        <div class="el-configChangeDialog el-border-bottom">
+          <div style="width: 120px;text-align: center;font-weight: 600">
+            搴撶被鍨�
+          </div>
+          <div style="width: calc(100% - 120px)" class="el-border-left">
+            <el-form-item label-width="20px" style="width: 85%;margin-left: 20px">
+              <zt-dict :disabled="stepMarker!=='pzxck_first'" v-model="dataForm.configItemOutbound.libraryType" :radio="true" dict="library_type"></zt-dict>
+            </el-form-item>
+          </div>
         </div>
         <div class="el-configChangeDialog el-border-bottom">
           <div class="DFormWidth DAlign DHold">
@@ -155,7 +162,7 @@
 
 <script>
   import AddOrUpdateCheck from '../testCheckOrder/TestCheckOrder-AddOrUpdate'
-  import ConfigItemList from './configItemList.vue'
+  import ConfigItemList from '../configItemChange/configItemList.vue'
   import qs from "qs";
   import Cookies from "js-cookie";
 
@@ -253,7 +260,7 @@
         this.$nextTick(()=>{
           console.log(this.dataForm.projectId,'this.dataForm.projectId')
           this.ids = this.dataForm.configOutboundList.map(item=>item.selectId).join(',')
-          this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,this.ids)
+          this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,{ids:this.ids,pageCode:this.pageCode})
         })
         // this.dataForm.configItemList.push({})
         // this.$nextTick(() => {
@@ -425,16 +432,19 @@
   .configChangeContentWidth > .el-form-item.lastChild > .el-form-item__content {
     width: calc(100% - 142px);
   }
-  .configChangeFormAuto .acceptDate > .el-form-item > .el-form-item__content {
+  .configOutFormAuto .acceptDate > .el-form-item > .el-form-item__content {
     width: 100%;
   }
-  .configChangeFormAuto .marginTopAndMarginBottom {
+  .configOutFormAuto .marginTopAndMarginBottom {
     margin-top: 10px !important;
     margin-bottom: 0 !important;
   }
 
-  .configChangeFormAuto .marginTopAndMarginBottom2 {
+  .configOutFormAuto .marginTopAndMarginBottom2 {
     margin-top: -10px !important;
     margin-bottom: 0 !important;
   }
+  .configOutFormAuto .el-textarea{
+    vertical-align: middle
+  }
 </style>

--
Gitblit v1.9.1