Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inven...

gongchunyi

7 天以前 aa802302cfe650e08806c8b87d5a8c5d3a79ffe1

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -12,6 +12,13 @@
               clearable
               @change="handleQuery"
            />
        <span class="search_title ml10">合同号：</span>
        <el-input
            v-model="searchForm.salesContractNo"
            style="width: 240px"
            placeholder="请输入合同号"
            clearable
        />
        <span class="search_title ml10">来源：</span>
        <el-select v-model="searchForm.recordType"
                   style="width: 240px"
@@ -51,9 +58,15 @@
            min-width="100"
            show-overflow-tooltip
        />
        <el-table-column
            label="合同号"
            prop="salesContractNo"
            show-overflow-tooltip
        />
            <el-table-column
               label="出库日期"
               prop="createTime"
               :formatter="formatTableDateYmd"
               show-overflow-tooltip
            />
            <el-table-column
@@ -64,6 +77,11 @@
            <el-table-column
               label="规格型号"
               prop="model"
               show-overflow-tooltip
            />
            <el-table-column
               label="厚度(mm)"
               prop="thickness"
               show-overflow-tooltip
            />
            <el-table-column
@@ -103,22 +121,28 @@

<script setup>
import pagination from "@/components/PIMTable/Pagination.vue";
import { ref } from "vue";
import { ref, reactive, toRefs, getCurrentInstance, onMounted } from "vue";
import { ElMessageBox } from "element-plus";
import useUserStore from "@/store/modules/user";
import { getCurrentDate } from "@/utils/index.js";
import { parseTime } from "@/utils/ruoyi";
import {
   getStockOutPage,
   delStockOut,
} from "@/api/inventoryManagement/stockOut.js";
import {
  findAllQualifiedStockRecordTypeOptions,
  findAllStockRecordTypeOptions,
  findAllUnqualifiedStockRecordTypeOptions
  findAllQualifiedStockOutRecordTypeOptions, findAllUnQualifiedStockOutRecordTypeOptions,
} from "@/api/basicData/enum.js";

const userStore = useUserStore();
const { proxy } = getCurrentInstance();

const formatTableDateYmd = (row, column, cellValue) => {
   if (cellValue == null || cellValue === "") {
      return "";
   }
   return parseTime(cellValue, "{y}-{m}-{d}") || "";
};
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
@@ -146,6 +170,7 @@
const data = reactive({
   searchForm: {
      supplierName: "",
    salesContractNo: "",
      timeStr: "",
    recordType: "",
   }
@@ -186,13 +211,13 @@
// 获取来源类型选项
const fetchStockRecordTypeOptions = () => {
  if (props.type === '0') {
    findAllQualifiedStockRecordTypeOptions()
    findAllQualifiedStockOutRecordTypeOptions()
        .then(res => {
          stockRecordTypeOptions.value = res.data;
        })
    return
  }
  findAllUnqualifiedStockRecordTypeOptions()
  findAllUnQualifiedStockOutRecordTypeOptions()
      .then(res => {
        stockRecordTypeOptions.value = res.data;
      })
@@ -214,7 +239,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("已取消");
@@ -407,7 +432,6 @@
      <div class="print-page">
        <div class="delivery-note">
          <div class="header">
            <div class="company-name">鼎诚瑞实业有限责任公司</div>
            <div class="document-title">零售发货单</div>
          </div>
          
@@ -419,7 +443,7 @@
              </div>
              <div>
                <span class="label">客户名称：</span>
                <span class="value">${item.supplierName || '张爱有'}</span>
                <span class="value">${item.supplierName}</span>
              </div>
            </div>
            <div class="info-row">