Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue

@@ -90,8 +90,8 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <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>
+              <div class="span-sty">开票公司名称</div>
+              <el-form-item><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"><span class="icon">*</span>开票类型</div>
-              <el-form-item prop="billingTypeValue">
+              <div class="span-sty">开票类型</div>
+              <el-form-item>
                 <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"><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>
+              <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>
             </el-col>
           </el-row>
           <el-row>
@@ -218,10 +218,7 @@ export default {
         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' }]
+        contactTelePhone: [{ required: true, message: '供应商电话不能为空', trigger: 'blur' }]
       }
     }
   },