zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

Browse Source
This commit is contained in:
dzc committed 2025-04-02 19:48:31 +08:00
2 parents 68498f1c39 7685d0a93c
commit 19a73776d2
6 files changed
+13 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+1 -1
View File
@@ -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" }],
})
src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
+1 -1
View File
@@ -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">
src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
+4 -9
View File
@@ -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" }],
})
src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
+4 -9
View File
@@ -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" }],
})
src/views/supermarketerp/supermarketSpu/components/productInventory.vue
+1 -1
View File
@@ -1,7 +1,7 @@
<template>
<el-row>
<el-col :span="24" class="mb20">
<el-form-item label="总库存" prop="stock" class="flex w-full h-full">
<el-form-item label="期初库存" prop="stock" class="flex w-full h-full">
<el-input-number v-model="stock" :min="0" :precision="0" />
</el-form-item>
</el-col>
src/views/supermarketerp/supermarketSpu/index.vue
+2 -2
View File
@@ -50,7 +50,7 @@
/>
<el-button
plain
v-auth="'supermarket_supermarketSpu_export'"
v-auth="'supermarket_supermarketSpu_import'"
class="ml10"
icon="upload-filled"
type="primary"
@@ -96,7 +96,7 @@
</template>
</el-table-column>
<!-- <el-table-column prop="costPrice" label="成本单价" show-overflow-tooltip width="100" /> -->
<el-table-column prop="stock" label="库存" show-overflow-tooltip />
<el-table-column prop="stock" label="总库存" show-overflow-tooltip />
<!-- <el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip /> -->
<!-- <el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip /> -->
<!-- <el-table-column prop="specification" label="规格" show-overflow-tooltip /> -->