Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

CD配唱片

2025-04-27 819772ba491d54f5857fe9b02c61d28db1f10d39

Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

 .env.development

@@ -9,5 +9,4 @@
# æ ‡è¯†æœ¬åœ°å¼€å‘服务，用于GateWay转发到本地服务
# é…åˆåŽç«¯æœåŠ¡
# VITE_APP_LOCAL = 'int'
# VITE_APP_LOCAL = 'zhl'
VITE_APP_LOCAL = 'hjy'
# VITE_APP_LOCAL = 'zhl'

 src/api/basicData/standardProcess.js

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

// æŸ¥è¯¢æ ‡å‡†å·¥åºåˆ—表
export function listStandardProcess(query) {
  return request({
    url: '/aps/standardProcess/list',
    method: 'get',
    params: query
  })
}

// æŸ¥è¯¢æ ‡å‡†å·¥åºè¯¦ç»†
export function getStandardProcess(id) {
  return request({
    url: '/aps/standardProcess/' + id,
    method: 'get'
  })
}

// æ–°å¢žæ ‡å‡†å·¥åº
export function addStandardProcess(data) {
  return request({
    url: '/aps/standardProcess',
    method: 'post',
    data: data
  })
}

// ä¿®æ”¹æ ‡å‡†å·¥åº
export function updateStandardProcess(data) {
  return request({
    url: '/aps/standardProcess',
    method: 'put',
    data: data
  })
}

// åˆ é™¤æ ‡å‡†å·¥åº
export function delStandardProcess(id) {
  return request({
    url: '/aps/standardProcess/' + id,
    method: 'delete'
  })
}

 src/views/basicData/standardProcess/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,538 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="工序编码" prop="processNumber">
        <el-input
          v-model="queryParams.processNumber"
          placeholder="请输入工序编码"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="工序名称" prop="processName">
        <el-input
          v-model="queryParams.processName"
          placeholder="请输入工序名称"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="资源组" prop="resourceGroupName">
        <el-input
          v-model="queryParams.resourceGroupName"
          placeholder="请输入资源组"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="产能模型" prop="model">
        <el-input
          v-model="queryParams.model"
          placeholder="请输入产能模型: ç‹¬å /合批"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="设计产能" prop="designCapacity">
        <el-input
          v-model="queryParams.designCapacity"
          placeholder="请输入设计产能"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="工厂" prop="plant">
        <el-input
          v-model="queryParams.plant"
          placeholder="请输入工厂"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="车间" prop="workShop">
        <el-input
          v-model="queryParams.workShop"
          placeholder="请输入车间"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="日历描述" prop="workCalender">
        <el-input
          v-model="queryParams.workCalender"
          placeholder="请输入日历描述"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <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-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="Plus"
          @click="handleAdd"
          v-hasPermi="['core:standardProcess:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="Edit"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['core:standardProcess:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="Delete"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['core:standardProcess:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
            type="info"
            plain
            icon="Upload"
            @click="handleImport"
            v-hasPermi="['aps:standardProcess:importData']"
        >导入</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="Download"
          @click="handleExport"
          v-hasPermi="['core:standardProcess:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <HxlhTable
        style="width: 100%"
        :columns="columns"
        :data="standardProcessList"
        :loading="loading"
        :height="height"
        @on-checkbox="handleCheckboxChange"
    >
    </HxlhTable>

<!-- ç”¨æˆ·å¯¼å…¥å¯¹è¯æ¡† -->
    <el-dialog :title="upload.title" v-model="upload.open" width="90%" append-to-body @close="dialogCancel">
      <el-row :gutter="10">
        <el-col>
          <div style="border-bottom: 1px solid #ccc;" >
            <p>上传Excel文件。</p>
          </div>
        </el-col>
        <el-col >
          <div></div>
        </el-col>
      </el-row>

      <el-row :gutter="10" style="margin-top: 20px;">
      </el-row>
      <el-row>
        <el-col>
          <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="true" drag>
            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
            <template #tip>
              <div class="el-upload__tip">
                <span>仅允许导入xls、xlsx格式文件。</span>
              </div>
            </template>
          </el-upload>
        </el-col>
      </el-row>
