From 50b1b07bfa382c3f19c6b23f1cff4dfa50294f07 Mon Sep 17 00:00:00 2001 From: 石广澎 <shiguangpeng@163.com> Date: 星期四, 30 十一月 2023 10:58:38 +0800 Subject: [PATCH] feat: 库存管理 增加加载状态 --- admin-web/src/views/departmentitem/itemret/returnNote/edit.vue | 105 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 62 insertions(+), 43 deletions(-) diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue index a4aee1f..182a915 100644 --- a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue +++ b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue @@ -29,7 +29,7 @@ </el-row> <el-row :gutter="24" class="headerHeight"> <el-col :span="24"> - <el-form-item label="閫�鍥炴墜缁�" prop="procureDoc"> + <el-form-item label="閫�鍥炲鎵规墜缁�" prop="procureDoc"> <upload ref="uploadRef" :settings="uploadSettings" @on-change="uploadChange"></upload> </el-form-item> </el-col> @@ -89,39 +89,59 @@ </el-form-item> </el-col> </el-row> - <el-table :data="goodsItem.models" :stripe="true"> - <el-table-column prop="baseGoodsModelsId" label="瑙勬牸鍨嬪彿" align="center"> - <template slot-scope="scope"> - {{ getGoodsModelsName(scope.row.baseGoodsModelsId) }} - </template> - </el-table-column> - <el-table-column label="鍗曚綅" align="center"> - <template slot-scope="scope"> - {{ scope.row.unit }} - </template> - </el-table-column> - <el-table-column prop="price" label="鐜版湁搴撳瓨" align="center"> - <template slot-scope="scope"> - {{ scope.row.worehouseCount }} - </template> - </el-table-column> - <el-table-column prop="counts" label="閫�鍥炴暟閲�" align="center"> - <template slot-scope="scope"> - <el-form-item - label-width="0" - style="margin-bottom: 0" - :prop="`goods[${goodsIndex}].models[${scope.$index}].counts`" - :rules="rules.counts" - > - <el-input - type="number" - v-model="scope.row.counts" - @change="countsChange($event, goodsIndex, scope.$index)" - ></el-input> + <div class="card3" v-for="(mItem, mIndex) in goodsItem.models" :key="mIndex"> + <el-row :gutter="24" type="flex" align="middle" style="height: 50px"> + <el-col :span="8"> + <el-form-item label="瑙勬牸鍨嬪彿:" prop="baseGoodsModelsId" style="margin-bottom: 0"> + {{ getGoodsModelsName(mItem.baseGoodsModelsId) }} </el-form-item> - </template> - </el-table-column> - </el-table> + </el-col> + <el-col :span="6"> + <el-form-item label="鍗曚綅:" prop="baseGoodsModelsId" style="margin-bottom: 0" label-width="80"> + 50 + </el-form-item> + </el-col> + <el-col :span="6"> + <el-form-item label="鐗╁搧绫诲埆:" prop="baseGoodsModelsId" style="margin-bottom: 0" label-width="80"> + A绫� + </el-form-item> + </el-col> + </el-row> + <el-table :data="mItem.models" :stripe="true"> + <!-- A绫诲晢鍝佹樉绀� --> + <el-table-column prop="price" label="浣跨敤浜�" align="center" v-if="goodsItem.models.type===1"> + <template slot-scope="scope"> + {{ scope.row.worehouseCount }} + </template> + </el-table-column> + <el-table-column prop="price" label="鍒嗗彂鏁伴噺" align="center"> + <template slot-scope="scope"> + {{ scope.row.worehouseCount }} + </template> + </el-table-column> + <el-table-column prop="price" label="鍙��鏁伴噺" align="center"> + <template slot-scope="scope"> + {{ scope.row.worehouseCount }} + </template> + </el-table-column> + <el-table-column prop="counts" label="閫�鍥炴暟閲�" align="center"> + <template slot-scope="scope"> + <el-form-item + label-width="0" + style="margin-bottom: 0" + :prop="`goods[${goodsIndex}].models[${scope.$index}].counts`" + :rules="rules.counts" + > + <el-input + type="number" + v-model="scope.row.counts" + @change="countsChange($event, goodsIndex, scope.$index)" + ></el-input> + </el-form-item> + </template> + </el-table-column> + </el-table> + </div> <div class="btn-group"> <el-button v-if="formData.goods.length > 1" @@ -168,20 +188,15 @@ </win-md> </template> <script> -import { - goodsTemplate, - goodsModel, - selectTenantWarehouse, - warehouseSelectNumber, -} from '@/api/baseSetting/finsystenant'; -import { outputAdd } from '@/api/stock/accessStock'; -import { getTree } from '@/api/foudation/classification'; +import {goodsTemplate, selectTenantWarehouse,} from '@/api/baseSetting/finsystenant'; +import {outputAdd} from '@/api/stock/accessStock'; +import {getTree} from '@/api/foudation/classification'; import MyButton from '@/components/myButton/myButton'; import winMd from '@/components/win/win-md'; import winSm from '@/components/win/win-sm'; import upload from '@/components/upload/index'; -import { getUploadUrl } from '@/utils/base'; -import { mapGetters } from 'vuex'; +import {getUploadUrl} from '@/utils/base'; +import {mapGetters} from 'vuex'; export default { components: { MyButton, winMd, winSm, upload }, @@ -433,4 +448,8 @@ } } } +.card3 { + border-radius: 2px; + background: #ffffff; +} </style> -- Gitblit v1.9.1