Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

 zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html

@@ -234,6 +234,17 @@
                    </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>


                <p class="el-big-title">销售设置</p>

@@ -1145,6 +1156,7 @@
            //表单数据
            form: {
                isPresent: '否',
                isCooperate: '2',
                staus: '上架',
                //产品组合
                assembleGoods: [],
@@ -1684,7 +1696,7 @@
                        _this.userAdbleEdit();

                        //如果是总产品加载总部分类信息
                        _this.getShoppinggoodscategory(1);
                        // _this.getShoppinggoodscategory(1);
                        _this.getGoodstype(1);
                    }
                });