Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-invent...

huminmin

17 小时以前 7d1924d1924e2cafd77ca1ce3b7d5ca9336edb9c

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -19,8 +19,8 @@
                   clearable>
          <el-option v-for="item in stockRecordTypeOptions"
                     :key="item.value"
                     :label="item.value"
                     :value="item.key"/>
                     :label="item.label"
                     :value="item.value"/>
        </el-select>
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
            >搜索</el-button
@@ -29,7 +29,7 @@
         <div>
            <el-button @click="handleOut">导出</el-button>
            <el-button type="danger" plain @click="handleDelete">删除</el-button>
            <el-button type="primary" plain @click="handlePrint">打印</el-button>
            <!-- <el-button type="primary" plain @click="handlePrint">打印</el-button> -->
         </div>
      </div>
      <div class="table_list">
@@ -45,12 +45,30 @@
         >
            <el-table-column align="center" type="selection" width="55" />
            <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
        <!-- <el-table-column
            label="出库批次"
            prop="outboundBatches"
            min-width="100"
            show-overflow-tooltip
        />
        /> -->
        <el-table-column
            label="批号"
            min-width="120"
            show-overflow-tooltip
        >
          <template #default="scope">
            {{ scope.row.batchNo || "" }}
          </template>
        </el-table-column>
        <el-table-column
            label="供应商"
            min-width="160"
            show-overflow-tooltip
        >
          <template #default="scope">
            {{ scope.row.supplierName || scope.row.customer || "" }}
          </template>
        </el-table-column>
            <el-table-column
               label="出库日期"
               prop="createTime"
@@ -66,6 +84,9 @@
               prop="model"
               show-overflow-tooltip
            />
        <el-table-column label="UID码"
                         prop="uidNO"
                         show-overflow-tooltip/>
            <el-table-column
               label="单位"
               prop="unit"
@@ -111,7 +132,9 @@
   getStockOutPage,
   delStockOut,
} from "@/api/inventoryManagement/stockOut.js";
import {findAllStockRecordTypeOptions} from "@/api/basicData/enum.js";
import {
  findAllQualifiedStockOutRecordTypeOptions, findAllUnQualifiedStockOutRecordTypeOptions,
} from "@/api/basicData/enum.js";

const userStore = useUserStore();
const { proxy } = getCurrentInstance();
@@ -176,12 +199,19 @@
};

const getRecordType = (recordType) => {
  return stockRecordTypeOptions.value.find(item => item.key === recordType)?.value || ''
  return stockRecordTypeOptions.value.find(item => item.value === recordType)?.label || ''
}

// 获取来源类型选项
const fetchStockRecordTypeOptions = () => {
  findAllStockRecordTypeOptions()
  if (props.type === '0') {
    findAllQualifiedStockOutRecordTypeOptions()
        .then(res => {
          stockRecordTypeOptions.value = res.data;
        })
    return
  }
  findAllUnQualifiedStockOutRecordTypeOptions()
      .then(res => {
        stockRecordTypeOptions.value = res.data;
      })
@@ -203,7 +233,7 @@
      type: "warning",
   })
      .then(() => {
         proxy.download("/stockmanagement/export", {}, "出库台账.xlsx");
         proxy.download("/stockOutRecord/exportStockOutRecord", {type: props.type}, props.type === '0' ? "合格出库台账.xlsx" : "不合格出库台账.xlsx");
      })
      .catch(() => {
         proxy.$modal.msg("已取消");
@@ -412,8 +442,14 @@
              </div>
            </div>
            <div class="info-row">
              <span class="label">单号：</span>
              <span class="value">${item.code || ''}</span>
              <div>
                <span class="label">批号：</span>
                <span class="value">${item.batchNo || item.outboundBatches || ''}</span>
              </div>
              <div>
                <span class="label">单号：</span>
                <span class="value">${item.code || ''}</span>
              </div>
            </div>
          </div>