From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/stock/components/InDetail.vue | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/admin/src/views/stock/components/InDetail.vue b/admin/src/views/stock/components/InDetail.vue
index ad73ba4..a32ff7d 100644
--- a/admin/src/views/stock/components/InDetail.vue
+++ b/admin/src/views/stock/components/InDetail.vue
@@ -1,43 +1,46 @@
<template>
- <GlobalWindow width="960px" title="鍑哄簱鍗曡鎯�" :visible.sync="visible" :confirm-working="isWorking" @close="close"
+ <GlobalWindow width="960px" :showConfirm="false" title="鍏ュ簱鍗曡鎯�" :visible.sync="visible" :confirm-working="isWorking" @close="close"
@confirm="confirm">
<div class="main">
<div class="title">
- <span>宸ュ崟璇︽儏</span>
+ <span>鍏ュ簱鍗曠紪鍙凤細{{ info.code }}</span>
+ </div>
+ <div class="title">
+ <span>鍩虹淇℃伅</span>
</div>
<div class="main_content">
<div class="list">
<div class="item">
- <div class="la">鍑哄簱浠撳簱</div>
- <div class="val">{{ info.projectName }}</div>
+ <div class="la">鍏ュ簱浠撳簱</div>
+ <div class="val">{{ info.warehouseName }}</div>
</div>
<div class="item">
- <div class="la">鍑哄簱鏃ユ湡</div>
- <div class="val">{{ info.categoryName }}</div>
+ <div class="la">鍏ュ簱鏃ユ湡</div>
+ <div class="val">{{ info.doneDate }}</div>
</div>
<div class="item">
- <div class="la">鍑哄簱绫诲瀷</div>
- <div class="val">{{ info.creatorName }}{{ info.creatorCompany ? "-" + info.creatorCompany : '' }}</div>
+ <div class="la">鍏ュ簱绫诲瀷</div>
+ <div class="val" v-if="info.type || info.type == 0">{{ StoreTypeOps[info.type].name }}</div>
</div>
<div class="item">
<div class="la">澶勭悊浜�</div>
- <div class="val">{{ info.creatorPhone || info.creatorMobile }}</div>
+ <div class="val">{{ info.createUserName }}</div>
</div>
- <div class="item">
+ <div class="item" style="width: 66.6%;">
<div class="la">澶囨敞</div>
- <div class="val">{{ info.createDate }}</div>
+ <div class="val">{{ info.remark }}</div>
</div>
</div>
</div>
<div class="title">鐗╂枡淇℃伅</div>
- <el-table :data="list" stripe>
- <el-table-column align="center" type="index" width="55" />
- <el-table-column prop="creatorName" label="鐗╂枡鍚嶇О" show-overflow-tooltip min-width="80px"></el-table-column>
- <el-table-column prop="categoryName" label="鐗╂枡缂栫爜" show-overflow-tooltip min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鏉″舰鐮�" show-overflow-tooltip min-width="100px"></el-table-column>
- <el-table-column prop="dealUserName" label="鍝佺墝" show-overflow-tooltip min-width="80px"></el-table-column>
- <el-table-column prop="dealUserName" label="鍗曚綅" show-overflow-tooltip min-width="80px"></el-table-column>
- <el-table-column prop="dealUserName" label="鍑哄簱鏁伴噺" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table :data="info.recordList" stripe>
+ <el-table-column align="center" label="搴忓彿" type="index" width="55" />
+ <el-table-column prop="materialName" label="鐗╂枡鍚嶇О" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="materialCode" label="鐗╂枡缂栫爜" show-overflow-tooltip min-width="100px"></el-table-column>
+ <el-table-column prop="materialQrcode" label="鏉″舰鐮�" show-overflow-tooltip min-width="100px"></el-table-column>
+ <el-table-column prop="materialBrand" label="鍝佺墝" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="materialUnitName" label="鍗曚綅" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="stock" label="鍏ュ簱鏁伴噺" show-overflow-tooltip min-width="80px"></el-table-column>
</el-table>
</div>
</GlobalWindow>
@@ -46,10 +49,8 @@
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
-import { detailById, dispatchOrder, dealOrder } from '@/api/workorder/ywWorkorder'
-import { getUserList } from '@/api/system/user'
-import { Message, Loading } from 'element-ui'
-import dayjs from 'dayjs'
+import { ywOutinboundDetail } from '@/api'
+import { StoreTypeOps } from './config'
export default {
components: {
GlobalWindow
@@ -57,21 +58,18 @@
extends: BaseOpera,
data() {
return {
- id: '',
visible: false,
- info: {},
- list: []
+ info: {recordList: []},
+ StoreTypeOps
}
},
created() {
- // this.getDetail()
},
methods: {
- getDetail() {
- const { id } = this
- detailById(id).then(res => {
+ getDetail(id) {
+ ywOutinboundDetail(id).then(res => {
this.info = res
})
},
--
Gitblit v1.9.3