From fbc6e473d4972fdc40eb3e3cd0717c6bd705d9fd Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 10 Jan 2023 16:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86=E5=A4=96?=
 =?UTF-8?q?=E9=87=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baseoutsourcingapplicationAdd.vue         | 15 ++++++++-------
 .../baseoutsourcingapplicationInfo.vue        |  4 ++--
 .../workflow/baseoutsourcingapplication.vue   |  8 +++-----
 .../baseoutsourcingapplicationAdd.vue         | 19 +++++++++----------
 .../baseoutsourcingapplicationInfo.vue        |  8 +++-----
 5 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
index b681198cd7..18ad5a9127 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
@@ -100,27 +100,27 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="3" class="tleftb">
+            <el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span>常用配置</span>
             </el-col>
             <el-col :span="13" class="trightb tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb">
+            <el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span>内部编码</span>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="5" class="trightb tlineheightb">
               <el-form-item>
-                <span>{{ formobj.insideCode }}</span>
+                {{ formobj.insideCode }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>车辆型号</span>
+              <span><span class="icon">*</span>车辆型号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="vehMark">
                 <el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputw"/>
               </el-form-item>
             </el-col>
@@ -450,7 +450,8 @@ export default {
         isSaleOrgApproval: [{ required: true, message: '是否销售部审批不能为空', trigger: 'change' }], // 是否销售部审批
         purchasePrice: [{ required: true, message: '采购价格不能为空', trigger: 'blur' }], // 采购价格
         num: [{ required: true, message: '台数不能为空', trigger: 'blur' }], // 台数
-        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }] // 订金
+        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }], // 订金
+        vehMark: [{ required: true, message: '车辆型号不能为空', trigger: 'blur' }] // 车辆型号
       }
     }
   },
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
index 9305504d8a..5181fd6393 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
@@ -58,13 +58,13 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">常用配置</el-col>
-          <el-col :span="13" class="trightb tlineheightb">
+          <el-col :span="13" class="tlineheightb">
             <el-form-item><span>{{ formobj.configName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="5" class="tlineheightb">
             <el-form-item>
               <span>{{ formobj.insideCode }}</span>
             </el-form-item>
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
index 2beca34139..44fd66935f 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
@@ -60,16 +60,14 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">常用配置</el-col>
-          <el-col :span="13" class="trightb tlineheightb">
+          <el-col :span="13" class="tlineheightb">
             <el-form-item><span>{{ formobj.configName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="5">
-            <el-form-item>
-              <span>{{ formobj.insideCode }}</span>
-            </el-form-item>
+          <el-col :span="5" class="tlineheightb">
+            <el-form-item><span>{{ formobj.insideCode }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
index 13de58e3cd..86697ef262 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
@@ -99,27 +99,25 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="3" class="tleftb">
+            <el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span><span class="icon">*</span>常用配置</span>
             </el-col>
-            <el-col :span="13" class="trightb tlineheightb">
+            <el-col :span="13" class="tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb">
+            <el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span>内部编码</span>
             </el-col>
-            <el-col :span="5">
-              <el-form-item>
-                <span>{{ formobj.insideCode }}</span>
-              </el-form-item>
+            <el-col :span="5" class="tlineheightb">
+              <el-form-item>{{ formobj.insideCode }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>车辆型号</span>
+              <span><span class="icon">*</span>车辆型号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="vehMark">
                 <el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputw"/>
               </el-form-item>
             </el-col>
@@ -461,7 +459,8 @@ export default {
         purchasePrice: [{ required: true, message: '采购价格不能为空', trigger: 'blur' }], // 采购价格
         isSaleOrgApproval: [{ required: true, message: '是否销售部审批不能为空', trigger: 'change' }], // 是否销售部审批
         num: [{ required: true, message: '台数不能为空', trigger: 'blur' }], // 台数
-        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }] // 订金
+        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }], // 订金
+        vehMark: [{ required: true, message: '车辆型号不能为空', trigger: 'blur' }], // 车辆型号
       }
     }
   },
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
index 44f5f7536d..41f0456005 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
@@ -53,16 +53,14 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">常用配置</el-col>
-          <el-col :span="13" class="trightb tlineheightb">
+          <el-col :span="13" class="tlineheightb">
             <el-form-item><span>{{ formobj.configName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="5">
-            <el-form-item>
-              <span>{{ formobj.insideCode }}</span>
-            </el-form-item>
+          <el-col :span="5" class="tlineheightb">
+            <el-form-item><span>{{ formobj.insideCode }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>