Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

renkang

2025-01-24 d492850f1cc64ddcfaf43798af9c76c2505414fd

 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
      })
    },