From 23c3bc31f574ee9573c8045edad0233b55a0ffa6 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 22:43:13 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html
index 212a682..82445c2 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html
@@ -222,14 +222,25 @@
                     <el-col :span="10">
                         <el-form-item label="充值卡使用范围" label-width="150px" prop="isCourse">
                             <el-radio-group v-model="form.carIsAll">
-                                <el-radio label="是">所有产品</el-radio>
-                                <el-radio label="否">部分产品(设置部分产品则充值卡内的金额只能消费指定范围的产品)</el-radio>
+                                <el-radio label="是" value="是">所有产品</el-radio>
+                                <el-radio label="否" value="是">部分产品(设置部分产品则充值卡内的金额只能消费指定范围的产品)</el-radio>
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
                     <el-col :offset="2" :span="10">
                         <el-form-item label-width="120px" label="最大使用次数">
                             <el-input v-model="form.carUseCount"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="是否合作项目">
+                            <el-radio-group v-model="form.isCooperate">
+                                <el-radio label="2">否</el-radio>
+                                <el-radio label="1">是</el-radio>
+                            </el-radio-group>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -1145,6 +1156,7 @@
             //表单数据
             form: {
                 isPresent: '否',
+                isCooperate: '2',
                 staus: '上架',
                 //产品组合
                 assembleGoods: [],
@@ -1169,14 +1181,7 @@
                 name: [{required: true, message: '请输入商品名称', trigger: 'blur'}],
                 code: [{required: true, message: '请输入商品编码', trigger: 'blur'}],
                 cateId: [{required: true, message: '请选择商品分类', trigger: 'blur'}],
-                goodsSortId: [{required: true, message: '请选择库存分类', trigger: 'blur'}],
-                unit: [{required: true, message: '请填写规格', trigger: 'change'}],
-                volume: [{required: true, message: '请填写容量', trigger: 'blur'}],
-                measure: [{required: true, message: '请填写单位', trigger: 'change'}],
-                isCourse: [{required: true, message: '请选择套餐类型', trigger: 'change'}],
                 sealPice: [{required: true, message: '请填写售价', trigger: 'blur'}],
-                timeLength: [{required: true, message: '请填写服务时长', trigger: 'blur'}],
-                isNum : [{ type : 'number', message: '请输入数字', trigger: 'blur' }],
             },
 
         },
@@ -1596,7 +1601,7 @@
                 if (this.validFormData()) {
 
                     this.$refs[formName].validate((valid) => {
-
+                        console.log(valid);
                         if (valid) {
 
 

--
Gitblit v1.9.1