Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory...

liyong

12 小时以前 7e17b11ded29cecebe75870062db936f7149fff1

Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津军泰伟业

 src/views/inventoryManagement/receiptManagement/components/formDia.vue

@@ -290,7 +290,8 @@
      details: selectedRows.value.map(product => ({
        id: product.id,
        inboundQuantity: Number(product.quantityStock),
                taxInclusiveUnitPrice: Number(product.taxInclusiveUnitPrice),
                unitPrice: Number(product.taxInclusiveUnitPrice),
        taxRate: Number(product.taxRate),
                taxInclusiveTotalPrice: Number(product.taxInclusiveTotalPrice)
      })),
    };

 src/views/productionManagement/productStructure/Detail/index.vue

@@ -93,7 +93,8 @@
                  </el-form-item>
                </template>
              </el-table-column>
              <el-table-column prop="demandedQuantity"
              <el-table-column v-if="isOrderPage"
                               prop="demandedQuantity"
                               label="需求总量">
                <template #default="{ row, $index }">
                  <el-form-item :prop="`dataList.${$index}.demandedQuantity`"

 src/views/productionManagement/productionCosting/index.vue

@@ -181,7 +181,7 @@
        type: "warning",
    })
        .then(() => {
            proxy.download("/basic/customer/export", {}, "生产核算.xlsx");
            proxy.download("/salesLedger/productionAccounting/export", {}, "生产核算.xlsx");
        })
        .catch(() => {
            proxy.$modal.msg("已取消");

 src/views/productionManagement/productionOrder/index.vue

@@ -133,7 +133,7 @@
    {
      label: "工艺路线编号",
      prop: "processRouteCode",
      width: '140px',
      width: '200px',
    },
    {
      label: "需求数量",

 src/views/productionManagement/productionReporting/Input.vue

@@ -59,6 +59,10 @@
    prop: 'productNo',
  },
  {
    label: '投入产品名称',
    prop: 'productName',
  },
  {
    label: '投入产品型号',
    prop: 'model',
  },
@@ -66,6 +70,10 @@
    label: '投入数量',
    prop: 'quantity',
  },
  {
    label: '单位',
    prop: 'unit',
  },
]

const isShow = computed({

 src/views/productionManagement/productionReporting/index.vue

@@ -19,21 +19,6 @@
                    style="width: 200px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="工单状态:">
          <el-select v-model="searchForm.workOrderStatus"
                     placeholder="请选择工单状态"
                     style="width: 140px"
                     clearable>
            <el-option label="待确认"
                       :value="1"></el-option>
            <el-option label="待生产"
                       :value="2"></el-option>
            <el-option label="生产中"
                       :value="3"></el-option>
            <el-option label="已生产"
                       :value="4"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item>
          <el-button type="primary"
                     @click="handleQuery">搜索</el-button>
@@ -416,7 +401,7 @@
      type: "warning",
    })
      .then(() => {
        proxy.download("/salesLedger/work/export", {}, "生产报工.xlsx");
        proxy.download("/productionProductMain/export", {}, "生产报工.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");