gaoluyang
4 天以前 92b11d708a7183f8d74a421537ae85e41eb6a632
双奇点
1.仓储物流展示字段修改
已修改5个文件
62 ■■■■ 文件已修改
src/views/inventoryManagement/dispatchLog/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/issueManagement/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/dispatchLog/index.vue
@@ -117,7 +117,6 @@
                        <el-table-column label="出库数量/件" prop="inboundNum" show-overflow-tooltip />
                        <el-table-column label="每件数量/支" prop="boxNum" width="100" show-overflow-tooltip />
                        <el-table-column label="单价(元)/支" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                        <el-table-column label="单价(美元)/支" prop="dollarPrice" width="150"></el-table-column>
                        <el-table-column label="纸箱规格" prop="cartonSpecifications" width="150"></el-table-column>
                        <el-table-column label="出库人" prop="createBy" show-overflow-tooltip />
                    </el-table>
@@ -189,8 +188,7 @@
                        </el-table-column>
                        <el-table-column label="出库数量/件" prop="inboundNum" width="150" show-overflow-tooltip />
                        <el-table-column label="每件数量/支" prop="boxNum" width="100" show-overflow-tooltip />
                        <el-table-column label="单价(元)/件" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                        <el-table-column label="单价(美元)/件" prop="dollarPrice" width="150"></el-table-column>
                        <el-table-column label="单价(美元)/件" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                        <el-table-column label="纸箱规格" prop="cartonSpecifications" width="150"></el-table-column>
                        <el-table-column label="出库人" prop="createBy" width="150" show-overflow-tooltip />
                    </el-table>
@@ -257,7 +255,6 @@
                                    <tr>
                                        <th>产品名称</th>
                                        <th>产品高度</th>
                                        <th>单价(元)/件</th>
                                        <th>单价(美元)/件</th>
                                        <th>零售数量/件</th>
                                        <th>每件数量/支</th>
@@ -269,7 +266,6 @@
                                        <td>{{ item.productCategory || '' }}</td>
                                        <td>{{ item.specificationModel || '' }}{{ item.unit || '' }}</td>
                                        <td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
                                        <td>{{ item.dollarPrice || '0' }}</td>
                                        <td>{{ item.inboundNum || '0' }}</td>
                                        <td>{{ item.boxNum || '0' }}</td>
                                        <td>{{ item.cartonSpecifications || '0' }}</td>
@@ -702,7 +698,6 @@
                <tr>
                    <th>产品名称</th>
                    <th>产品高度</th>
                    <th>单价(元)/件</th>
                    <th>单价(美元)/件</th>
                    <th>零售数量/件</th>
                    <th>每件数量/支</th>
@@ -714,7 +709,6 @@
                    <td>{{ item.productCategory || '' }}</td>
                    <td>{{ item.specificationModel || '' }}{{ item.unit || '' }}</td>
                    <td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
                    <td>{{ item.dollarPrice || '0' }}</td>
                    <td>{{ item.inboundNum || '0' }}</td>
                    <td>{{ item.boxNum || '0' }}</td>
                    <td>{{ item.cartonSpecifications || '0' }}</td>
src/views/inventoryManagement/issueManagement/index.vue
@@ -92,7 +92,6 @@
                        <el-table-column label="每件数量/支" prop="boxNum" width="100" show-overflow-tooltip />
            <el-table-column label="剩余库存" prop="inboundNum0" width="90" show-overflow-tooltip />
                        <el-table-column label="单价(元)/件" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                        <el-table-column label="单价(美元)/件" prop="dollarPrice" width="150"></el-table-column>
            <el-table-column label="纸箱规格" prop="cartonSpecifications" width="150"></el-table-column>
            <el-table-column label="入库人" prop="createBy" width="80" show-overflow-tooltip />
           <el-table-column fixed="right" label="操作" min-width="60" align="center">
@@ -156,8 +155,7 @@
                        <el-table-column label="入库数量/件" prop="inboundNum" width="100" show-overflow-tooltip />
                        <el-table-column label="每件数量/支" prop="boxNum" width="100" show-overflow-tooltip />
            <el-table-column label="剩余库存" prop="inboundNum0" width="90" show-overflow-tooltip />
                        <el-table-column label="单价(元)/件" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                        <el-table-column label="单价(美元)/件" prop="dollarPrice" width="150"></el-table-column>
                        <el-table-column label="单价(美元)/件" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
            <el-table-column label="纸箱规格" prop="cartonSpecifications" width="150"></el-table-column>
            <el-table-column label="入库人" prop="createBy" width="150" show-overflow-tooltip />
            <el-table-column fixed="right" label="操作" width="100" align="center">
