Merge remote-tracking branch 'origin/master'

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

@@ -30,16 +30,16 @@
           </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="billType">
                 <el-select class="addinputInfo" v-model="formobj.billType" placeholder="请选择" @change="billTypeChange" clearable filterable>
                   <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </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="subject">
                 <el-select class="addinputInfo" v-model="formobj.subject" placeholder="请选择" @change="changeSubject" clearable filterable>
                   <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subject" :value="item.subject"></el-option>
                 </el-select>
@@ -56,14 +56,14 @@
               <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.entryTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" /></el-form-item>
             </el-col>
             <el-col :span="16">
-              <div class="span-sty">预计完工</div>
-              <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.estimatedFinishTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" /></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>预计完工</div>
+              <el-form-item prop="estimatedFinishTime"><el-date-picker class="addinputInfo" v-model="formobj.estimatedFinishTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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="waitorName">
                 <el-select class="addinputInfo" v-model="formobj.waitorName" placeholder="请选择" @change="waitorChange" clearable filterable>
                   <el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
@@ -109,11 +109,11 @@
                 </el-col>
                 <el-col :span="8">
                   <div class="span-sty">联系电话</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
+                  <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <div class="span-sty">客户单位</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
+                  <el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
                 </el-col>
               </el-row>
               <el-row>
@@ -652,10 +652,14 @@ export default {
         showReSettleBtn: true
       },
       rules: {
+        billType: [{ required: true, message: '工单类型不能为空', trigger: 'change' }],
+        subject: [{ required: true, message: '科目不能为空', trigger: 'change' }],
+        estimatedFinishTime: [{ required: true, message: '预计完工不能为空', trigger: 'change' }],
+        waitorName: [{ 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' }],
-        'settleVo.settleTime': [{ required: true, message: '结算时间不能为空', trigger: 'blur' }],
+        'settleVo.settleTime': [{ required: true, message: '结算时间不能为空', trigger: 'blur' }]
       }
     }
   },
@@ -1043,6 +1047,14 @@ 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
+          }
           this.submitdisabled = true
           req.saveOrUpdate(this.formobj).then((res) => {
             if (res.success) {
@@ -1063,6 +1075,14 @@ 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
+          }
           this.submitdisabled = true
           req.submit(this.formobj).then((res) => {
             if (res.success) {

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

@@ -85,11 +85,11 @@
                 </el-col>
                 <el-col :span="8">
                   <div class="span-sty">联系电话</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
+                  <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <div class="span-sty">客户单位</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
+                  <el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
                 </el-col>
               </el-row>
               <el-row>