1.部署修改

gaoluyang

2025-12-04 0c5b607e028bd756079cb328dd0914db2c9093f5

 src/views/productionManagement/operationScheduling/components/formDia.vue

@@ -8,11 +8,11 @@
    >
      <el-button type="primary" @click="addRow" style="margin-bottom: 10px;">新增</el-button>
         <span style="font-size: 18px;margin-left: 10px">待排产数量：{{pendingNum}}</span>
         <div style="margin-bottom: 10px; margin-left: 10px;">
            <el-form-item label="领用：" style="margin-bottom: 0;">
               <el-input v-model="receive" placeholder="请输入领用" style="width: 200px;" />
            </el-form-item>
         </div>
<!--         <div style="margin-bottom: 10px; margin-left: 10px;">-->
<!--            <el-form-item label="领用：" style="margin-bottom: 0;">-->
<!--               <el-input v-model="receive" placeholder="请输入领用" style="width: 200px;" />-->
<!--            </el-form-item>-->
<!--         </div>-->
      <el-table :data="tableData" border style="width: 100%" :summary-method="summarizeMainTable" show-summary :row-key="row => row.id">
        <el-table-column label="序号" width="60" align="center">
          <template #default="scope">
@@ -21,7 +21,20 @@
        </el-table-column>
        <el-table-column label="工序" prop="process" width="150">
          <template #default="scope">
                  <el-input v-model="scope.row.process" placeholder="请输入工序" />
                     <el-select
                        v-model="scope.row.process"
                        placeholder="选择工序"
                        style="width: 100%;"
                filterable
                clearable
                     >
                        <el-option
                           v-for="process in processList"
                           :key="process.id"
                           :label="process.name"
                           :value="process.name"
                        />
                     </el-select>
          </template>
        </el-table-column>
        <el-table-column label="单位" prop="unit" width="90">
@@ -47,12 +60,7 @@
                  />
          </template>
        </el-table-column>
      <el-table-column label="损耗" prop="loss" width="150">
          <template #default="scope">
            <el-input v-model="scope.row.loss" placeholder="请输入损耗" />
          </template>
        </el-table-column>
        <el-table-column label="工时定额" width="200" prop="workHours">
        <el-table-column label="工资" width="200" prop="workHours">
          <template #default="scope">
                  <el-input-number
                     v-model="scope.row.workHours"
@@ -76,6 +84,9 @@
                     v-model="scope.row.schedulingUserId"
                     placeholder="选择人员"
                     style="width: 100%;"
              filterable
              default-first-option
              :reserve-keyword="false"
                  >
                     <el-option
                        v-for="user in userList"
@@ -108,23 +119,26 @@
</template>

<script setup>
import {ref} from "vue";
import {ref, getCurrentInstance} from "vue";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import {processScheduling} from "@/api/productionManagement/operationScheduling.js";
import {laborConfListPage} from "@/api/lavorissce/issue.js";
const { proxy } = getCurrentInstance()
const { work_step } = proxy.useDict("work_step")
const emit = defineEmits(['close'])

const dialogFormVisible = ref(false);
const operationType = ref('')
const tableData = ref([
   { process: '', schedulingDate: '', schedulingNum: null, schedulingUserId: '', workHours: null, unit: '', remark: '', loss: '', type: '' }
]);
const tableData = ref([]);
const unitFromRow = ref('');
const idFromRow = ref('');
const pendingNum = ref('');
const specificationModelFromRow = ref('');
const pendingNum = ref(0);
const userList = ref([])
const processList = ref([])
const receive = ref('')
const productionLineIdFromRow = ref('');
const productionUserIdFromRow = ref('');

// 打开弹框
const openDialog = (type, row) => {
@@ -133,18 +147,33 @@
   userListNoPageByTenantId().then((res) => {
      userList.value = res.data;
   });
   pendingNum.value = row.pendingNum
  if (row && row.unit !== undefined) {
    unitFromRow.value = row.unit;
    idFromRow.value = row.id;
    tableData.value.forEach(item => {
      item.unit = row.unit;
      item.id = row.id;
    });
  } else {
    unitFromRow.value = '';
  }
   // 根据选中数据的productionLineId查询工序列表
   if (row?.productionLineId) {
      laborConfListPage({ id: row.productionLineId, current: -1, size: -1 }).then((res) => {
         processList.value = res.data.records || [];
      });
   }
   pendingNum.value = row?.pendingNum ?? 0;
   unitFromRow.value = row?.unit ?? '';
   idFromRow.value = row?.id ?? '';
   specificationModelFromRow.value = row?.specificationModel ?? '';
   productionLineIdFromRow.value = row?.productionLineId ?? '';
   productionUserIdFromRow.value = row?.productionUserId ?? '';
   tableData.value = [createRow()];
}

const createRow = () => ({
   id: idFromRow.value,
   process: '',
   schedulingDate: '',
   schedulingNum: null,
   schedulingUserId: '',
   workHours: null,
   unit: unitFromRow.value,
   remark: '',
   type: specificationModelFromRow.value,
});

const submitForm = () => {
   // 1. 检查每一行是否填写完整
   for (let i = 0; i < tableData.value.length; i++) {
@@ -169,11 +198,16 @@
      proxy.$modal.msgError('排产数量合计不能超过待排产数量');
      return;
   }
   // 3. 将 receive 字段添加到每条数据中
   const submitData = tableData.value.map(row => ({
      ...row,
      receive: receive.value
   }));
   // 3. 将 receive、productionLineId、productionUserId 字段添加到每条数据中，并移除 loss 字段
   const submitData = tableData.value.map(row => {
      const { loss, ...rest } = row;
      return {
         ...rest,
         receive: receive.value,
         productionLineId: productionLineIdFromRow.value,
         productionUserId: productionUserIdFromRow.value
      };
   });
   processScheduling(submitData).then((res) => {
      proxy.$modal.msgSuccess("提交成功");
      closeDia();
@@ -186,6 +220,11 @@
const closeDia = () => {
  dialogFormVisible.value = false;
  receive.value = '';
  tableData.value = [];
  unitFromRow.value = '';
  idFromRow.value = '';
  specificationModelFromRow.value = '';
  pendingNum.value = 0;
  emit('close')
};
defineExpose({
@@ -193,7 +232,7 @@
});

const addRow = () => {
  tableData.value.push({ id: idFromRow.value, process: '', unit: unitFromRow.value, schedulingNum: null, workHours: null, schedulingDate: '', schedulingUserId: '', remark: '', loss: '', type: '' });
  tableData.value.push(createRow());
};
const removeRow = (index) => {
  tableData.value.splice(index, 1);