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-02-25 21:44:35 +08:00
2 parents f0bb087f31 bd243cdd09
commit 130768d1da
7 files changed
+26 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/hard/hard-order/index.vue
+2 -2
View File
@@ -14,8 +14,8 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="w100" label="用户部门" prop="deptIdIdDeepen">
<select-dept v-model="state.queryForm.deptIdIdDeepen" />
<el-form-item class="w100" label="用户部门" prop="deptId">
<select-dept v-model="state.queryForm.deptId" />
</el-form-item>
</el-col>
<el-col :span="4">
src/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue
+4 -2
View File
@@ -12,9 +12,11 @@
@radio-change="radioChangeEvent"
>
<vxe-column type="radio" width="60" align="center"></vxe-column>
<vxe-column field="id" title="id" align="center" width="200"></vxe-column>
<!-- <vxe-column field="id" title="id" align="center" width="200"></vxe-column>-->
<vxe-column field="planCode" title="编号" align="center" width="200"></vxe-column>
<vxe-column field="planDate" title="单据日期" align="center" width="200"></vxe-column>
<vxe-column field="productName" title="商品名称" align="center" width="200"></vxe-column>
<vxe-column field="handlerUserId" title="经办人" align="center" width="100"></vxe-column>
<vxe-column field="checkStatus" title="审批状态" align="center" width="100"></vxe-column>
<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
@@ -35,7 +37,7 @@
:data="currRadioRowItems"
>
<vxe-column type="checkbox" width="60" align="center"></vxe-column>
<vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>
<!-- <vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>-->
<vxe-column field="unit" title="包装单位" align="center" width="200"></vxe-column>
<vxe-column field="quantity" title="数量" align="center" width="100"></vxe-column>
<vxe-column field="purchasePrice" title="进价" align="center" width="100"></vxe-column>
src/views/supermarketerp/smErpCgDd/index.vue
+6 -6
View File
@@ -41,12 +41,12 @@
<el-table-column prop="code" label="编号" show-overflow-tooltip />
<el-table-column prop="ddDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="productName" 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" />
</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" />-->
<!-- </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/smErpCgDd/smErpCgDdOption.vue
-1
View File
@@ -10,7 +10,6 @@
<el-form-item label="单据日期" prop="dDate">
<el-input v-model="baseDataForm.ddDate" readonly style="width: 200px" />
</el-form-item>
<el-form-item label="经办人" prop="handlerUserId">
<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
</el-form-item>
src/views/supermarketerp/smErpCgPlan/index.vue
+2 -2
View File
@@ -63,8 +63,8 @@
<el-table-column prop="planCode" label="编号" show-overflow-tooltip />
<el-table-column prop="planDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />-->
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column label="操作" width="150">
<template #default="scope">
src/views/supermarketerp/smErpInventoryRecords/components/linkCgCodeDialog.vue
+5 -4
View File
@@ -12,9 +12,10 @@
@radio-change="radioChangeEvent"
>
<vxe-column type="radio" width="60" align="center"></vxe-column>
<vxe-column field="id" title="id" align="center" width="200"></vxe-column>
<vxe-column field="planCode" title="编号" align="center" width="200"></vxe-column>
<vxe-column field="planDate" title="单据日期" align="center" width="200"></vxe-column>
<!-- <vxe-column field="id" title="id" align="center" width="200"></vxe-column>-->
<vxe-column field="productName" title="商品" align="center" width="200"></vxe-column>
<vxe-column field="code" title="编号" align="center" width="200"></vxe-column>
<vxe-column field="ddDate" title="单据日期" align="center" width="200"></vxe-column>
<vxe-column field="handlerUserId" title="经办人" align="center" width="100"></vxe-column>
<vxe-column field="checkStatus" title="审批状态" align="center" width="100"></vxe-column>
<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
@@ -35,7 +36,7 @@
:data="currRadioRowItems"
>
<vxe-column type="checkbox" width="60" align="center"></vxe-column>
<vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>
<!-- <vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>-->
<vxe-column field="unit" title="包装单位" align="center" width="200"></vxe-column>
<vxe-column field="quantity" title="数量" align="center" width="100"></vxe-column>
<vxe-column field="purchasePrice" title="进价" align="center" width="100"></vxe-column>
src/views/supermarketerp/smErpInventoryRecords/index.vue
+7 -7
View File
@@ -74,13 +74,13 @@
<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="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="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"></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 />