src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
@@ -44,33 +44,11 @@
            <el-input v-model="scope.row.specificationModel" placeholder="请输入产品高度" />
          </template>
        </el-table-column>
        <el-table-column label="高度单位" prop="unit" width="100">
          <template #default="scope">
            <el-input v-model="scope.row.unit" placeholder="请输入高度单位" />
          </template>
        </el-table-column>
        <el-table-column label="纸箱规格" prop="cartonSpecifications" width="200">
          <template #default="scope">
            <el-input v-model="scope.row.cartonSpecifications" placeholder="请输入纸箱规格" />
          </template>
        </el-table-column>
        <!-- <el-table-column label="供应商" prop="supplierName" width="200">
          <template #default="scope">
            <el-input v-model="scope.row.supplierName" placeholder="请输入供应商" />
          </template>
        </el-table-column> -->
        <!-- <el-table-column label="物品类型" prop="itemType" width="150">
          <template #default="scope">
            <el-select v-model="scope.row.itemType" filterable allow-create placeholder="请选择物品类型" style="width: 100%">
              <el-option
                v-for="item in itemTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </template>
        </el-table-column> -->
        <el-table-column label="入库数量-件" prop="inboundNum" width="150">
          <template #default="scope">
            <el-input-number :step="1" :min="0" style="width: 100%" v-model="scope.row.inboundNum" @change="() => calculateTotalPrice(scope.row)" />
@@ -209,7 +187,6 @@
    productCategory: '',
    specificationModel: '',
    cartonSpecifications:'',
    unit: '',
    supplierName: form.value.supplierName || '',
    itemType: '',
    inboundNum: 0,
