gaoluyang
2 天以前 3a07f2ca675bbd3c55893f7731b8f49d854b0e07
军泰伟业
1.语法修改
已修改9个文件
105 ■■■■ 文件已修改
src/views/inventoryManagement/transportTaskManagement/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/vehicleFuelManagement/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/attendanceCheckin/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/paymentEntry/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/New.vue 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/invoiceRegistration/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/receiptPayment/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/transportTaskManagement/index.vue
@@ -681,11 +681,11 @@
  text-align: right;
}
::v-deep(.row-finished) {
:deep(.row-finished) {
  background-color: #f6ffed;
}
::v-deep(.row-running) {
:deep(.row-running) {
  background-color: #fffbe6;
}
</style>
src/views/inventoryManagement/vehicleFuelManagement/index.vue
@@ -549,7 +549,7 @@
  text-align: right;
}
::v-deep(.row-abnormal) {
:deep(.row-abnormal) {
  background-color: #fff5f5;
}
</style>
src/views/personnelManagement/attendanceCheckin/index.vue
@@ -462,7 +462,7 @@
  color: #333;
}
::v-deep(.row-abnormal) {
:deep(.row-abnormal) {
  background-color: #fff5f5;
}
</style>
src/views/procurementManagement/paymentEntry/index.vue
@@ -572,7 +572,7 @@
.table_list {
  margin-top: unset;
}
::v-deep(.el-checkbox__label) {
:deep(.el-checkbox__label) {
  font-weight: bold;
}
.empty-tip {
src/views/productionManagement/productionOrder/New.vue
@@ -100,6 +100,12 @@
          single
      />
      <!-- 用料产品选择弹窗 -->
      <ProductSelectDialog
          v-model="showMaterialProductDialog"
          @confirm="handleMaterialProductSelect"
      />
      <!-- 生产任务 -->
      <div class="section-card">
        <div class="section-header">
@@ -114,7 +120,19 @@
        <el-table-column type="index" label="序号" width="60" />
        <el-table-column label="工序名称" min-width="150">
          <template #default="{ row }">
            <el-input v-model="row.processName" placeholder="请输入工序名称" />
            <el-select
              v-model="row.processId"
              placeholder="请选择工序"
              style="width: 100%"
              @change="(val) => handleProcessChange(val, row)"
            >
              <el-option
                v-for="item in processOptions"
                :key="item.id"
                :label="item.name"
                :value="item.id"
              />
            </el-select>
          </template>
        </el-table-column>
        <el-table-column label="计划数" min-width="120">
@@ -226,6 +244,7 @@
import { Plus, Delete, Upload } from '@element-plus/icons-vue';
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {addProductOrder, listProcessRoute} from "@/api/productionManagement/productionOrder.js";
import {list as listProcess} from "@/api/productionManagement/productionProcess.js";
const props = defineProps({
  visible: {
@@ -263,6 +282,9 @@
// 用料清单列表
const materialList = ref([]);
// 工序列表
const processOptions = ref([]);
// 文件列表
const fileList = ref([]);
@@ -276,6 +298,17 @@
});
const showProductSelectDialog = ref(false);
const showMaterialProductDialog = ref(false);
// 获取工序列表
const fetchProcessOptions = () => {
  listProcess().then(res => {
    processOptions.value = res.data || [];
  });
};
// 组件挂载时获取工序列表
fetchProcessOptions();
let { proxy } = getCurrentInstance()
@@ -331,11 +364,22 @@
  })
}
// 工序选择变化处理
const handleProcessChange = (processId, row) => {
  const selectedProcess = processOptions.value.find(item => item.id === processId);
  if (selectedProcess) {
    row.processName = selectedProcess.name;
    row.processNo = selectedProcess.no;
  }
};
// 添加生产任务
const addProductionTask = () => {
  productionTaskList.value.push({
    processId: undefined,
    processName: "",
    planQuantity: 0,
    processNo: "",
    planQuantity: 1,
    reportPermission: "",
    planStartTime: "",
    planEndTime: "",
@@ -347,14 +391,26 @@
  productionTaskList.value.splice(index, 1);
};
// 添加用料
// 添加用料 - 弹出产品选择框
const addMaterialItem = () => {
  materialList.value.push({
    drawingNumber: "",
    productName: "",
    unitQuantity: 0,
    inventoryQuantity: 0,
  });
  showMaterialProductDialog.value = true;
};
// 处理用料产品选择
const handleMaterialProductSelect = (products) => {
  if (products && products.length > 0) {
    products.forEach(product => {
      materialList.value.push({
        productModelId: product.id,
        drawingNumber: product.model,
        productName: product.productName,
        unit: product.unit,
        unitQuantity: 1,
        inventoryQuantity: 0,
      });
    });
  }
  showMaterialProductDialog.value = false;
};
// 删除用料
src/views/productionManagement/productionOrder/index.vue
@@ -93,6 +93,7 @@
    <new-product-order v-if="isShowNewModal"
                         v-model:visible="isShowNewModal"
                         type="qualified"
                         @completed="handleQuery" />
  </div>
</template>
@@ -466,19 +467,19 @@
  align-items: start;
}
::v-deep .yellow {
:deep(.yellow) {
  background-color: #FAF0DE;
}
::v-deep .pink {
:deep(.pink) {
  background-color: #FAE1DE;
}
::v-deep .red {
:deep(.red) {
  background-color: #f80202;
}
::v-deep .purple{
:deep(.purple){
  background-color: #F4DEFA;
}
</style>
src/views/salesManagement/invoiceRegistration/index.vue
@@ -761,7 +761,7 @@
.justify-between {
    justify-content: space-between;
}
::v-deep(.el-checkbox__label) {
:deep(.el-checkbox__label) {
    font-weight: bold;
}
</style>
src/views/salesManagement/receiptPayment/index.vue
@@ -589,7 +589,7 @@
.table_list {
  margin-top: unset;
}
::v-deep(.el-checkbox__label) {
:deep(.el-checkbox__label) {
  font-weight: bold;
}
.actions {
src/views/salesManagement/salesLedger/index.vue
@@ -2194,19 +2194,19 @@
    margin-left: 10px;
}
::v-deep .yellow {
:deep(.yellow) {
  background-color: #FAF0DE;
}
::v-deep .pink {
:deep(.pink) {
  background-color: #FAE1DE;
}
::v-deep .red {
:deep(.red) {
  background-color: #FAE1DE;
}
::v-deep .purple{
:deep(.purple){
  background-color: #F4DEFA;
}