From 1689eae8aa7f412125a6727592a88345b090ccdc Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 27 Feb 2025 03:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarketerp/smErpCgBack/index.vue      |  6 +-
 .../supermarketerp/smErpRetailBack/index.vue  | 22 ++---
 .../smErpRetailDelivery/index.vue             | 22 ++---
 .../supermarketerp/supermarketSpu/form.vue    | 94 +++++++++----------
 .../supermarketerp/supermarketSpu/index.vue   |  2 +-
 5 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/src/views/supermarketerp/smErpCgBack/index.vue b/src/views/supermarketerp/smErpCgBack/index.vue
index cc24a7f..da7e4f2 100644
--- a/src/views/supermarketerp/smErpCgBack/index.vue
+++ b/src/views/supermarketerp/smErpCgBack/index.vue
@@ -18,11 +18,11 @@
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-					<el-form-item label="审批状态" prop="checkStatus">
+<!--					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
 							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
 						</el-select>
-					</el-form-item>
+					</el-form-item>-->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -75,7 +75,7 @@
 				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
-				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
+				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
 				<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
 				<!--					<template #default="scope">-->
 				<!--						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
diff --git a/src/views/supermarketerp/smErpRetailBack/index.vue b/src/views/supermarketerp/smErpRetailBack/index.vue
index b7fc6b2..84ac8df 100644
--- a/src/views/supermarketerp/smErpRetailBack/index.vue
+++ b/src/views/supermarketerp/smErpRetailBack/index.vue
@@ -18,11 +18,11 @@
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
-							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
-						</el-select>
-					</el-form-item>
+<!--					<el-form-item label="审批状态" prop="checkStatus">-->
+<!--						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">-->
+<!--							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />-->
+<!--						</el-select>-->
+<!--					</el-form-item>-->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -75,12 +75,12 @@
 				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
-				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
-				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
-					<template #default="scope">
-						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
-					</template>
-				</el-table-column>
+				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
+<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
+<!--					<template #default="scope">-->
+<!--						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
+<!--					</template>-->
+<!--				</el-table-column>-->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
diff --git a/src/views/supermarketerp/smErpRetailDelivery/index.vue b/src/views/supermarketerp/smErpRetailDelivery/index.vue
index 238d269..ea9cfb2 100644
--- a/src/views/supermarketerp/smErpRetailDelivery/index.vue
+++ b/src/views/supermarketerp/smErpRetailDelivery/index.vue
@@ -18,11 +18,11 @@
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
-							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
-						</el-select>
-					</el-form-item>
+<!--					<el-form-item label="审批状态" prop="checkStatus">-->
+<!--						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">-->
+<!--							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />-->
+<!--						</el-select>-->
+<!--					</el-form-item>-->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -75,12 +75,12 @@
 				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
-				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
-				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
-					<template #default="scope">
-						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
-					</template>
-				</el-table-column>
+				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
+<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
+<!--					<template #default="scope">-->
+<!--						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
+<!--					</template>-->
+<!--				</el-table-column>-->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index d4a0756..eee5b10 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -14,11 +14,11 @@
 								<el-input v-model.trim="form.productCode" placeholder="请输入货号" />
 							</el-form-item>
 						</el-col>
-						<el-col :span="12" class="mb20">
-							<el-form-item label="自编码/条码" prop="barcode">
-								<el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />
-							</el-form-item>
-						</el-col>
+<!--						<el-col :span="12" class="mb20">-->
+<!--							<el-form-item label="自编码/条码" prop="barcode">-->
+<!--								<el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />-->
+<!--							</el-form-item>-->
+<!--						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="商品名称" prop="productName">
 								<el-input v-model.trim="form.productName" placeholder="请输入商品名称" />
@@ -58,43 +58,43 @@
 							</el-form-item>
 						</el-col>
 
-						<el-col :span="12" class="mb20">
-							<el-form-item label="单位" prop="unit">
-								<!--                <el-alert type="warning" show-icon>-->
-								<!--                  <p>最小售卖的基本单位</p>-->
-								<!--                </el-alert>-->
-								<el-input placeholder="请输入单位" v-model.trim="form.unit" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="14" class="mb20">
-							<el-form-item label="内装数" prop="packageNum">
-								<!--                <el-alert type="warning" show-icon >-->
-								<!--                  <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。-->
-								<!--                    例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>-->
-								<!--                </el-alert>-->
-								<el-input-number v-model="form.packageNum" :min="0" :precision="0" />
-							</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="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="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="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="unit">-->
+<!--								&lt;!&ndash;                <el-alert type="warning" show-icon>&ndash;&gt;-->
+<!--								&lt;!&ndash;                  <p>最小售卖的基本单位</p>&ndash;&gt;-->
+<!--								&lt;!&ndash;                </el-alert>&ndash;&gt;-->
+<!--								<el-input placeholder="请输入单位" v-model.trim="form.unit" />-->
+<!--							</el-form-item>-->
+<!--						</el-col>-->
+<!--						<el-col :span="14" class="mb20">-->
+<!--							<el-form-item label="内装数" prop="packageNum">-->
+<!--								&lt;!&ndash;                <el-alert type="warning" show-icon >&ndash;&gt;-->
+<!--								&lt;!&ndash;                  <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。&ndash;&gt;-->
+<!--								&lt;!&ndash;                    例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>&ndash;&gt;-->
+<!--								&lt;!&ndash;                </el-alert>&ndash;&gt;-->
+<!--								<el-input-number v-model="form.packageNum" :min="0" :precision="0" />-->
+<!--							</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="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="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="costPrice">-->
+<!--								<el-input-number v-model="form.costPrice" :min="0" :precision="2" />-->
+<!--							</el-form-item>-->
+<!--						</el-col>-->
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品状态" prop="status">
 								<el-radio-group v-model="form.status">
@@ -102,11 +102,11 @@
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
-						<el-col :span="12" class="mb20">
-							<el-form-item label="规格" prop="spec">
-								<el-input placeholder="请输入规格" v-model.trim="form.spec" />
-							</el-form-item>
-						</el-col>
+<!--						<el-col :span="12" class="mb20">-->
+<!--							<el-form-item label="规格" prop="spec">-->
+<!--								<el-input placeholder="请输入规格" v-model.trim="form.spec" />-->
+<!--							</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="请输入产地" />
diff --git a/src/views/supermarketerp/supermarketSpu/index.vue b/src/views/supermarketerp/supermarketSpu/index.vue
index be23bad..53d062b 100644
--- a/src/views/supermarketerp/supermarketSpu/index.vue
+++ b/src/views/supermarketerp/supermarketSpu/index.vue
@@ -61,7 +61,7 @@
 				<el-table-column type="selection" width="40" align="center" fixed="left" />
 				<el-table-column type="index" label="#" width="50" fixed="left" />
 				<el-table-column prop="productCode" label="货号" show-overflow-tooltip />
-				<el-table-column prop="barcode" label="自编码/条码" show-overflow-tooltip width="100" />
+<!--				<el-table-column prop="barcode" label="自编码/条码" show-overflow-tooltip width="100" />-->
 				<el-table-column prop="productName" label="商品名称" show-overflow-tooltip width="100" />
 				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
 				<el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip width="100">