@@ -256,7 +233,7 @@
    // 验证自定义添加的数据必填字段
    for (let i = 0; i < productList.value.length; i++) {
      const product = productList.value[i];
      if (!product.productCategory || !product.specificationModel || !product.unit) {
      if (!product.productCategory || !product.specificationModel) {
        proxy.$modal.msgError(`第${i + 1}行产品数据未填写完整(产品、产品高度、高度单位为必填)`)
        return
      }
@@ -299,7 +276,6 @@
            inboundNum: Number(product.inboundNum),
      productCategory: product.productCategory,
      specificationModel: product.specificationModel,
      unit: product.unit,
      supplierName: product.supplierName || form.value.supplierName,
      itemType: product.itemType,
      inboundDate: formatDateTime(product.inboundDate, false),
@@ -394,7 +370,6 @@
      id: row?.id ?? null,
      productCategory: row?.productCategory ?? '',
      specificationModel: row?.specificationModel ?? '',
      unit: row?.unit ?? '',
      supplierName: row?.supplierName ?? '',
      itemType: row?.itemType ?? '',
      inboundNum: Number(row?.inboundNum ?? row?.inboundQuantity ?? 0),
src/views/inventoryManagement/stockManagement/index.vue
@@ -57,9 +57,6 @@
      <el-tab-pane label="采购库存" name="purchase">
        <div class="search_form">
          <div>
            <span class="search_title ml10">入库日期:</span>
            <el-date-picker v-model="searchForm.timeStr" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD"
              format="YYYY-MM-DD" clearable @change="handleQuery" />
            <span class="search_title ml10">产品名称:</span>
            <el-input v-model="searchForm.productCategory" style="width: 240px" placeholder="请输入" clearable />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
@@ -74,7 +71,6 @@
            :row-class-name="tableRowClassName" :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
            <el-table-column align="center" type="selection" width="55" />
            <el-table-column align="center" label="序号" type="index" width="60" />
            <el-table-column label="入库时间" prop="createTime" width="100" show-overflow-tooltip />
            <el-table-column label="产品名称" prop="productCategory" show-overflow-tooltip />
            <el-table-column label="产品高度" prop="specificationModel" width="100" show-overflow-tooltip>
              <template #default="scope">
@@ -84,7 +80,6 @@
            <el-table-column label="每件数量/支" prop="boxNum" width="100" show-overflow-tooltip />
            <el-table-column label="入库数量" prop="inboundNum" width="100" show-overflow-tooltip />
            <el-table-column label="单价(元)/件" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
            <el-table-column label="单价(美元)/件" prop="dollarPrice" width="150"></el-table-column>
            <el-table-column label="已出库数量" prop="totalInboundNum" width="100" show-overflow-tooltip />
            <el-table-column label="剩余库存" prop="inboundNum0" width="100" show-overflow-tooltip />
            <el-table-column label="纸箱规格" prop="cartonSpecifications" width="150"></el-table-column>
@@ -100,9 +95,6 @@
            <!--            <span class="search_title">供应商名称:</span>-->
            <!--            <el-input v-model="searchForm.supplierName" style="width: 240px" placeholder="请输入" @change="handleQuery"-->
            <!--              clearable prefix-icon="Search" />-->
            <span class="search_title ml10">入库日期:</span>
            <el-date-picker v-model="searchForm.timeStr" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD"
              format="YYYY-MM-DD" clearable @change="handleQuery" />
            <span class="search_title ml10">产品名称:</span>
            <el-input v-model="searchForm.productCategory" style="width: 240px" placeholder="请输入" clearable />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
@@ -123,15 +115,13 @@
                <img class="barcode-img" :src="javaApiUrl + scope.row.url"></img>
              </template>
            </el-table-column>
            <el-table-column label="入库时间" prop="inboundDate" width="100" show-overflow-tooltip />
            <el-table-column label="产品名称" prop="productCategory" show-overflow-tooltip />
            <el-table-column label="产品高度" prop="specificationModel" width="100" show-overflow-tooltip>
              <template #default="scope">
                <div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
              </template>
            </el-table-column>
            <el-table-column label="单价(元)/件" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
            <el-table-column label="单价(美元)/件" prop="dollarPrice" width="150"></el-table-column>
            <el-table-column label="单价(美元)/件" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
            <el-table-column label="每件数量/支" prop="boxNum" width="100" show-overflow-tooltip />
            <el-table-column label="入库数量" prop="inboundNum" width="100" show-overflow-tooltip />
            <el-table-column label="已出库数量" prop="totalInboundNum" width="100" show-overflow-tooltip />
@@ -262,7 +252,6 @@
    // supplierName: '',
    productCategory: '',
    customerName: '',
    timeStr: getCurrentDate(),
  },
  form: {
    supplierId: null,
@@ -320,7 +309,6 @@
const buildQueryParams = () => {
  const params = {
    ...page,
    timeStr: searchForm.value.timeStr,
  }
  params.productCategory = searchForm.value.productCategory
  if (activeTab.value === 'production') {
@@ -384,7 +372,6 @@
  page.current = 1
  // searchForm.value.supplierName = ''
  searchForm.value.customerName = ''
  searchForm.value.timeStr = getCurrentDate() // 重置为当前日期
  selectedRows.value = []
  searchForm.value.productCategory = ''
  getList()
src/views/salesManagement/salesLedger/index.vue
@@ -57,8 +57,8 @@
              <el-table-column label="单价(美元)/件" prop="taxInclusiveUnitPrice" :formatter="formattedNumber"></el-table-column>
              <el-table-column label="税率(%)" prop="taxRate" />
              <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
              <el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
              <el-table-column label="含税总价(美元)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
              <el-table-column label="不含税总价(美元)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
            </el-table>
          </template>
        </el-table-column>
@@ -273,12 +273,12 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="含税总价(元):" prop="taxInclusiveTotalPrice">
            <el-form-item label="含税总价(美元):" prop="taxInclusiveTotalPrice">
              <el-input v-model="productForm.taxInclusiveTotalPrice" placeholder="请输入" clearable @change="calculateFromTotalPrice" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="不含税总价(元):" prop="taxExclusiveTotalPrice">
            <el-form-item label="不含税总价(美元):" prop="taxExclusiveTotalPrice">
              <el-input v-model="productForm.taxExclusiveTotalPrice" placeholder="请输入" clearable @change="calculateFromExclusiveTotalPrice" />
            </el-form-item>
          </el-col>