Merge branch 'master' into ty_urgent

Helius

2020-12-11 aaeaded75d418e6582c16ebd983fe6b052b889b8

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

@@ -893,7 +893,7 @@
                        </el-form-item>
                    </el-col>
                </el-row>
                <el-row>
                <el-row v-if="form.goodType!='家居产品'">
                    <el-form-item label="购买有效期">
                        <el-col  :span="4">
                            <el-form-item label="" prop="isNum">
@@ -917,7 +917,7 @@
                        </el-col>
                    </el-form-item>
                </el-row>
                <el-row>
                <el-row v-if="form.goodType!='家居产品'">
                    <el-form-item label="消耗有效期">
                        <el-col  :span="4">
                            <el-form-item label="" prop="isNum">
@@ -939,7 +939,7 @@
                        </el-col>
                    </el-form-item>
                </el-row>
                <el-row>
                <el-row v-if="form.goodType!='家居产品'">
                    <el-form-item label="统一到期时间">
                        <el-col :span="6">
                            <el-date-picker