Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventor...

chenhj

5 天以前 e61eb3be4fc933c67cbe3a1a9d08d41ac2d26a1b

 src/views/productionManagement/productionReporting/index.vue

@@ -9,7 +9,7 @@
                    clearable
                    prefix-icon="Search"
                    style="width: 200px;"
                    @change="handleQuery" />
                    @change="handleQuery"/>
        </el-form-item>
        <el-form-item label="工单号:">
          <el-input v-model="searchForm.workOrderNo"
@@ -17,11 +17,12 @@
                    clearable
                    prefix-icon="Search"
                    style="width: 200px;"
                    @change="handleQuery" />
                    @change="handleQuery"/>
        </el-form-item>
        <el-form-item>
          <el-button type="primary"
                     @click="handleQuery">搜索</el-button>
                     @click="handleQuery">搜索
          </el-button>
        </el-form-item>
      </el-form>
    </div>
@@ -43,6 +44,27 @@
                :tableLoading="tableLoading"
                @pagination="pagination"
                :total="page.total">
        <template #productNoSlot="{ row }">
          <el-button
              v-if="row.process ==='印铜' || row.process ==='印银'"
              type="primary"
              link
              @click="openDetail(row)"
          >
            {{ row.productNo }}
          </el-button>
          <el-button
              v-else
              type="primary"
              link
              @click="(row) => {
                currentReportRowData = row
                showDetail = true
              }"
          >
            {{ row.productNo }}
          </el-button>
        </template>
        <template #expand="{ row }">
          <el-table :data="expandData"
                    border
@@ -52,7 +74,7 @@
            <el-table-column align="center"
                             label="序号"
                             type="index"
                             width="60" />
                             width="60"/>
            <el-table-column label="本次生产数量"
                             prop="finishedNum"
                             align="center"
@@ -66,7 +88,7 @@
                                 :precision="2"
                                 placeholder="请输入"
                                 clearable
                                 @change="changeNum(scope.row)" />
                                 @change="changeNum(scope.row)"/>
              </template>
            </el-table-column>
            <!--                  <el-table-column label="待生产数量" prop="pendingNum" width="240" align="center"></el-table-column>-->
@@ -81,7 +103,7 @@
                  <el-option v-for="user in userList"
                             :key="user.userId"
                             :label="user.nickName"
                             :value="user.userId" />
                             :value="user.userId"/>
                </el-select>
              </template>
            </el-table-column>
@@ -96,23 +118,25 @@
                                value-format="YYYY-MM-DD"
                                format="YYYY-MM-DD"
                                clearable
                                style="width: 100%" />
                                style="width: 100%"/>
              </template>
            </el-table-column>
            <el-table-column label="操作"
                             >
            >
              <template #default="scope">
                <el-button link
                           type="primary"
                           size="small"
                           @click="changeEditType(scope.row)"
                           v-if="!scope.row.editType"
                           :disabled="scope.row.parentStatus === 3">编辑</el-button>
                           :disabled="scope.row.parentStatus === 3">编辑
                </el-button>
                <el-button link
                           type="primary"
                           size="small"
                           @click="saveReceiptPayment(scope.row)"
                           v-if="scope.row.editType">保存</el-button>
                           v-if="scope.row.editType">保存
                </el-button>
              </template>
            </el-table-column>
          </el-table>
@@ -123,298 +147,321 @@
              @close="handleQuery"></form-dia>
    <input-modal v-if="isShowInput"
                 v-model:visible="isShowInput"
                 :production-product-main-id="isShowingId" />
                 :production-product-main-id="isShowingId"/>
    <CopperPrintingForm
        v-if="copperPrintingFormVisible"
        v-model:isShow="copperPrintingFormVisible"
        :isEdit="false"
        :row="currentReportRowData"
        @refreshData="getList"/>
    <Detail
        v-if="showDetail"
        v-model:isShow="showDetail"
        :row="currentReportRowData"/>
  </div>
</template>

<script setup>
  import { onMounted, ref } from "vue";
  import FormDia from "@/views/productionManagement/productionReporting/components/formDia.vue";
  import { ElMessageBox } from "element-plus";
  import {
    productionReportUpdate,
    workListPageById,
    productionReportDelete,
  } from "@/api/productionManagement/productionReporting.js";
  import { productionProductMainListPage } from "@/api/productionManagement/productionProductMain.js";
  import { userListNoPageByTenantId } from "@/api/system/user.js";
  import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
