Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

src/views/hard/hard-sb/index.vue

@@ -38,7 +38,7 @@
 				@selection-change="selectionChangHandle"
 				@sort-change="sortChangeHandle"
 			>
-				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="selection" width="80" align="center" />
 				<el-table-column type="index" label="#" width="50" />
 				<el-table-column label="设备" align="center">
 					<template #default="{ row }">
@@ -104,7 +104,7 @@ const getSummaries = (param: any) => {
 	const { columns, data } = param
 	const totalColumns = ["totalPayPrice", "totalPayCount"]
 	const totalRow = Array.from({ length: columns.length })
-	totalRow[2] = "合计"
+	totalRow[0] = "合计"
 	columns.forEach((i: any, index: number) => {
 		if (totalColumns.includes(i.property)) {
 			const total = data

src/views/hard/hard-sh/index.vue

@@ -38,7 +38,7 @@
 				@selection-change="selectionChangHandle"
 				@sort-change="sortChangeHandle"
 			>
-				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="selection" width="80" align="center" />
 				<el-table-column type="index" label="#" width="50" />
 				<el-table-column label="商户" align="center" prop="merchantName" />
 				<el-table-column label="总消费金额" align="center" prop="totalPayPrice">
@@ -101,7 +101,7 @@ const getSummaries = (param: any) => {
 	const { columns, data } = param
 	const totalColumns = ["totalPayPrice", "totalPayCount"]
 	const totalRow = Array.from({ length: columns.length })
-	totalRow[2] = "合计"
+	totalRow[0] = "合计"
 	columns.forEach((i: any, index: number) => {
 		if (totalColumns.includes(i.property)) {
 			const total = data

src/views/supermarket/smSpu/form.vue

@@ -11,16 +11,8 @@
         </el-form-item>
       </el-col>
 
-    <el-col :span="12" class="mb20">
+    <el-col :span="24" class="mb20">
-  <el-form-item label="商品详情" prop="description">
+  <el-form-item label="轮播图" prop="sliderPicUrls">
-    <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
-  </el-form-item>
-  </el-col>
-
-    <el-col :span="12" class="mb20">
-  <el-form-item label="商品轮播图地址
- 数组，以逗号分隔
- 最多上传15张" prop="sliderPicUrls">
     <upload-img v-model="form.sliderPicUrls"></upload-img>
   </el-form-item>
   </el-col>
@@ -32,7 +24,7 @@
       </el-col>
 
     <el-col :span="12" class="mb20">
-      <el-form-item label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" prop="status">
+      <el-form-item label="商品状态" prop="status">
             <el-radio-group v-model="form.status">
              <el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }}
             </el-radio>
@@ -42,23 +34,15 @@
 
     <el-col :span="12" class="mb20">
       <el-form-item label="赠送积分" prop="giveIntegral">
-        <el-input-number :min="1" :max="1000" v-model="form.giveIntegral" placeholder="请输入赠送积分"></el-input-number>
+        <el-input-number :min="0" :max="1000" v-model="form.giveIntegral" placeholder="请输入赠送积分"></el-input-number>
       </el-form-item>
     </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="部门id" prop="deptId">
-        <el-input v-model="form.deptId" placeholder="请输入部门id"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="销量" prop="salesCount">
-        <el-input v-model="form.salesCount" placeholder="请输入销量"/>
-      </el-form-item>
-      </el-col>
-
 			</el-row>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="商品详情" prop="description">
+            <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
+          </el-form-item>
+        </el-col>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
@@ -90,7 +74,7 @@ const form = reactive({
 	  description: '',
 	  sliderPicUrls: '',
 	  sort: '',
-	  status: '',
+	  status: '0',
 		giveIntegral: 0,
 	  deptId: '',
 	  salesCount: '',

src/views/supermarket/smSpu/index.vue

@@ -31,19 +31,16 @@
             @queryTable="getDataList"></right-toolbar>
         </div>
       </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border 
+      <el-table :data="state.dataList" v-loading="state.loading" border
         :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
         @sort-change="sortChangeHandle">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column type="index" label="#" width="40" />
           <el-table-column prop="erpSpuId" label="库存商品id"  show-overflow-tooltip/>
-          <el-table-column prop="description" label="商品详情"  show-overflow-tooltip/>
+          <el-table-column prop="productName" label="商品名称"  show-overflow-tooltip/>
-          <el-table-column prop="sliderPicUrls" label="商品轮播图地址
- 数组，以逗号分隔
- 最多上传15张"  show-overflow-tooltip/>
           <el-table-column prop="sort" label="排序字段" sortable="custom" show-overflow-tooltip/>
-          <el-table-column prop="status" label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" show-overflow-tooltip>
+          <el-table-column prop="status" label="商品状态" show-overflow-tooltip>
       <template #default="scope">
                 <dict-tag :options="spu_status" :value="scope.row.status"></dict-tag>
             </template>
@@ -139,4 +136,4 @@ const handleDelete = async (ids: string[]) => {
     useMessage().error(err.msg);
   }
 };
-</script>
+</script>

src/views/supermarketerp/supermarketSpu/components/supermarketUnit/form.vue

@@ -30,7 +30,11 @@
 				</el-col>
 
 				<el-col :span="14" class="mb20">
-					<el-form-item label="内装数量" prop="packageNum">
+					<el-form-item label="内装" prop="packageNum">
+            <el-alert type="warning" show-icon :closable="false">
+              <p>注：内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换，影响erp库存自动扣减操作。
+              例如：一瓶矿泉水内装填'1',为售卖的最小基础单位，如果想按箱卖，在继续添加包装单位为箱，内装为24</p>
+            </el-alert>
 						<el-input-number v-model="form.packageNum" :min="0" :precision="0" />
 					</el-form-item>
 				</el-col>

src/views/supermarketerp/supermarketSpu/form.vue

@@ -67,26 +67,48 @@
 								<upload-img v-model:imageUrl="form.picUrl"></upload-img>
 							</el-form-item>
 						</el-col>
-<!--						<el-col :span="24" class="mb20">
+
-							<el-form-item label="商品轮播图" prop="sliderPicUrls">
+            <el-col :span="14" class="mb20">
-								<upload-imgs v-model:imageUrl="form.sliderPicUrls"></upload-imgs>
+              <el-form-item label="内装数" prop="packageNum">
-							</el-form-item>
+                <el-alert type="warning" show-icon :closable="false">
-						</el-col>-->
+                  <p>注：内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换，影响erp库存自动扣减操作。
-						<el-col :span="12" class="mb20">
+                    例如：一箱矿泉水内装填'24',是按整箱售卖，如果想拆开零售，再继续添加包装单位为瓶，内装为1</p>
-							<el-form-item label="排序字段" prop="sort">
+                </el-alert>
-								<el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
+                <el-input-number v-model="form.packageNum" :min="0" :precision="0" />
-							</el-form-item>
+              </el-form-item>
-						</el-col>
+            </el-col>
+            <el-col :span="12" class="mb20">
+              <el-form-item label="单位" prop="unit">
+                <el-input placeholder="请输入单位" v-model.trim="form.unit" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="mb20">
+              <el-form-item label="零售价" prop="retailPrice">
+                <el-input-number v-model="form.retailPrice" :min="0" :precision="2" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12" class="mb20">
+              <el-form-item label="促销价" prop="promotionPrice">
+                <el-input-number v-model="form.promotionPrice" :min="0" :precision="2" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="mb20">
+              <el-form-item label="进价" prop="purchasePrice">
+                <el-input-number v-model="form.purchasePrice" :min="0" :precision="2" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12" class="mb20">
+              <el-form-item label="成本价" prop="costPrice">
+                <el-input-number v-model="form.costPrice" :min="0" :precision="2" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12" class="mb20">
               <el-form-item label="总库存" prop="stock">
                 <el-input-number v-model="form.stock" :min="0" :precision="0" />
               </el-form-item>
             </el-col>
-<!--						<el-col :span="12" class="mb20">
-							<el-form-item label="单位" prop="unit">
-								<el-input v-model="form.unit" placeholder="请输入单位" />
-							</el-form-item>
-						</el-col>-->
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品状态" prop="status">
 								<el-radio-group v-model="form.status">
@@ -96,86 +118,21 @@
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
-						<!--						<el-col :span="12" class="mb20">-->
+            <el-col :span="12" class="mb20">
-						<!--							<el-form-item label="成本单价" prop="costPrice">-->
+              <el-form-item label="规格" prop="spec">
-						<!--								<el-input-number v-model="form.costPrice" placeholder="请输入成本单价，单位:分"></el-input-number>-->
+                <el-input placeholder="请输入规格" v-model.trim="form.specification" />
-						<!--							</el-form-item>-->
+              </el-form-item>
-						<!--						</el-col>-->
+            </el-col>
-<!--						<el-col :span="12" class="mb20">
-							<el-form-item label="赠送积分" prop="giveIntegral">
-								<el-input-number v-model="form.giveIntegral" :min="0" :precision="0" />
-							</el-form-item>
-						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="规格" prop="specification">-->
-						<!--								<el-input v-model="form.specification" placeholder="请输入规格" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="产地" prop="origin">
 								<el-input v-model.trim="form.origin" placeholder="请输入产地" />
 							</el-form-item>
 						</el-col>
-						<!--						<el-col :span="12" class="mb20">-->
+            <el-col :span="12" class="mb20">
-						<!--							<el-form-item label="装数" prop="packingQuantity">-->
+              <el-form-item label="排序字段" prop="sort">
-						<!--								<el-input-number :min="0" v-model="form.packingQuantity" placeholder="请输入装数"></el-input-number>-->
+                <el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
-						<!--							</el-form-item>-->
+              </el-form-item>
-						<!--						</el-col>-->
+            </el-col>
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="零售价" prop="retailPrice">-->
-						<!--								<el-input-number v-model="form.retailPrice" placeholder="请输入零售价"></el-input-number>-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="进价" prop="purchasePrice">-->
-						<!--								<el-input-number v-model="form.purchasePrice" placeholder="请输入进价"></el-input-number>-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="会员价1" prop="memberPrice1">-->
-						<!--								<el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="会员价2" prop="memberPrice2">-->
-						<!--								<el-input-number v-model="form.memberPrice2" placeholder="请输入会员价2"></el-input-number>-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="会员价3" prop="memberPrice3">-->
-						<!--								<el-input-number v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input-number>-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="批发价1" prop="wholesalePrice1">-->
-						<!--								<el-input-number v-model="form.wholesalePrice1" placeholder="请输入批发价1"></el-input-number>-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="批发价2" prop="wholesalePrice2">-->
-						<!--								<el-input-number v-model="form.wholesalePrice2" placeholder="请输入批发价2"></el-input-number>-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="批发价3" prop="wholesalePrice3">-->
-						<!--								<el-input-number v-model="form.wholesalePrice3" placeholder="请输入批发价3"></el-input-number>-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="促销价" prop="promotionPrice">-->
-						<!--								<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!-- <el-col :span="24" class="mb20">
-							<el-form-item label="商品简介" prop="introduction">
-								<el-input type="textarea" v-model="form.introduction" rows="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />
-							</el-form-item>
-						</el-col> -->
-<!--						<el-col :span="24" class="mb20">
-							<el-form-item label="商品详情" prop="description">
-								<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
-							</el-form-item>
-						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="库存上限" prop="inventoryUpperLimit">
 								<el-input-number v-model="form.inventoryUpperLimit" :min="0" :precision="0" />
@@ -250,13 +207,13 @@ const form = reactive({
 	picUrl: "",
 	sliderPicUrls: "",
 	sort: 0,
-	status: "",
+	status: "0",
 	costPrice: 0,
 	stock: 0,
 	giveIntegral: 0,
 	specification: "",
 	origin: "",
-	packingQuantity: 0,
+  packageNum: 0,
 	retailPrice: 0,
 	purchasePrice: 0,
 	supplierId: "",
@@ -291,6 +248,11 @@ const dataRules = {
 	supplierId: [{ required: true, message: "请选择货商", trigger: "blur" }],
   smErpUnitEntityList: [{ required: true, message: "请添加包装单位", trigger: "change" }],
   smErpAuxiliaryCodeEntityList: [{ required: true, message: "请添加辅助条码", trigger: "change" }],
+  // costPrice: [{ required: true, message: "成本价不能为空", trigger: "blur" }],
+  retailPrice: [{ required: true, message: "零售价不能为空", trigger: "blur" }],
+  unit: [{ required: true, message: "单位不能为空", trigger: "blur" }],
+  packageNum: [{ required: true, message: "内装数不能为空", trigger: "blur" }],
+
 }
 const { supermarket_nature, status } = useDict("supermarket_nature", "status")
 const categoryOptions = ref<any>([]) // 商品分类的下拉选项