From 5c8d96159495bad02c5434660a47cf3e65b3278e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 14 Oct 2024 11:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/publicPage/selectCustomer.vue  |  2 +-
 .../operation/repairbill/repairbillAdd.vue    | 31 ++++++++++---------
 .../operation/repairbill/repairbillInfo.vue   | 14 +++------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/yxt-as-ui/src/components/publicPage/selectCustomer.vue b/yxt-as-ui/src/components/publicPage/selectCustomer.vue
index e4c60f22d3..5354962470 100644
--- a/yxt-as-ui/src/components/publicPage/selectCustomer.vue
+++ b/yxt-as-ui/src/components/publicPage/selectCustomer.vue
@@ -16,7 +16,7 @@
                 <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="车架号">
-                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.vinNo" placeholder="请输入4位以上的车架号" clearable/>
               </el-form-item>
               <el-form-item label="联系电话">
                 <el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
index 6db719d719..b996ddea05 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
@@ -30,7 +30,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>维修单类型</div>
               <el-form-item prop="billType">
                 <el-select class="addinputInfo" v-model="formobj.billType" :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" placeholder="请选择" @change="billTypeChange" clearable filterable>
@@ -38,7 +38,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>科目</div>
               <el-form-item prop="subject">
                 <el-select class="addinputInfo" :disabled="formobj.sitemVos.length > 0 || formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.subject" placeholder="请选择" @change="changeSubject" clearable filterable>
@@ -46,20 +46,17 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">索赔厂家</div>
-              <el-form-item>
-                <el-select class="addinputInfo" :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.claimManufacturer" placeholder="请选择" @change="changeClaimManufacturer" clearable filterable>
-                  <el-option v-for="item in claimManufacturer_list" :key="item.sid" :label="item.claiManuName" :value="item.claiManuName"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <div class="span-sty">索赔类型</div>
+            <el-col :span="8">
+              <div class="span-sty">索赔厂家及厂家</div>
               <el-form-item>
-                <el-select class="addinputInfo" :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.shClaimTypeKey" placeholder="请选择" @change="changeShClaimType" clearable filterable>
-                  <el-option v-for="item in shClaimType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
-                </el-select>
+                <div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
+                  <el-select :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.claimManufacturer" placeholder="请选择" @change="changeClaimManufacturer" clearable filterable>
+                    <el-option v-for="item in claimManufacturer_list" :key="item.sid" :label="item.claiManuName" :value="item.claiManuName"></el-option>
+                  </el-select>
+                  <el-select :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.shClaimTypeKey" placeholder="请选择" @change="changeShClaimType" clearable filterable>
+                    <el-option v-for="item in shClaimType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                  </el-select>
+                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1298,6 +1295,10 @@ export default {
       }
     },
     serviceAdd() {
+      if (this.formobj.subject === '') {
+        this.$message({ showClose: true, type: 'error', message: '请先选择科目' })
+        return
+      }
       this.formobj.sitemVos.push({
         serviceItemSid: '',
         serviceItem: '',
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
index cca7e0822e..79fa00a186 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
@@ -25,21 +25,17 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty">维修单类型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty">科目</div>
               <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">索赔厂家</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.claimManufacturer }}</span></el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <div class="span-sty">索赔类型</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.shClaimTypeValue }}</span></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">索赔厂家及类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.claimManufacturer }} {{ formobj.shClaimTypeValue }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>