import {onMounted, ref} from "vue";
import FormDia from "@/views/productionManagement/productionReporting/components/formDia.vue";
import {ElMessageBox} from "element-plus";
import {
  productionReportUpdate,
  workListPageById,
  productionReportDelete,
} from "@/api/productionManagement/productionReporting.js";
import {productionProductMainListPage} from "@/api/productionManagement/productionProductMain.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import InputModal from "@/views/productionManagement/productionReporting/Input.vue";

  const data = reactive({
    searchForm: {
      nickName: "",
      workOrderNo: "",
      workOrderStatus: "",
    },
  });
  const { searchForm } = toRefs(data);
  const expandedRowKeys = ref([]);
  const expandData = ref([]);
  const userList = ref([]);
  const tableColumn = ref([
    {
      label: "报工单号",
      prop: "productNo",
      width: 120,
    },
    {
      label: "报工人员",
      prop: "nickName",
      width: 120,
    },
    {
      label: "工序",
      prop: "process",
      width: 120,
    },
    {
      label: "工单编号",
      prop: "workOrderNo",
      width: 120,
    },
    {
      label: "销售合同号",
      prop: "salesContractNo",
      width: 120,
    },
    {
      label: "产品名称",
      prop: "productName",
      width: 120,
    },
    {
      label: "产品规格型号",
      prop: "productModelName",
      width: 120,
    },
    {
      label: "产出数量",
      prop: "quantity",
      width: 120,
    },
    {
      label: "报废数量",
      prop: "scrapQty",
      width: 120,
    },
    {
      label: "单位",
      prop: "unit",
      width: 120,
    },
    
    {
      label: "创建时间",
      prop: "createTime",
      width: 120,
    },
    {
      dataType: "action",
      label: "操作",
      align: "center",
      fixed: "right",
      operation: [
        {
          name: "查看投入",
          type: "text",
          clickFun: row => {
            showInput(row);
          },
        },
        {
          name: "删除",
          type: "danger",
          clickFun: row => {
            deleteReport(row);
          },
        },
      ],
    },
  ]);
  const tableData = ref([]);
  const selectedRows = ref([]);
  const tableLoading = ref(false);
  const childrenLoading = ref(false);
  const page = reactive({
    current: 1,
    size: 100,
    total: 0,
  });
  const formDia = ref();
  const { proxy } = getCurrentInstance();