<!--      <el-row v-show="isVisible">-->
<!--        <el-col>-->
<!--          <div>-->
<!--            <h2>数据预览</h2>-->
<!--          </div>-->
<!--          <HxlhTable-->
<!--              style="width: 100%"-->
<!--              :columns="exampleColumns"-->
<!--              :data="exampleList"-->
<!--              :loading="loading"-->
<!--              :maxHeight="exampleHeight"-->
<!--              @on-checkbox="handleCheckboxChange"-->
<!--          >-->
<!--          </HxlhTable>-->
<!--        </el-col>-->
<!--        <el-col>-->
<!--          <div style="text-align: right;">-->
<!--            <h4>共上传<span style="color: blue;">{{ total }}</span>条数据</h4>-->
<!--          </div>-->
<!--        </el-col>-->
<!--      </el-row>-->
      <template #footer>
        <div class="dialog-footer">
          <el-button
              type="success"
              plain
              icon="Check"
              :disabled="planned"
              @click="uploadParse"
          >确认上传</el-button>
          <el-button @click="dialogCancel">取 æ¶ˆ</el-button>
        </div>
      </template>
    </el-dialog>

    <!-- æ·»åŠ æˆ–修改标准工序对话框 -->
    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
      <el-form ref="standardProcessRef" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="工序编码" prop="processNumber">
          <el-input v-model="form.processNumber" placeholder="请输入工序编码" />
        </el-form-item>
        <el-form-item label="工序名称" prop="processName">
          <el-input v-model="form.processName" placeholder="请输入工序名称" />
        </el-form-item>
        <el-form-item label="资源组" prop="resourceGroupName">
          <el-input v-model="form.resourceGroupName" placeholder="请输入资源组" />
        </el-form-item>
        <el-form-item label="产能模型" prop="model">
          <el-input v-model="form.model" placeholder="请输入产能模型: ç‹¬å /合批" />
        </el-form-item>
        <el-form-item label="设计产能" prop="designCapacity">
          <el-input v-model="form.designCapacity" placeholder="请输入设计产能" />
        </el-form-item>
        <el-form-item label="工厂" prop="plant">
          <el-input v-model="form.plant" placeholder="请输入工厂" />
        </el-form-item>
        <el-form-item label="车间" prop="workShop">
          <el-input v-model="form.workShop" placeholder="请输入车间" />
        </el-form-item>
<!--        <el-form-item label="日历Id" prop="workCalenderId">-->
<!--          <el-input v-model="form.workCalenderId" placeholder="请输入日历Id" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="产能模型Id" prop="modelId">-->
<!--          <el-input v-model="form.modelId" placeholder="请输入产能模型Id" />-->
<!--        </el-form-item>-->
        <el-form-item label="日历描述" prop="workCalender">
          <el-input v-model="form.workCalender" 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="StandardProcess">
import { listStandardProcess, getStandardProcess, delStandardProcess, addStandardProcess, updateStandardProcess } from "@/api/basicData/standardProcess";
import HxlhTable from "@/components/HxlhTable/index.vue";
import { getToken } from "@/utils/auth.js";
import {ref} from "vue";
import { ElMessage } from 'element-plus'

const { proxy } = getCurrentInstance();

const standardProcessList = 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 total = ref(0);
const title = ref("");
//弹窗相关
const height = ref(document.documentElement.clientHeight - 260 + "px;")
const isVisible = ref(false);
const isError = ref(false);
const planned = ref(true);
const batchNumber = ref(null);
const exampleHeight = ref("500px");
const uploadRef = ref();
const exampleList = ref([]);
const requestDate = ref(null);

/*** ç”¨æˆ·å¯¼å…¥å‚æ•° */
const upload = reactive({
  // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚（用户导入）
  open: false,
  // å¼¹å‡ºå±‚标题（用户导入）
  title: "",
  // æ˜¯å¦ç¦ç”¨ä¸Šä¼ 
  isUploading: false,
  // æ˜¯å¦æ›´æ–°å·²ç»å­˜åœ¨çš„用户数据
  updateSupport: 0,
  // è®¾ç½®ä¸Šä¼ çš„请求头部
  headers: { Authorization: "Bearer " + getToken() },
  // ä¸Šä¼ çš„地址
  url: import.meta.env.VITE_APP_BASE_API + "/aps/standardProcess/importData"
});
// è¡¨æ ¼é…ç½®-列表
const columns = ref([
  { type: 'checkbox', width: 60, align:"center"},
  { type: 'seq', title: '序号', width: 60, align: 'center' },
  {
    title: '工序编码',
    field: 'processNumber',
    width: 150,
    align:"center",
  },
  {
    title: '工序名称',
    field: 'processName',
    width: 200,
    align:"center",
  },
  {
    title: '资源组',
    field: 'resourceGroupName',
    width: 150,
    align:"center",
  },
  {
    title: '产能模型',
    field: 'model',
    width: 150,
    align:"center",
  },
  {
    title: '设计产能',
    field: 'designCapacity',
    width: 150,
    align:"center",
  },
  {
    title: '工厂',
    field: 'plant',
    width: 150,
    align:"center",
  },
  {
    title: '车间',
    field: 'workShop',
    width: 150,
    align:"center",
  },
  {
    title: '日历',
    field: 'workCalender',
    width: 150,
    align:"center",
  }
]);

