Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventor...

yyb

6 小时以前 80adf052e0b58abd634ca9b67f8569ccc468c430

 src/views/productionManagement/productionReporting/index.vue

@@ -11,11 +11,19 @@
                    @keyup.enter="handleQuery" />
        </el-form-item>
        <el-form-item label="班组:">
          <el-input v-model="searchForm.teamName"
                    placeholder="请输入"
                    clearable
                    style="width: 160px;"
                    @keyup.enter="handleQuery" />
          <el-select v-model="searchForm.teamName"
                     placeholder="请选择"
                     clearable
                     style="width: 160px;"
                     @keyup.enter="handleQuery">
            <el-option label="白班"
                       value="白班" />
            <el-option label="夜班"
                       value="夜班" />
          </el-select>
          <!-- <el-input v-model="searchForm.teamName"
                    placeholder="请输入""
                    @keyup.enter="handleQuery" /> -->
        </el-form-item>
        <el-form-item label="产品名称:">
          <el-input v-model="searchForm.productName"
@@ -57,14 +65,12 @@
        </template>
      </PIMTable>
    </div>
    <ReportingDialog v-model:visible="dialogVisible"
                     :data="form"
                     @completed="handleQuery" />
  </div>
</template>

<script setup>
  import { onMounted, ref, reactive, getCurrentInstance } from "vue";
  import { useRouter } from "vue-router";
  import { ElMessage, ElMessageBox } from "element-plus";
  import dayjs from "dayjs";
  import {
@@ -74,21 +80,23 @@
    productionReportDelete,
  } from "@/api/productionManagement/productionReporting.js";
  import PIMTable from "@/components/PIMTable/PIMTable.vue";
  import ReportingDialog from "./components/ReportingDialog.vue";

  const router = useRouter();
  const { proxy } = getCurrentInstance();

  const tableColumn = ref([
    {
      label: "生产订单号",
      prop: "orderNo",
      width: "150px",
    },
    {
      label: "班组",
      prop: "teamName",
      width: "120px",
      dataType: "tag",
      formatType: params => {
        return params === "白班" ? "primary" : "warning";
      },
    },
    {
      label: "产品编码",
@@ -191,7 +199,7 @@
    {
      id: 1,
      orderNo: "PO202401001",
      teamName: "生产一组",
      teamName: "白班",
      materialCode: "PC001",
      productName: "标准砌块",
      specification: "600×240×200",
@@ -204,7 +212,7 @@
    {
      id: 2,
      orderNo: "PO202401002",
      teamName: "生产二组",
      teamName: "夜班",
      materialCode: "PC002",
      productName: "标准砌块",
      specification: "600×240×200",
@@ -217,7 +225,7 @@
    {
      id: 3,
      orderNo: "PO202401003",
      teamName: "生产三组",
      teamName: "白班",
      materialCode: "PC003",
      productName: "加气砌块",
      specification: "600×240×250",
@@ -230,7 +238,7 @@
    {
      id: 4,
      orderNo: "PO202401004",
      teamName: "生产一组",
      teamName: "白班",
      materialCode: "PC004",
      productName: "标准砌块",
      specification: "600×240×200",
@@ -243,7 +251,7 @@
    {
      id: 5,
      orderNo: "PO202401005",
      teamName: "生产二组",
      teamName: "夜班",
      materialCode: "PC005",
      productName: "加气砌块",
      specification: "600×240×250",
@@ -256,7 +264,7 @@
    {
      id: 6,
      orderNo: "PO202401006",
      teamName: "生产三组",
      teamName: "白班",
      materialCode: "PC006",
      productName: "标准砌块",
      specification: "600×240×200",
@@ -269,7 +277,7 @@
    {
      id: 7,
      orderNo: "PO202401007",
      teamName: "生产一组",
      teamName: "白班",
      materialCode: "PC007",
      productName: "加气砌块",
      specification: "600×240×250",
@@ -282,7 +290,7 @@
    {
      id: 8,
      orderNo: "PO202401008",
      teamName: "生产二组",
      teamName: "夜班",
      materialCode: "PC008",
      productName: "标准砌块",
      specification: "600×240×200",
@@ -295,7 +303,7 @@
    {
      id: 9,
      orderNo: "PO202401009",
      teamName: "生产三组",
      teamName: "白班",
      materialCode: "PC009",
      productName: "加气砌块",
      specification: "600×240×250",
@@ -308,7 +316,7 @@
    {
      id: 10,
      orderNo: "PO202401010",
      teamName: "生产一组",
      teamName: "白班",
      materialCode: "PC010",
      productName: "标准砌块",
      specification: "600×240×200",
@@ -320,7 +328,6 @@
    },
  ];

  const dialogVisible = ref(false);
  const form = reactive({
    id: undefined,
    orderId: "",
@@ -387,7 +394,10 @@
      processId: "",
      params: {},
    });
    dialogVisible.value = true;
    router.push({
      path: "/productionManagement/ReportingDialog",
      query: { data: JSON.stringify(form) },
    });
  };

  const handleEdit = row => {
@@ -407,7 +417,10 @@
      processId: row.processId || "",
      params: row.params || {},
    });
    dialogVisible.value = true;
    router.push({
      path: "/productionManagement/ReportingDialog",
      query: { data: JSON.stringify(form) },
    });
  };

  const handleDetail = row => {