Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@@ -104,8 +104,8 @@
             <el-collapse-item title="客户信息" name="1">
               <el-row style="border-top: 1px solid #e0e3eb">
                 <el-col :span="8">
-                  <div class="span-sty">客户</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+                  <div class="span-sty"><span class="icon">*</span>客户</div>
+                  <el-form-item prop="customerName"><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <div class="span-sty">联系电话</div>
@@ -656,6 +656,7 @@ export default {
         subject: [{ required: true, message: '科目不能为空', trigger: 'change' }],
         estimatedFinishTime: [{ required: true, message: '预计完工不能为空', trigger: 'change' }],
         waitorName: [{ required: true, message: '服务顾问不能为空', trigger: 'change' }],
+        customerName: [{ required: true, message: '客户信息不能为空', trigger: 'change' }],
         'settleVo.payerName': [{ required: true, message: '付款人姓名不能为空', trigger: 'blur' }],
         'settleVo.settleValue': [{ required: true, message: '结算方式不能为空', trigger: 'change' }],
         'settleVo.settleAmount': [{ required: true, message: '结算金额不能为空', trigger: 'blur' }],
@@ -1047,10 +1048,6 @@ export default {
       this.formobj.operatorSid = window.sessionStorage.getItem('userSid')
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
-          if (this.formobj.customerName === '') {
-            this.$message({ showClose: true, type: 'error', message: '客户信息不能为空' })
-            return
-          }
           if (this.formobj.sitemVos.length === 0) {
             this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
             return
@@ -1075,10 +1072,6 @@ export default {
       this.formobj.receivableAmount = this.ysjeTotal
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
-          if (this.formobj.customerName === '') {
-            this.$message({ showClose: true, type: 'error', message: '客户信息不能为空' })
-            return
-          }
           if (this.formobj.sitemVos.length === 0) {
             this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
             return