Merge branch 'main' into feature/0423

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "lint": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service lint",
     "build:preview": "vue-cli-service build --mode preview",

src/views/goods/Create.vue

@@ -15,14 +15,14 @@
 						<a-form-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
 							<GoodsType v-decorator="['goods_type', { initialValue: 10}]" @change="onForceUpdate(true)" />
 						</a-form-item>
-						<a-form-item label="商品SKU" :labelCol="labelCol" :wrapperCol="wrapperCol">
+						<!-- <a-form-item label="商品SKU" :labelCol="labelCol" :wrapperCol="wrapperCol">
 							<div style=" display: flex;align-items: center;width:100%">
 								<a-input style="width:242px" placeholder="输入商品SKU" v-decorator="['goods_no', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]" />
 								<div class="action-item">
 									<a-button type="primary" @click="handInfo">一键获取</a-button>
 								</div>
 							</div>
-						</a-form-item>
+						</a-form-item> -->
 						<a-form-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
 							<a-input placeholder="请输入商品名称" v-decorator="['goods_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]" />
 						</a-form-item>
@@ -86,9 +86,9 @@
 							</a-radio-group>
 						</a-form-item>
 
-						// <a-form-item label="商品编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+						<a-form-item label="商品编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-							// <a-input placeholder="请输入商品编码" v-decorator="['goods_no']" />
+						 <a-input placeholder="请输入商品编码" v-decorator="['goods_no']" />
-							// </a-form-item>
+						 </a-form-item>
 
 						<a-form-item label="所属分类排行(0表示不参加排行)" :labelCol="labelCol" :wrapperCol="wrapperCol">
 							<a-input placeholder="所属分类排行" v-decorator="['paihang']" />