Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-04-21 1c15ef9287dced4bbde0c5e88b91eec2d375382c

Merge remote-tracking branch 'origin/dev' into dev

 src/api/basicData/processCapacityManagement/processCapacityManagement.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
import request from '@/utils/request'

// æŸ¥è¯¢å·¥åºçº§äº§èƒ½æ•°æ®ç®¡ç†åˆ—表
export function listProcessCapacityManagement(query) {
  return request({
    url: '/aps/processCapacityManagement/list',
    method: 'get',
    params: query
  })
}

// æŸ¥è¯¢å·¥åºçº§äº§èƒ½æ•°æ®ç®¡ç†è¯¦ç»†
export function getProcessCapacityManagement(id) {
  return request({
    url: '/processCapacityManagement/processCapacityManagement/' + id,
    method: 'get'
  })
}

// æ–°å¢žå·¥åºçº§äº§èƒ½æ•°æ®ç®¡ç†
export function addProcessCapacityManagement(data) {
  return request({
    url: '/processCapacityManagement/processCapacityManagement',
    method: 'post',
    data: data
  })
}

// ä¿®æ”¹å·¥åºçº§äº§èƒ½æ•°æ®ç®¡ç†
export function updateProcessCapacityManagement(data) {
  return request({
    url: '/processCapacityManagement/processCapacityManagement',
    method: 'put',
    data: data
  })
}

// åˆ é™¤å·¥åºçº§äº§èƒ½æ•°æ®ç®¡ç†
export function delProcessCapacityManagement(id) {
  return request({
    url: '/processCapacityManagement/processCapacityManagement/' + id,
    method: 'delete'
  })
}

 src/api/basicData/professionalFixedCycleManagement/professionalFixedCycleManagement.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
import request from '@/utils/request'

// æŸ¥è¯¢ä¸“业固定周期管理列表
export function listProfessionalFixedCycleManagement(query) {
  return request({
    url: '/aps/professionalFixedCycleManagement/list',
    method: 'get',
    params: query
  })
}

// æŸ¥è¯¢ä¸“业固定周期管理详细
export function getProfessionalFixedCycleManagement(id) {
  return request({
    url: '/basicData/professionalFixedCycleManagement/' + id,
    method: 'get'
  })
}

// æ–°å¢žä¸“业固定周期管理
export function addProfessionalFixedCycleManagement(data) {
  return request({
    url: '/basicData/professionalFixedCycleManagement',
    method: 'post',
    data: data
  })
}

// ä¿®æ”¹ä¸“业固定周期管理
export function updateProfessionalFixedCycleManagement(data) {
  return request({
    url: '/basicData/professionalFixedCycleManagement',
    method: 'put',
    data: data
  })
}

// åˆ é™¤ä¸“业固定周期管理
export function delProfessionalFixedCycleManagement(id) {
  return request({
    url: '/basicData/professionalFixedCycleManagement/' + id,
    method: 'delete'
  })
}

 src/components/HxlhTable/index.vue

@@ -36,9 +36,12 @@
            <template v-slot:buttons="row">
                <slot name="buttons" v-bind="row"/>
            </template>
          <template #expandContent="{ row }">
            <vxe-grid v-bind="subGridOptions" :data="row.subList">
            </vxe-grid>
            <template #expandContent="{ row }">
              <vxe-grid v-bind="subGridOptions" :data="row.subList">
              </vxe-grid>
            </template>
            <template v-slot:status="row" >
              <slot name="status" v-bind="row"/>
          </template>
        </vxe-grid>
    </div>

 src/views/basicData/apsPlant/index.vue

@@ -67,7 +67,7 @@
          <el-input v-model="form.plantName" placeholder="请输入工厂名称" />
        </el-form-item>
        <el-form-item label="工厂编码" prop="plantCode">
          <el-input v-model="form.plantCode" placeholder="请输入工厂编码"     :disabled=disabled />
          <el-input v-model="form.plantCode" placeholder="请输入工厂编码" :disabled=disabled />
        </el-form-item>
        <el-form-item label="启用状态" prop="status">
          <el-radio-group v-model="form.status">
@@ -106,7 +106,6 @@
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const disabled = ref(false);
const data = reactive({
@@ -246,6 +245,7 @@

/** æœç´¢æŒ‰é’®æ“ä½œ */
function handleQuery() {
  page.value.current = 1;
  queryParams.value.pageNum = 1;
  getList();
}

 src/views/basicData/apsShop/index.vue

@@ -264,6 +264,7 @@

/** æœç´¢æŒ‰é’®æ“ä½œ */
function handleQuery() {
  page.value.current = 1;
  queryParams.value.pageNum = 1;
  getList();
}
@@ -419,8 +420,8 @@
});

