Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/3.0.0/AppContentInfo/components/Add.vue

@@ -85,7 +85,7 @@
     </template>
     <template #footer>
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="confirm">提交</el-button>
+      <el-button type="primary" :loading="isLoading" @click="confirm">提交</el-button>
     </template>
   </ai-detail>
 </template>
@@ -117,6 +117,7 @@
           areaName: '',
           thumbUrl: []
         },
+        isLoading: false,
         cropOps: {
           width: "336px",
           height: "210px"
@@ -242,6 +243,7 @@
               categoryName = this.cateList.filter(v => v.id === this.form.categoryId)[0].categoryName
             }
 
+            this.isLoading = true
             this.instance.post(`/app/appcontentinfo/addOrUpdate`, {
               ...this.form,
               moduleId: this.$route.query.moduleId,
@@ -255,7 +257,11 @@
                 setTimeout(() => {
                   this.cancel(true)
                 }, 600)
+              } else {
+                this.isLoading = false
               }
+            }).catch(() => {
+              this.isLoading = false
             })
           }
         })

project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue

@@ -47,23 +47,27 @@
               <el-radio label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="form.pass === '1'" label="积分规则类别" prop="auditRuleId" style="width: 100%;" :rules="[{ required: true, message: '请选择积分规则类别' }]">
+          <el-form-item v-if="form.pass === '1'" label="积分规则类别" prop="auditRuleId" style="width: 100%;" :rules="[{ required: true, message: '' }]">
             <div class="flex-warpper">
-              <ai-select
+               <el-form-item  label-width="0" prop="auditIntegralType" :rules="[{ required: true, message: '请选择积分规则类别' }]">
-                v-model="form.auditIntegralType"
+                <ai-select
-                clearable
+                  v-model="form.auditIntegralType"
-                style="width: 180px;"
+                  clearable
-                placeholder="请选择积分规则类别"
+                  style="width: 180px;"
-                :selectList="dict.getDict('atWillReportType')"
+                  placeholder="请选择积分规则类别"
-                @change="onChange">
+                  :selectList="dict.getDict('atWillReportType')"
-              </ai-select>
+                  @change="onChange">
-              <ai-select
+                </ai-select>
-                v-model="form.auditRuleId"
+               </el-form-item>
-                clearable
+               <el-form-item style="margin: 0 10px;" prop="auditRuleId" :rules="[{ required: true, message: '请选择积分规则事项' }]">
-                style="width: 180px;margin: 0 10px;"
+                <ai-select
-                placeholder="请选择积分规则事项"
+                  v-model="form.auditRuleId"
-                :selectList="ruleList">
+                  clearable
-              </ai-select>
+                  style="width: 180px;"
+                  placeholder="请选择积分规则事项"
+                  :selectList="ruleList">
+                </ai-select>
+               </el-form-item>
               <span>{{ integralText }}</span>
             </div>
           </el-form-item>
@@ -91,6 +95,15 @@
     },
 
     data () {
+      const validatorRules = function (rule, value, callback) {
+        if (value === '') {
+          callback(new Error('请输入联系方式'))
+        } else if (!/^1\d{10}$/.test(value)) {
+          callback(new Error('手机号格式错误'))
+        } else {
+          callback()
+        }
+      }
       return {
         total: 0,
         info: {
@@ -202,6 +215,23 @@
     .flex-warpper {
       display: flex;
       align-items: center;
+
+      ::v-deep .el-form-item .el-form-item__content {
+        margin-left: 0!important;
+      }
+
+      ::v-deep .ai-select {
+        margin: 0!important;
+      }
+
+      ::v-deep .el-form-item {
+        width: auto;
+        margin-bottom: 0;
+
+        &:last-child {
+          margin-right: 10px;
+        }
+      }
     }
   }
 </style>