From 8df73aae619b4428decd72b64c5b7410ddcfe033 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 31 Oct 2024 17:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=84=E7=BA=A6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/styles/table.scss                       |  1 +
 .../operation/preregistration/preregistration.vue     |  9 +++++----
 .../operation/preregistration/preregistrationAdd.vue  | 11 ++++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/yxt-as-ui/src/styles/table.scss b/yxt-as-ui/src/styles/table.scss
index 08e9142ddc..cfefe75c49 100644
--- a/yxt-as-ui/src/styles/table.scss
+++ b/yxt-as-ui/src/styles/table.scss
@@ -28,6 +28,7 @@
 		border-bottom: 1px solid $table-border-color;
 	}
 	.table-fixed {
+    height: 100% !important;
 	  .el-table__fixed-right {
 	  height: 100% !important; //设置高优先，以覆盖内联样式
 	  }
diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue
index 3c45793f68..4d75666844 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue
@@ -67,14 +67,14 @@
         <!--Start 主页面主要部分 -->
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" align="center" width="50"/>
-            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column label="单据编号" align="center" width="160">
+            <el-table-column fixed type="selection" align="center" width="50"/>
+            <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column fixed label="单据编号" align="center" width="160">
               <template slot-scope="scope">
                 <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.billNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" width="100">
+            <el-table-column fixed label="状态" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.state == '1' ? '未完成' : scope.row.state == '0' ? '已完成' : scope.row.state == '2' ? '作废' : '' }}</span>
               </template>
@@ -374,5 +374,6 @@ export default {
   }
 }
 </script>
+
 <style scoped>
 </style>
diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
index df26458ee6..8c19b37fbe 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
@@ -4,7 +4,6 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="selectCustomer()">选择客户</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="toService()">转维修单</el-button>
           <el-button type="danger" size="small" :disabled="submitdisabled" @click="toCancellation()">作废</el-button>
@@ -69,7 +68,14 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">客户</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+              <el-form-item>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <div>
+                    <span class="addinputInfo">{{ formobj.customerName }}</span>
+                  </div>
+                  <el-button type="primary" size="mini" @click="selectCustomer()">选择</el-button>
+                </div>
+              </el-form-item>
             </el-col>
             <el-col :span="6">
               <div class="span-sty">联系电话</div>
@@ -103,7 +109,6 @@
                       <el-table-column prop="price" label="销售价" align="center" />
                     </el-table>
                     <pagination v-show="serviceData.length > 0" :total="serviceQuery.total" :page.sync="serviceQuery.current" :limit.sync="serviceQuery.size" class="pagination" @pagination="serviceInput(scope.row.serviceItem)"/>
-<!--                    <el-pagination :page.sync="serviceQuery.current" :page-size="serviceQuery.size" layout="total, pager" :total="serviceQuery.total" @current-change="serviceInput"/>-->
                   </div>
                   <el-input slot="reference" v-model="scope.row.serviceItem" @input="serviceInput(scope.row.serviceItem)" clearable placeholder="项目名称、拼音"/>
                 </el-popover>