function changePageNo(currentPage) {
  queryParams.value.pageNum = currentPage;
  page.value.current = currentPage;
  queryParams.value.pageNum = currentPage;
  getList();
}


 src/views/basicData/materialManagement/index.vue

@@ -96,7 +96,6 @@
    formatter: (({ cellValue, row, column }) => {
      if (cellValue) {
        for(let i=0;i<aps_material_status.value.length;i++){

          if(cellValue===aps_material_status.value[i].value){
            return aps_material_status.value[i].label
          }

 src/views/basicData/materialStorageManagement/index.vue

@@ -159,6 +159,7 @@
/** æœç´¢æŒ‰é’®æ“ä½œ */
function handleQuery() {
  page.value.current = 1;
  queryParams.value.pageNum = 1;
  getList();
}

@@ -233,8 +234,8 @@
}

function changePageNo(currentPage) {
  queryParams.value.pageNum = currentPage;
  page.value.current = currentPage;
  queryParams.value.pageNum = currentPage;
  getList();
}


 src/views/basicData/processCapacityManagement/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,257 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryRef" :rules="rules" :inline="true" v-show="showSearch" label-width="68px">
      <el-row :gutter="20">
        <el-col :span="6">
          <el-form-item label="料号" prop="itemNumber">
            <el-input
              v-model="queryParams.itemNumber"
              placeholder="请输入料号"
              clearable
              @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="18" style="text-align: right;">
          <el-form-item>
              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
            </el-form-item>
        </el-col>
      </el-row>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <HxlhTable
        style="width: 100%"
        :columns="columns"
        :data="processCapacityManagementList"
        :loading="loading"
        :height="height"
        :page="page"
        @on-checkbox="handleCheckboxChange"
        @changePageNo="changePageNo"
        @changePageSize="changePageSize"
    >
      <template #status="{row}" >
          <vxe-tag v-if = "row.capacityType === '0'" status="success">标准工时</vxe-tag>
          <vxe-tag v-if = "row.capacityType === '1'" status="primary">固定周期</vxe-tag>
      </template>
    </HxlhTable>
  </div>
</template>

<script setup name="ProcessCapacityManagement">
import { listProcessCapacityManagement, getProcessCapacityManagement, delProcessCapacityManagement, addProcessCapacityManagement, updateProcessCapacityManagement } from "@/api/basicData/processCapacityManagement/processCapacityManagement";
import HxlhTable from '@/components/HxlhTable'

const { proxy } = getCurrentInstance();

const processCapacityManagementList = ref([]);
const open = ref(false);
const loading = ref(false);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const title = ref("");
const height = ref(document.documentElement.clientHeight - 230 + "px;")
const { aps_capacity_type } = proxy.useDict('aps_capacity_type');//产能类型

// åˆ†é¡µå±žæ€§
const page = ref({
  total: 0,
  current: 1,
  size: 10
});

const data = reactive({
  form: {},
  queryParams: {
    pageNum: 1,
    pageSize: 10,
    itemNumber: null,
  },
  rules: {
    itemNumber: [
      { required: true, message: "料号不能为空", trigger: "blur" }
    ],
  }
});

// è¡¨æ ¼é…ç½® 
const columns = ref([
  { type: 'seq', title: '序号', width: 60 },
  {
    title: '料号',
    field: 'itemNumber',
  },
  {
    title: '产能类型',
    field: 'capacityType',
    slots: { default: 'status' },
    /* formatter: (({ cellValue, row, column }) => {
      if (cellValue) {
        for(let i=0;i<aps_capacity_type.value.length;i++){
          if(cellValue===aps_capacity_type.value[i].value){
            return aps_capacity_type.value[i].label
          }
        }
      }
      return '';
    }) */
  },
  {
    title: '工序名称',
    field: 'processName',
  },
  {
    title: '工艺路线ID',
    field: 'processRouteId',
  },
  {
    title: '工时',
    field: 'workTime',
  },
  {
    title: '生效日期',
    field: 'effectiveDate',
  },
  {
    title: '失效日期',
    field: 'expiringDate',
  },
  {
    title: '集成日期',
    field: 'integrationDate',
  },
]);

const { queryParams, form, rules } = toRefs(data);

/** æŸ¥è¯¢å·¥åºçº§äº§èƒ½æ•°æ®ç®¡ç†åˆ—表 */
function getList() {
  loading.value = true;
  listProcessCapacityManagement(queryParams.value).then(response => {
    processCapacityManagementList.value = response.rows;
    page.value.total = response.total;
    loading.value = false;
  });
}

// å–消按钮
function cancel() {
  open.value = false;
  reset();
}

// è¡¨å•é‡ç½®
function reset() {
  form.value = {
    id: null,
    itemNumber: null,
    capacityType: null,
    processNumber: null,
    processName: null,
    processRouteId: null,
    workTime: null,
    effectiveDate: null,
    expiringDate: null,
    integrationDate: null,
    createBy: null,
    createTime: null,
    updateBy: null,
    updateTime: null
  };
  proxy.resetForm("processCapacityManagementRef");
}

/** æœç´¢æŒ‰é’®æ“ä½œ */
function handleQuery() {
  proxy.$refs["queryRef"].validate(valid => {
    if (valid) {
      page.value.current = 1;
      queryParams.value.pageNum = 1;
        getList();
      }
  });
}

/** é‡ç½®æŒ‰é’®æ“ä½œ */
function resetQuery() {
  proxy.resetForm("queryRef");
  processCapacityManagementList.value = null;
  page.value.total = 0;
  page.value.current = 1;
  queryParams.value.pageNum = 1;
  // handleQuery();
}

/** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
function handleUpdate(row) {
  reset();
  const _id = row.id || ids.value
  getProcessCapacityManagement(_id).then(response => {
    form.value = response.data;
    open.value = true;
    title.value = "修改工序级产能数据管理";
  });
}

/** æäº¤æŒ‰é’® */
function submitForm() {
  proxy.$refs["processCapacityManagementRef"].validate(valid => {
    if (valid) {
      if (form.value.id != null) {
        updateProcessCapacityManagement(form.value).then(response => {
          proxy.$modal.msgSuccess("修改成功");
          open.value = false;
          getList();
        });
      } else {
        addProcessCapacityManagement(form.value).then(response => {
          proxy.$modal.msgSuccess("新增成功");
          open.value = false;
          getList();
        });
      }
    }
  });
}

/** åˆ é™¤æŒ‰é’®æ“ä½œ */
function handleDelete(row) {
  const _ids = row.id || ids.value;
  proxy.$modal.confirm('是否确认删除工序级产能数据管理编号为"' + _ids + '"的数据项？').then(function() {
    return delProcessCapacityManagement(_ids);
  }).then(() => {
    getList();
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
}

/** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
function handleExport() {
  proxy.download('processCapacityManagement/processCapacityManagement/export', {
    ...queryParams.value
  }, `processCapacityManagement_${new Date().getTime()}.xlsx`)
}

function changePageNo(currentPage) {
  page.value.current = currentPage;
  queryParams.value.pageNum = currentPage;
  getList();
}

function changePageSize(pageSize) {
  page.value.current = 1;
  queryParams.value.pageNum = 1;
  queryParams.value.pageSize = pageSize;
  getList();
}

// getList();
</script>

 src/views/basicData/professionalFixedCycleManagement/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,270 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
      <el-row :gutter="20">
        <el-col :span="6">
          <el-form-item label="料号" prop="itemNumber">
            <el-input
              v-model="queryParams.itemNumber"
              placeholder="请输入料号"
              clearable
              @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="18" style="text-align: right;">
          <el-form-item>
              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
            </el-form-item>
        </el-col>
      </el-row>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <HxlhTable
        style="width: 100%"
        :columns="columns"
        :data="professionalFixedCycleManagementList"
        :loading="loading"
        :height="height"
        :page="page"
        @changePageNo="changePageNo"
        @changePageSize="changePageSize"
    >
    </HxlhTable>

    <!-- æ·»åŠ æˆ–修改专业固定周期管理对话框 -->
    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
      <el-form ref="professionalFixedCycleManagementRef" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="料号" prop="itemNumber">
          <el-input v-model="form.itemNumber" placeholder="请输入料号" />
        </el-form-item>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">ç¡® å®š</el-button>
          <el-button @click="cancel">取 æ¶ˆ</el-button>
        </div>
      </template>
    </el-dialog>
  </div>
</template>

<script setup name="ProfessionalFixedCycleManagement">
import { listProfessionalFixedCycleManagement, getProfessionalFixedCycleManagement, delProfessionalFixedCycleManagement, addProfessionalFixedCycleManagement, updateProfessionalFixedCycleManagement } from "@/api/basicData/professionalFixedCycleManagement/professionalFixedCycleManagement";
import HxlhTable from '@/components/HxlhTable';
import axios from 'axios';
import { listAll_plant } from "@/api/basicData/plant";

const { proxy } = getCurrentInstance();

const professionalFixedCycleManagementList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const title = ref("");
const height = ref(document.documentElement.clientHeight - 230 + "px;")
const queryPlants = ref({status: 1});
const plantList = ref([]);

const data = reactive({
  form: {},
  queryParams: {
    pageNum: 1,
    pageSize: 10,
    itemNumber: null,
  },
  rules: {
  }
});

// è¡¨æ ¼é…ç½® 
const columns = ref([
  { type: 'seq', title: '序号', width: 60 },
  {
    title: '料号',
    field: 'itemNumber',
  },
  {
    title: '专业描述',
    field: 'professionalDescription',
  },
  {
    title: '专业',
    field: 'professional',
  },
  {
    title: '专业固定周期',
    field: 'professionalFixedCycle',
  },
  {
    title: '集成日期',
    field: 'integrationDate',
  },
  {
    title: '适用工厂',
    field: 'applicableFactories',
    formatter: (({ cellValue, row, column }) => {
      if (cellValue) {
        for(let i=0;i<plantList.value.length;i++){
          if(cellValue===plantList.value[i].plantCode){
            return plantList.value[i].plantName
          }
        }
      }
      return '';
    })
  },
]);

// åˆ†é¡µå±žæ€§
const page = ref({
  total: 0,
  current: 1,
  size: 10
});

const { queryParams, form, rules } = toRefs(data);

/** æŸ¥è¯¢ä¸“业固定周期管理列表 */
function getList() {
  loading.value = true;
  axios.all([
      /** æŸ¥è¯¢å·¥åŽ‚列表 */
      listAll_plant(queryPlants.value),
      listProfessionalFixedCycleManagement(queryParams.value)
    ])
    .then(axios.spread((response1, response2) => {
      plantList.value = response1.data;
      professionalFixedCycleManagementList.value = response2.rows;
      page.value.total = response2.total;
      loading.value = false;
    }))
    .catch(error => {
      console.error('请求出错:', error);
    });
}

// å–消按钮
function cancel() {
  open.value = false;
  reset();
}

// è¡¨å•é‡ç½®
function reset() {
  form.value = {
    id: null,
    itemNumber: null,
    professionalDescription: null,
    professional: null,
    professionalFixedCycle: null,
    integrationDate: null,
    applicableFactories: null,
    createBy: null,
    createTime: null,
    updateBy: null,
    updateTime: null
  };
  proxy.resetForm("professionalFixedCycleManagementRef");
}

/** æœç´¢æŒ‰é’®æ“ä½œ */
function handleQuery() {
  page.value.current = 1;
  queryParams.value.pageNum = 1;
  getList();
}

/** é‡ç½®æŒ‰é’®æ“ä½œ */
function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
}

// å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.id);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
}

/** æ–°å¢žæŒ‰é’®æ“ä½œ */
function handleAdd() {
  reset();
  open.value = true;
  title.value = "添加专业固定周期管理";
}

/** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
function handleUpdate(row) {
  reset();
  const _id = row.id || ids.value
  getProfessionalFixedCycleManagement(_id).then(response => {
    form.value = response.data;
    open.value = true;
    title.value = "修改专业固定周期管理";
  });
}

/** æäº¤æŒ‰é’® */
function submitForm() {
  proxy.$refs["professionalFixedCycleManagementRef"].validate(valid => {
    if (valid) {
      if (form.value.id != null) {
        updateProfessionalFixedCycleManagement(form.value).then(response => {
          proxy.$modal.msgSuccess("修改成功");
          open.value = false;
          getList();
        });
      } else {
        addProfessionalFixedCycleManagement(form.value).then(response => {
          proxy.$modal.msgSuccess("新增成功");
          open.value = false;
          getList();
        });
      }
    }
  });
}

/** åˆ é™¤æŒ‰é’®æ“ä½œ */
function handleDelete(row) {
  const _ids = row.id || ids.value;
  proxy.$modal.confirm('是否确认删除专业固定周期管理编号为"' + _ids + '"的数据项？').then(function() {
    return delProfessionalFixedCycleManagement(_ids);
  }).then(() => {
    getList();
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
}

/** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
function handleExport() {
  proxy.download('basicData/professionalFixedCycleManagement/export', {
    ...queryParams.value
  }, `professionalFixedCycleManagement_${new Date().getTime()}.xlsx`)
}

function changePageNo(currentPage) {
  page.value.current = currentPage;
  queryParams.value.pageNum = currentPage;
  getList();
}

function changePageSize(pageSize) {
  page.value.current = 1;
  queryParams.value.pageNum = 1;
  queryParams.value.pageSize = pageSize;
  getList();
}

getList();
</script>