From 7685d0a93c480975e55e9c4ebe16a2c0be105cbf Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 2 Apr 2025 14:34:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseManagement/smErpCgInventory/form.vue    |  2 +-
 .../purchaseManagement/smErpCgInventory/index.vue   |  2 +-
 .../retailManagement/smErpRetailBack/form.vue       | 13 ++++---------
 .../retailManagement/smErpRetailDelivery/form.vue   | 13 ++++---------
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index 53bf2e2..4203256 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -290,7 +290,7 @@ const svg = `<path class="path" d="
 const dataRules = ref({
 	inventoryCode: [{ required: true, message: "出入库记录表编号不能为空", trigger: "blur" }],
 	inventoryDate: [{ required: true, message: "出入库记录表单据日期不能为空", trigger: "blur" }],
-	handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
+	// handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
 	supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
 })
 
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
index 3c511ff..6995c38 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
@@ -75,7 +75,7 @@
 						<dict-tag :options="check_status" :value="scope.row.checkStatus" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
+				<el-table-column prop="supplierName" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
index ff2df87..fe3814c 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
@@ -28,20 +28,15 @@
 							:disabled="disabled"
 						/>
 					</el-form-item>
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
-							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" :disabled="disabled" />
-						</el-select>
-					</el-form-item>
 					<el-form-item label="货商" prop="supplierId">
 						<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
 					</el-form-item>
-					<el-form-item label="会员卡号" prop="memberNumber">
-						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" :disabled="disabled" />
-					</el-form-item>
+<!--					<el-form-item label="会员卡号" prop="memberNumber">-->
+<!--						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" :disabled="disabled" />-->
+<!--					</el-form-item>-->
 				</div>
 			</el-form>
 			<div v-else ref="baseDataInfoRef">
@@ -336,7 +331,7 @@ const receiveAmountForm = reactive<{ receiveAmount: number }>({
 const dataRules = ref({
 	inventoryCode: [{ required: true, message: "出入库记录表编号不能为空", trigger: "blur" }],
 	inventoryDate: [{ required: true, message: "出入库记录表单据日期不能为空", trigger: "blur" }],
-	handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
+	// handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
 	supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
 })
 
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
index a451e73..5082a95 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
@@ -28,20 +28,15 @@
 							:disabled="disabled"
 						/>
 					</el-form-item>
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
-							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" :disabled="disabled" />
-						</el-select>
-					</el-form-item>
 					<el-form-item label="货商" prop="supplierId">
 						<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
 					</el-form-item>
-					<el-form-item label="会员卡号" prop="memberNumber">
-						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" :disabled="disabled" />
-					</el-form-item>
+<!--					<el-form-item label="会员卡号" prop="memberNumber">-->
+<!--						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" :disabled="disabled" />-->
+<!--					</el-form-item>-->
 				</div>
 			</el-form>
 			<div v-else ref="baseDataInfoRef">
@@ -326,7 +321,7 @@ const receiveAmountForm = reactive<{ receiveAmount: number }>({
 const dataRules = ref({
 	inventoryCode: [{ required: true, message: "出入库记录表编号不能为空", trigger: "blur" }],
 	inventoryDate: [{ required: true, message: "出入库记录表单据日期不能为空", trigger: "blur" }],
-	handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
+	// handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
 	supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
 })