const data = reactive({
  form: {},
  queryParams: {
    pageNum: 1,
    pageSize: 10,
    processNumber: null,
    processName: null,
    resourceGroupName: null,
    model: null,
    designCapacity: null,
    plantId: null,
    plant: null,
    workShopId: null,
    workShop: null,
    workCalenderId: null,
    modelId: null,
    workCalender: null
  },
  rules: {
  }
});

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

/** æŸ¥è¯¢æ ‡å‡†å·¥åºåˆ—表 */
function getList() {
  loading.value = true;
  listStandardProcess(queryParams.value).then(response => {
    standardProcessList.value = response.rows;
    total.value = response.total;
    loading.value = false;
  });
}

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

// è¡¨å•é‡ç½®
function reset() {
  form.value = {
    id: null,
    processNumber: null,
    processName: null,
    resourceGroupName: null,
    model: null,
    designCapacity: null,
    plantId: null,
    plant: null,
    workShopId: null,
    workShop: null,
    workCalenderId: null,
    delFlag: null,
    createBy: null,
    createTime: null,
    updateBy: null,
    updateTime: null,
    modelId: null,
    workCalender: null
  };
  proxy.resetForm("standardProcessRef");
}

/** æœç´¢æŒ‰é’®æ“ä½œ */
function handleQuery() {
  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
  getStandardProcess(_id).then(response => {
    form.value = response.data;
    open.value = true;
    title.value = "修改标准工序";
  });
}

/** æäº¤æŒ‰é’® */
function submitForm() {
  proxy.$refs["standardProcessRef"].validate(valid => {
    if (valid) {
      if (form.value.id != null) {
        updateStandardProcess(form.value).then(response => {
          proxy.$modal.msgSuccess("修改成功");
          open.value = false;
          getList();
        });
      } else {
        addStandardProcess(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 delStandardProcess(_ids);
  }).then(() => {
    getList();
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
}

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

/** å¯¼å…¥æŒ‰é’®æ“ä½œ */
function handleImport() {
  upload.title = "资源池数据上传";
  upload.open = true;
}

function handleCheckboxChange(){}

/** dialog取消 */
function dialogCancel(){
  if (uploadRef.value) {
    uploadRef.value.clearFiles();
  }
  requestDate.value = null;
  isVisible.value = false;
  isError.value = false;
  planned.value = true;
  upload.open = false;
  upload.isUploading = false;
}

/** ä¸Šä¼ å¹¶è§£æžæŒ‰é’®æ“ä½œ */
function uploadParse() {
  loading.value = false;
  isVisible.value = false;
  isError.value = false;
  planned.value = true;
  upload.open = false;
  requestDate.value = null;
  ElMessage({
    message: '资源池数据已成功上传和解析',
    type: 'success',
  })
  getList();
}

/** æ–‡ä»¶ä¸Šä¼ æˆåŠŸå¤„理 */
const handleFileSuccess = (response, file, fileList) => {
  if(response.code == '200'){
    batchNumber.value = response.data;
    isVisible.value = true;
    planned.value = false;
    isError.value = false;
  }else{
    isError.value = true;
    proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
  }
  proxy.$refs["uploadRef"].handleRemove(file);
  upload.isUploading = false;
};

/**文件上传中处理 */
const handleFileUploadProgress = (event, file, fileList) => {
  upload.isUploading = true;
};

getList();
</script>

 src/views/mainPlan/platePlanList/index.vue

@@ -283,7 +283,7 @@
  let newArray = [];
  newArray = dynamicList.value.flatMap((item, index) => [
    {
      title: `${item}开始时间`,
      title: `${item}开工时间`,
      field: `${index}_startDate`,
      width: 140,
      formatter: ({ cellValue, row, column }) => {