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:
weiwei committed 2025-03-19 20:09:48 +08:00
2 parents 4a640f6279 a395c82052
commit 1fcbd10712
5 files changed
+31 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
+5 -5
View File
@@ -42,11 +42,11 @@
<el-table-column prop="ddDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="productName" 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" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="check_status" :value="scope.row.checkStatus" />
</template>
</el-table-column>
<!-- <el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip /> -->
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
-5
View File
@@ -22,11 +22,6 @@
<el-form-item label="经办人" prop="handlerUserId">
<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
</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" />
</el-select>
</el-form-item>
<el-form-item label="货商" prop="supplierId">
<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" />
</el-form-item>
src/views/supermarketerp/stockTaking/index.vue
+7 -7
View File
@@ -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>
@@ -56,7 +56,7 @@
<el-table-column type="index" label="#" width="50" />
<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="productName" label="入库商品" show-overflow-tooltip />
<!-- <el-table-column prop="productName" label="入库商品" show-overflow-tooltip /> -->
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
<template #default="{ row }">
@@ -65,7 +65,7 @@
</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 />
<!-- <el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip /> -->
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" @click="handleClickEditStockTaking(scope.row.id)">编辑</el-button>