完善

yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue

@@ -52,11 +52,11 @@
       </div>
     </div>
     <el-dialog center :visible.sync="dialogVisible" width="70%">
-      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+      <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>
+            <div class="span-sty"><span class="icon">*</span>项目名称</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.aitemName" clearable placeholder="" /></el-form-item>
+            <el-form-item prop="aitemName"><el-input class="addinputInfo addinputw" v-model="formobj.aitemName" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty">拼音缩写</div>
@@ -69,18 +69,18 @@
             <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" 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 addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
+            <el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <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 addinputw" @keyup.native="formobj.price = getNumber(formobj.price, 2)" v-model="formobj.price" clearable placeholder="" /></el-form-item>
+            <el-form-item prop="price"><el-input class="addinputInfo addinputw" @keyup.native="formobj.price = getNumber(formobj.price, 2)" v-model="formobj.price" 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 addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
+            <el-form-item prop="cost"><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -121,6 +121,12 @@ export default {
         createOrgSid: '',
         useOrgSid: ''
       },
+      rules: {
+        aitemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
+        price: [{ required: true, message: '销售价不能为空', trigger: 'blur' }],
+        sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+        cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }],
+      },
       btndisabled: false,
       btnList: [
         {
@@ -252,6 +258,9 @@ export default {
     },
     toAdd() {
       this.dialogVisible = true
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
     },
     getNumber(val, limit) {
       val = val.replace(/[^0-9.]/g, '') // 保留数字
@@ -285,11 +294,15 @@ export default {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.formobj.createOrgSid = res.data
-          req.saveOrUpdate(this.formobj).then((resp) => {
+          this.$refs['form_obj'].validate((valid) => {
-            if (resp.success) {
+            if (valid) {
-              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              req.saveOrUpdate(this.formobj).then((resp) => {
-              this.getList()
+                if (resp.success) {
-              this.handleClose()
+                  this.$message({ showClose: true, type: 'success', message: '保存成功' })
+                  this.getList()
+                  this.handleClose()
+                }
+              })
             }
           })
         }
@@ -354,6 +367,9 @@ export default {
 .addinputInfo {
   margin-left: 75px !important;
 }
+/deep/ .el-form-item__error {
+  margin-left: 75px !important;
+}
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
   margin-left: 75px !important;
   width: calc(100% - 70px);

yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue

@@ -12,7 +12,7 @@
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
             <el-col :span="8">
-              <div class="span-sty"><span class="addinputInfo">*</span>套餐名称</div>
+              <div class="span-sty"><span class="icon">*</span>套餐名称</div>
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.packageName" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="16">
@@ -211,7 +211,8 @@ export default {
         size: 2,
         total: 0,
         params: {
-          name: ''
+          name: '',
+          orgPath: ''
         }
       },
       commodityData: [],