From 31ab8419c541231d960b2c035005d4324fa299c9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 8 May 2024 10:49:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplier/relation/openingbank.vue         | 26 +++++++----
 .../basicinformation/supplier/supplier.vue    |  2 +-
 .../basicinformation/supplier/supplierAdd.vue | 46 ++++++++++++-------
 .../supplier/supplierInfo.vue                 |  2 +-
 .../suppliertype/suppliertype.vue             |  4 +-
 5 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue b/yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue
index 27c130bf0f..d439332060 100644
--- a/yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue
+++ b/yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue
@@ -12,22 +12,22 @@
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
             <el-col :span="12">
-              <div class="span-sty">开户银行</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>开户银行</div>
+              <el-form-item prop="bankName"><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="12">
-              <div class="span-sty">银行账号</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>银行账号</div>
+              <el-form-item prop="bankAccount"><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <div class="span-sty">账号名称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>账号名称</div>
+              <el-form-item prop="accountName"><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="12">
-              <div class="span-sty">账号类型</div>
-              <el-form-item>
+              <div class="span-sty"><span class="icon">*</span>账号类型</div>
+              <el-form-item prop="dueBankKey">
                 <el-select v-model="formobj.dueBankKey" class="addinputInfo" placeholder="" @change="dueBankChange">
                   <el-option v-for="item in dueBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
@@ -91,7 +91,12 @@ export default {
         currency: ''
       },
       index: '',
-      rules: {}
+      rules: {
+        bankName: [{ required: true, message: '开户银行不能为空', trigger: 'blur' }],
+        bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }],
+        accountName: [{ required: true, message: '账号名称不能为空', trigger: 'blur' }],
+        dueBankKey: [{ required: true, message: '账号类型不能为空', trigger: 'change' }]
+      }
     }
   },
   methods: {
@@ -163,4 +168,7 @@ export default {
 .addinputInfo {
   margin-left: 130px !important;
 }
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
 </style>
diff --git a/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue b/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
index 720eb446ca..fa8741ae5c 100644
--- a/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
+++ b/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
@@ -30,7 +30,7 @@
         </div>
         <!--End查询列表部分-->
         <div class="listtop">
-          <div class="tit">销售开单列表</div>
+          <div class="tit">供应商列表</div>
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <!--Start 主页面主要部分 -->
diff --git a/yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue b/yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
index 4959f3998e..9ace53cc53 100644
--- a/yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
@@ -13,30 +13,30 @@
           <div class="title">基本信息</div>
           <el-row style="border-top: 1px solid #e0e3eb">
             <el-col :span="8">
-              <div class="span-sty">供应商名称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商名称</div>
+              <el-form-item prop="supplierName"><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">供应商简称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商简称</div>
+              <el-form-item prop="supplierPY"><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">供应商编码</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商编码</div>
+              <el-form-item prop="supplierCode"><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode" clearable placeholder=""/></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">供应商类型</div>
-              <el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商类型</div>
+              <el-form-item prop="supplierTypeSid">
                 <el-select class="addinputInfo" v-model="formobj.supplierTypeSid" filterable placeholder="" @change="supplierTypeChange">
                   <el-option v-for="item in supplierType_list" :key="item.sid" :label="item.supplierTypeName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">供应商电话</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactTelePhone" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商电话</div>
+              <el-form-item prop="contactTelePhone"><el-input class="addinputInfo addinputw" v-model="formobj.contactTelePhone" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">传真</div>
@@ -90,8 +90,8 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">开票公司名称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.billingCompanyName" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>开票公司名称</div>
+              <el-form-item prop="billingCompanyName"><el-input class="addinputInfo addinputw" v-model="formobj.billingCompanyName" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">税号</div>
@@ -108,16 +108,16 @@
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchaser" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">开票类型</div>
-              <el-form-item>
+              <div class="span-sty"><span class="icon">*</span>开票类型</div>
+              <el-form-item prop="billingTypeValue">
                 <el-select class="addinputInfo" v-model="formobj.billingTypeValue" filterable placeholder="" @change="billingTypeChange">
                   <el-option v-for="item in billingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">税率</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>税率</div>
+              <el-form-item prop="taxRate"><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -212,7 +212,16 @@ export default {
         remarks: '',
         pmsSupplierBankList: []
       },
-      rules: {}
+      rules: {
+        supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }],
+        supplierPY: [{ required: true, message: '供应商简称不能为空', trigger: 'blur' }],
+        supplierCode: [{ required: true, message: '供应商编码不能为空', trigger: 'blur' }],
+        supplierTypeSid: [{ required: true, message: '供应商类型不能为空', trigger: 'change' }],
+        contactTelePhone: [{ required: true, message: '供应商电话不能为空', trigger: 'blur' }],
+        billingCompanyName: [{ required: true, message: '开票公司名称不能为空', trigger: 'blur' }],
+        billingTypeValue: [{ required: true, message: '开票类型不能为空', trigger: 'change' }],
+        taxRate: [{ required: true, message: '税率不能为空', trigger: 'blur' }]
+      }
     }
   },
   methods: {
@@ -437,6 +446,9 @@ export default {
   margin-left: 120px !important;
   width: calc(100% - 115px);
 }
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
 .titleOne {
   padding: 7px;
   display: flex;
diff --git a/yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue b/yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue
index 033aebf466..621b9bc765 100644
--- a/yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue
+++ b/yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue
@@ -41,7 +41,7 @@
           <el-row>
             <el-col :span="24">
               <div class="span-sty">详细地址</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.province }}{{ formobj.city }}{{ formobj.county }}{{ formobj.address }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
diff --git a/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue b/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue
index b2b6905fbb..c280b25058 100644
--- a/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue
+++ b/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue
@@ -54,11 +54,11 @@
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="12">
-            <div class="span-sty">供应商类型</div>
+            <div class="span-sty"><span class="icon">*</span>供应商类型</div>
             <el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeName" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="span-sty">供应商编码</div>
+            <div class="span-sty"><span class="icon">*</span>供应商编码</div>
             <el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeCode" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>