const CopperPrintingForm = defineAsyncComponent(() => import("@/views/productionManagement/workOrder/components/CopperPrintingForm.vue"));
const Detail = defineAsyncComponent(() => import("@/views/productionManagement/productionReporting/components/Detail.vue"));

  // 查询列表
  /** 搜索按钮操作 */
  const handleQuery = () => {
    page.current = 1;
    getList();
  };
  const changeDaterange = value => {
    if (value) {
      searchForm.value.entryDateStart = value[0];
      searchForm.value.entryDateEnd = value[1];
    } else {
      searchForm.value.entryDateStart = undefined;
      searchForm.value.entryDateEnd = undefined;
    }
    handleQuery();
  };
  const deleteReport = row => {
    ElMessageBox.confirm("确定删除该报工吗？", "提示", {
      confirmButtonText: "确定",
      cancelButtonText: "取消",
      type: "warning",
    }).then(() => {
      productionReportDelete({ id: row.id }).then(res => {
        if (res.code === 200) {
          proxy.$modal.msgSuccess("删除成功");
          getList();
        } else {
          ElMessageBox.alert(res.msg || "删除失败", "提示", {
            confirmButtonText: "确定",
          });
        }
      });

const data = reactive({
  searchForm: {
    nickName: "",
    workOrderNo: "",
    workOrderStatus: "",
  },
});
const {searchForm} = toRefs(data);
const expandedRowKeys = ref([]);
const expandData = ref([]);
const userList = ref([]);
const tableColumn = ref([
  {
    label: "报工单号",
    prop: "productNo",
    width: 120,
    dataType: 'slot',
    slot: 'productNoSlot',
  },
  {
    label: "报工人员",
    prop: "nickName",
    width: 120,
  },
  {
    label: "工序",
    prop: "process",
    width: 120,
  },
  {
    label: "工单编号",
    prop: "workOrderNo",
    width: 120,
  },
  {
    label: "销售合同号",
    prop: "salesContractNo",
    width: 120,
  },
  {
    label: "产品名称",
    prop: "productName",
    width: 120,
  },
  {
    label: "产品规格型号",
    prop: "productModelName",
    width: 120,
  },
  {
    label: "产出数量",
    prop: "quantity",
    width: 120,
  },
  {
    label: "报废数量",
    prop: "scrapQty",
    width: 120,
  },
  {
    label: "单位",
    prop: "unit",
    width: 120,
  },

  {
    label: "创建时间",
    prop: "createTime",
    width: 120,
  },
  {
    dataType: "action",
    label: "操作",
    align: "center",
    fixed: "right",
    operation: [
      {
        name: "查看投入",
        type: "text",
        clickFun: row => {
          showInput(row);
        },
      },
      {
        name: "删除",
        type: "danger",
        clickFun: row => {
          deleteReport(row);
        },
      },
    ],
  },
]);
const currentReportRowData = ref({});
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
const childrenLoading = ref(false);
const page = reactive({
  current: 1,
  size: 100,
  total: 0,
});
const formDia = ref();
const {proxy} = getCurrentInstance();

// 查询列表
/** 搜索按钮操作 */
const handleQuery = () => {
  page.current = 1;
  getList();
};
const changeDaterange = value => {
  if (value) {
    searchForm.value.entryDateStart = value[0];
    searchForm.value.entryDateEnd = value[1];
  } else {
    searchForm.value.entryDateStart = undefined;
    searchForm.value.entryDateEnd = undefined;
  }
  handleQuery();
};
const deleteReport = row => {
  ElMessageBox.confirm("确定删除该报工吗？", "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  }).then(() => {
    productionReportDelete({id: row.id}).then(res => {
      if (res.code === 200) {
        proxy.$modal.msgSuccess("删除成功");
        getList();
      } else {
        ElMessageBox.alert(res.msg || "删除失败", "提示", {
          confirmButtonText: "确定",
        });
      }
    });
  };
  const pagination = obj => {
    page.current = obj.page;
    page.size = obj.limit;
    getList();
  };
  const getList = () => {
    tableLoading.value = true;
    const params = { ...searchForm.value, ...page };
    params.entryDate = undefined;
    expandedRowKeys.value = [];
    productionProductMainListPage(params)
  });
};
const pagination = obj => {
  page.current = obj.page;
  page.size = obj.limit;
  getList();
};
const getList = () => {
  tableLoading.value = true;
  const params = {...searchForm.value, ...page};
  params.entryDate = undefined;
  expandedRowKeys.value = [];
  productionProductMainListPage(params)
      .then(res => {
        tableLoading.value = false;
        tableData.value = res.data.records.map(item => ({
          ...item,
          pendingFinishNum:
            (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0),
              (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0),
        }));
        page.total = res.data.total;
      })
      .catch(err => {
        tableLoading.value = false;
      });
  };
  // 展开行
  const expandChange = (row, expandedRows) => {
    userListNoPageByTenantId().then(res => {
      userList.value = res.data;
    });
    if (expandedRows.length > 0) {
      nextTick(() => {
        expandedRowKeys.value = [];
        try {
          childrenLoading.value = true;
          workListPageById({ id: row.id }).then(res => {
            childrenLoading.value = false;
            const index = tableData.value.findIndex(item => item.id === row.id);
            if (index > -1) {
              expandData.value = res.data.map(item => ({
                ...item,
                pendingNum:
};
// 展开行
const expandChange = (row, expandedRows) => {
  userListNoPageByTenantId().then(res => {
    userList.value = res.data;
  });
  if (expandedRows.length > 0) {
    nextTick(() => {
      expandedRowKeys.value = [];
      try {
        childrenLoading.value = true;
        workListPageById({id: row.id}).then(res => {
          childrenLoading.value = false;
          const index = tableData.value.findIndex(item => item.id === row.id);
          if (index > -1) {
            expandData.value = res.data.map(item => ({
              ...item,
              pendingNum:
                  (Number(item.schedulingNum) || 0) -
                  (Number(item.finishedNum) || 0),
                parentStatus: row.status, // 新增父表状态
              }));
            }
            expandedRowKeys.value.push(row.id);
          });
        } catch (error) {
          childrenLoading.value = false;
          console.log(error);
        }
      });
    } else {
      expandedRowKeys.value = [];
    }
  };
  const changeNum = row => {
    // 找到父表格数据
    const parentRow = tableData.value.find(
              parentStatus: row.status, // 新增父表状态
            }));
          }
          expandedRowKeys.value.push(row.id);
        });
      } catch (error) {
        childrenLoading.value = false;
        console.log(error);
      }
    });
  } else {
    expandedRowKeys.value = [];
  }
};
const changeNum = row => {
  // 找到父表格数据
  const parentRow = tableData.value.find(
      item => item.id === expandedRowKeys.value[0]
    );
    // 计算所有子表格 finishedNum 的总和
    const totalFinishedNum = expandData.value.reduce(
  );
  // 计算所有子表格 finishedNum 的总和
  const totalFinishedNum = expandData.value.reduce(
      (sum, item) => sum + (Number(item.finishedNum) || 0),
      0
    );
    // 父表格的排产数量
    const schedulingNum = parentRow ? Number(parentRow.schedulingNum) : 0;
  );
  // 父表格的排产数量
  const schedulingNum = parentRow ? Number(parentRow.schedulingNum) : 0;

    if (totalFinishedNum > schedulingNum) {
      // 回退本次输入
      row.finishedNum =
  if (totalFinishedNum > schedulingNum) {
    // 回退本次输入
    row.finishedNum =
        schedulingNum - (totalFinishedNum - Number(row.finishedNum));
      proxy.$modal.msgWarning("所有本次生产数量之和不可大于排产数量");
    }
    row.pendingNum = row.schedulingNum - row.finishedNum;
  };
  // 编辑修改状态
  const changeEditType = row => {
    proxy.$modal.msgWarning("所有本次生产数量之和不可大于排产数量");
  }
  row.pendingNum = row.schedulingNum - row.finishedNum;
};
// 编辑修改状态
const changeEditType = row => {
  row.editType = !row.editType;
};
// 保存记录
const saveReceiptPayment = row => {
  productionReportUpdate(row).then(res => {
    row.editType = !row.editType;
  };
  // 保存记录
  const saveReceiptPayment = row => {
    productionReportUpdate(row).then(res => {
      row.editType = !row.editType;
      getList();
      proxy.$modal.msgSuccess("提交成功");
    });
  };
  // 表格选择数据
  const handleSelectionChange = selection => {
    selectedRows.value = selection;
  };
  const summarizeMainTable = param => {
    return proxy.summarizeTable(param, ["finishedNum"]);
  };
  // 打开弹框
  const openForm = (type, row) => {
    if (selectedRows.value.length !== 1) {
      proxy.$message.error("请选择一条数据");
      return;
    }
    if (selectedRows.value[0].pendingFinishNum == 0) {
      proxy.$message.warning("无需再报工");
      return;
    }
    nextTick(() => {
      const rowInfo = type === "add" ? selectedRows.value[0] : row;
      formDia.value?.openDialog(type, rowInfo);
    });
  };
    getList();
    proxy.$modal.msgSuccess("提交成功");
  });
};
// 表格选择数据
const handleSelectionChange = selection => {
  selectedRows.value = selection;
};
const summarizeMainTable = param => {
  return proxy.summarizeTable(param, ["finishedNum"]);
};
// 打开弹框
const openForm = (type, row) => {
  if (selectedRows.value.length !== 1) {
    proxy.$message.error("请选择一条数据");
    return;
  }
  if (selectedRows.value[0].pendingFinishNum == 0) {
    proxy.$message.warning("无需再报工");
    return;
  }
  nextTick(() => {
    const rowInfo = type === "add" ? selectedRows.value[0] : row;
    formDia.value?.openDialog(type, rowInfo);
  });
};

  // 打开投入模态框
  const isShowInput = ref(false);
  const isShowingId = ref(0);
  const showInput = row => {
    isShowInput.value = true;
    isShowingId.value = row.id;
  };
// 打开投入模态框
const isShowInput = ref(false);
const copperPrintingFormVisible = ref(false);
const showDetail = ref(false);
const isShowingId = ref(0);
const showInput = row => {
  isShowInput.value = true;
  isShowingId.value = row.id;
};

  // 导出
  const handleOut = () => {
    ElMessageBox.confirm("选中的内容将被导出，是否确认导出？", "导出", {
      confirmButtonText: "确认",
      cancelButtonText: "取消",
      type: "warning",
    })
// 导出
const handleOut = () => {
  ElMessageBox.confirm("选中的内容将被导出，是否确认导出？", "导出", {
    confirmButtonText: "确认",
    cancelButtonText: "取消",
    type: "warning",
  })
      .then(() => {
        proxy.download("/productionProductMain/export", {}, "生产报工.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
      });
  };
  onMounted(() => {
    getList();
  });
};
const openDetail = row => {
  currentReportRowData.value = row;
  copperPrintingFormVisible.value = true;
};
onMounted(() => {
  getList();
});
</script>

<style scoped></style>