Parcourir la source

Merge branch 'sit'

xiaodai2022 il y a 2 ans
Parent
commit
15dc0fc406

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/index.html


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/chunk-8f4534d2.462a2d92.css


BIN
dist/static/css/chunk-f40fc796.284056f7.css.gz → dist/static/css/chunk-8f4534d2.462a2d92.css.gz


BIN
dist/static/js/app.0d173b84.js.gz


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.c6fe643a.js


BIN
dist/static/js/app.c6fe643a.js.gz


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/chunk-8f4534d2.04e6ed2a.js


BIN
dist/static/js/chunk-8f4534d2.04e6ed2a.js.gz


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/chunk-f40fc796.1aaa7825.js


BIN
dist/static/js/chunk-f40fc796.1aaa7825.js.gz


+ 40 - 39
src/views/goodStore/goodsOnline/components/handle-online-form.vue

@@ -19,21 +19,14 @@
             :size="size || 'medium'"
             @change="stateChange"
           >
-            <el-radio
-              v-for="item in stateList"
-              :key="item.value"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item in stateList" :key="item.value" :label="item.value">{{
+              item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
-       <el-col :span="12"  class="tr">
-        <el-form-item
-          label="审核备注"
-          v-if="ruleForm.state === '0'"
-          prop="remark"
-        >
+      <el-col :span="12" class="tr">
+        <el-form-item label="审核备注" v-if="ruleForm.state === '0'" prop="remark">
           <el-input
             type="textarea"
             placeholder="审核备注"
@@ -44,20 +37,14 @@
             :autosize="{ minRows: 3, maxRows: 3 }"
           />
         </el-form-item>
-        <el-form-item class="fr" v-if="ruleForm.state === '1'" >
-          <el-button
-            :size="'mini'"
-            type="primary"
-            @click="submitForm('6')"
+        <el-form-item class="fr" v-if="ruleForm.state === '1'">
+          <el-button :size="'mini'" type="primary" @click="submitForm('6')"
             >保 存
           </el-button>
         </el-form-item>
 
-        <el-form-item class="fr" v-if="ruleForm.state === '0'" >
-          <el-button
-            :size="'mini'"
-            type="primary"
-            @click="submitForm('')"
+        <el-form-item class="fr" v-if="ruleForm.state === '0'">
+          <el-button :size="'mini'" type="primary" @click="submitForm('')"
             >驳回重新审核
           </el-button>
         </el-form-item>
@@ -70,8 +57,8 @@
           </el-button>
         </el-form-item> -->
       </el-col>
-      <el-col :span="24"  v-if="ruleForm.state === '1'" 
-        ><el-form-item label="平台商品编码" prop="plat_code" >
+      <el-col :span="24" v-if="ruleForm.state === '1'"
+        ><el-form-item label="平台商品编码" prop="plat_code">
           <el-input
             v-model="ruleForm.plat_code"
             placeholder="平台商品编码"
@@ -79,8 +66,6 @@
           ></el-input>
         </el-form-item>
       </el-col>
-
-     
     </el-row>
   </el-form>
 </template>
@@ -88,17 +73,18 @@
 <script>
 import costFormAddEdit from "./costFormAddEdit";
 import asyncRequest from "@/apis/service/goodStore/goodsOnline";
+import {
+  isnumber,
+  isMobile,
+  validEmail,
+  isAlphanumeric,
+  isChinese,
+  isEmoticon,
+  validAlphabets,
+} from "@/utils/validate";
 export default {
   name: "exam-form",
-  props: [
-    "size",
-    "statusList",
-    "disabled",
-    "isMust",
-    "labelWidth",
-    "id",
-    "code",
-  ],
+  props: ["size", "statusList", "disabled", "isMust", "labelWidth", "id", "code"],
   components: {
     costFormAddEdit,
   },
@@ -116,6 +102,21 @@ export default {
    * @searchChange             : 选中值变化调用   抛出选中数据
    */
   data() {
+    const validate_plat_code = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("平台商品编号不能为空!"));
+      } else {
+        if (isnumber(value)) {
+          callback();
+        } else if (validAlphabets(value)) {
+          callback();
+        } else if (isAlphanumeric(value)) {
+          callback();
+        } else {
+          callback("平台商品编号仅支持数字和字母!");
+        }
+      }
+    };
     return {
       stateList: [
         {
@@ -146,10 +147,9 @@ export default {
         plat_code: [
           {
             required: true,
-            message: "平台商品编码不能为空",
+            validator: validate_plat_code,
             trigger: "blur",
           },
-          
         ],
         state: [
           {
@@ -158,7 +158,7 @@ export default {
             trigger: "change",
           },
         ],
-         remark: [
+        remark: [
           { required: true, message: "请输入审核备注", trigger: "blur" },
           {
             min: 1,
@@ -205,6 +205,7 @@ export default {
       this.ruleForm.numStatus = numStatus;
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
+          return;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           // 刷新
           this.$emit("resSuccess", model);
@@ -230,4 +231,4 @@ export default {
     }
   }
 }
-</style>
+</style>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff