From 20913c80c3f5fc8e533cb92b90e6f20bcd68e032 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 17:49:32 +0800
Subject: [PATCH] feat: 1、优化导入 2、部门物品台账查询对接
---
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue | 134 ++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 49 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index e73a9dc..f2a78ba 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/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,79 @@
</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-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}].reason`"
+ :rules="rules.reason"
+ >
+ <el-select v-model="scope.row.reason" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in reasonOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ @change="countsChange($event, goodsIndex, scope.$index)">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
<div class="btn-group">
<el-button
v-if="formData.goods.length > 1"
@@ -168,20 +208,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 },
@@ -240,11 +275,11 @@
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
dealTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
buyType: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-
baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
modelsIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
counts: [{ required: true, message: '璇疯緭鍏�', trigger: 'change' }],
+ reason: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
},
uploadSettings: {
@@ -258,6 +293,7 @@
disabled: false, // 鏄惁绂佺敤
type: 'picture', // text/picture
},
+ reasonOptions:[] // 鎶ュ簾鍘熷洜
};
},
computed: {
@@ -387,11 +423,7 @@
curItem.counts = worehouseCount > 0 ? worehouseCount : null;
}
},
-
- handleConfirm(){
-
- },
-
+ handleConfirm(){},
// 鎻愪氦
handleSubmit() {
this.$refs['ruleForm'].validate((valid) => {
@@ -433,4 +465,8 @@
}
}
}
+.card3 {
+ border-radius: 2px;
+ background: #ffffff;
+}
</style>
--
Gitblit v1.9.1