feat(biz): 添加生产订单模块并优化表格组件

mes-module-chemmes/mes-module-chemmes-api/src/main/java/com/ningxia/yunxi/chemmes/module/biz/enums/ErrorCodeConstants.java

@@ -30,6 +30,7 @@ public interface ErrorCodeConstants {
     ErrorCode DICT_TYPE_ERROR = new ErrorCode(1_000_003, "无法识别枚举类型");
 
     ErrorCode APP_VERSION_NOT_EXISTS = new ErrorCode(1_000_004, "无可用app版本");
+    ErrorCode DATA_NOT_EXISTS = new ErrorCode(1_000_005, "数据不存在");
 
 
     ErrorCode CN_EN_NOT_EXISTS = new ErrorCode(1_001_022, "中英文对照不存在");

mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm

@@ -4,6 +4,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
+import static com.ningxia.yunxi.chemmes.module.infra.enums.ErrorCodeConstants.*;
 
 import java.util.*;
 import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo.*;
@@ -135,7 +136,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
 #set ($ParentJavaField = $treeParentColumn.javaField.substring(0,1).toUpperCase() + ${treeParentColumn.javaField.substring(1)})##首字母大写
         // 校验是否有子${table.classComment}
         if (${classNameVar}Mapper.selectCountBy${ParentJavaField}(id) > 0) {
-            throw exception(${simpleClassName_underlineCase.toUpperCase()}_EXITS_CHILDREN);
+            throw exception(DATA_NOT_EXISTS);
         }
 #end
         // 删除
@@ -304,7 +305,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
 
     private void validate${subSimpleClassName}Exists(${subPrimaryColumn.javaType} id) {
         if (${subClassNameVar}Mapper.selectById(id) == null) {
-            throw exception(${simpleClassNameUnderlineCase.toUpperCase()}_NOT_EXISTS);
+            throw exception(DATA_NOT_EXISTS);
         }
     }
 

mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm

@@ -1,10 +1,10 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
     <el-form
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="110px"
       v-loading="formLoading"
     >
 #foreach($column in $columns)
@@ -151,6 +151,7 @@ import { defaultProps, handleTree } from '@/utils/tree'
 import ${subSimpleClassName}Form from './components/${subSimpleClassName}Form.vue'
 #end
 #end
+import { watch } from 'vue'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -170,6 +171,13 @@ const formData = ref({
     #end
 #end
 })
+/** 弹窗关闭时通知父组件 */
+watch(dialogVisible, (val) => {
+  if (!val) {
+    emit('close')
+  }
+})
+
 const formRules = reactive({
 #foreach ($column in $columns)
     #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
@@ -218,7 +226,7 @@ const open = async (type: string, id?: number) => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const emit = defineEmits(['success', 'close']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()

mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm

@@ -6,7 +6,7 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="80px"
     >
     #foreach($column in $columns)
         #if ($column.listOperation)
@@ -119,6 +119,7 @@
       v-loading="loading"
       :data="list"
       :stripe="true"
+      border
       :show-overflow-tooltip="true"
       highlight-current-row
       @current-change="handleCurrentChange"
@@ -156,8 +157,9 @@
         </template>
       </el-table-column>
 #end
+      <el-table-column label="序号" align="center" type="index" width="60px"/>
       #foreach($column in $columns)
-      #if ($column.listOperationResult)
+      #if ($column.listOperationResult && $column.javaField != "id")## 排除ID列
         #set ($dictType=$column.dictType)
         #set ($javaField = $column.javaField)
         #set ($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
@@ -212,7 +214,7 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <${simpleClassName}Form ref="formRef" @success="getList" />
+  <${simpleClassName}Form ref="formRef" @success="getList" @close="handleQuery"/>
 ## 特殊：主子表专属逻辑
 #if ( $table.templateType == 11 && $subTables && $subTables.size() > 0 )
   <!-- 子表的列表 -->
@@ -254,7 +256,7 @@ defineOptions({ name: '${table.className}' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
-const loading = ref(true) // 列表的加载中
+const loading = ref(false) // 列表的加载中（默认不加载）
 const list = ref([]) // 列表的数据
 ## 特殊：树表专属逻辑（树不需要分页接口）
 #if ( $table.templateType != 2 )
@@ -368,6 +370,6 @@ const toggleExpandAll = async () => {
 
 /** 初始化 **/
 onMounted(() => {
-  getList()
+  // 默认不自动查询，需手动点击搜索按钮
 })
 </script>

mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue

@@ -67,7 +67,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
       <el-table-column label="序号" align="center" type="index" width="80px" />
       <el-table-column label="客户编码" align="center" prop="custNo" />
       <el-table-column label="客户全称" align="center" prop="custName" width="350px" />

mes-ui/mes-ui-admin-vue3/src/views/biz/inspplan/InspPlanSelect.vue

@@ -9,7 +9,7 @@
         <el-button @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="inspPlanList" :show-overflow-tooltip="true" class="mt-15px" @row-click="handleRowClick" @row-dblclick="handleRowDblClick">
+    <el-table v-loading="loading" :data="inspPlanList" :show-overflow-tooltip="true" border class="mt-15px" @row-click="handleRowClick" @row-dblclick="handleRowDblClick">
       <el-table-column label="选择" width="60px" align="center">
         <template #default="scope">
           <el-radio v-model="selectedId" :label="scope.row.id">&nbsp;</el-radio>

mes-ui/mes-ui-admin-vue3/src/views/biz/machine/MachineSelect.vue

@@ -9,7 +9,7 @@
         <el-button @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-table ref="tableRef" v-loading="loading" :data="machineList" :show-overflow-tooltip="true" class="mt-15px" @selection-change="handleSelection">
+    <el-table ref="tableRef" v-loading="loading" :data="machineList" border :show-overflow-tooltip="true" class="mt-15px" @selection-change="handleSelection">
       <el-table-column type="selection" width="50px" />
       <el-table-column label="序号" width="60px" align="center" type="index" />
       <el-table-column label="机台编码" align="center" prop="machineCd" />

mes-ui/mes-ui-admin-vue3/src/views/biz/machine/index.vue

@@ -40,7 +40,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
       <el-table-column label="序号" align="center" type="index" width="60px" />
       <el-table-column label="机台编码" align="center" prop="machineCd" />
       <el-table-column label="机台名称" align="center" prop="machineName" />

mes-ui/mes-ui-admin-vue3/src/views/biz/machineparam/index.vue

@@ -74,7 +74,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
       <el-table-column label="序号" align="center" type="index" width="60px"/>
       <el-table-column label="机台名称" align="center" prop="machineName" />
       <el-table-column label="产品名称" align="center" prop="matName" />

mes-ui/mes-ui-admin-vue3/src/views/biz/material/index.vue

@@ -73,7 +73,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
       <el-table-column label="序号" align="center" type="index" width="60" />
       <el-table-column label="物料编码" align="center" prop="matCode" />
       <el-table-column label="物料名称" align="center" prop="matName" />

mes-ui/mes-ui-admin-vue3/src/views/biz/proc/index.vue

@@ -40,7 +40,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
       <el-table-column label="序号" align="center" type="index" width="60px" />
 
       <el-table-column label="工序编码" align="center" prop="procCd" />

mes-ui/mes-ui-admin-vue3/src/views/biz/procparam/index.vue

@@ -65,7 +65,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
       <el-table-column label="序号" align="center" type="index" width="60px" />
       <el-table-column label="工序编码" align="center" prop="procCd" />
       <el-table-column label="工序名称" align="center" prop="procName" />

mes-ui/mes-ui-admin-vue3/src/views/biz/proline/index.vue

@@ -40,7 +40,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
       <el-table-column label="序号" align="center" type="index" width="60px" />
 
       <el-table-column label="产线编码" align="center" prop="proLineCd" />

mes-ui/mes-ui-admin-vue3/src/views/biz/proorder/ProOrderForm.vue

@@ -0,0 +1,198 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="生产订单号(MO+年份+月份+3位流水号)" prop="proNo">
+        <el-input v-model="formData.proNo" placeholder="请输入生产订单号(MO+年份+月份+3位流水号)" />
+      </el-form-item>
+      <el-form-item label="生成日期" prop="proDate">
+        <el-date-picker
+          v-model="formData.proDate"
+          type="date"
+          value-format="x"
+          placeholder="选择生成日期"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="产品id" prop="materialId">
+        <el-input v-model="formData.materialId" placeholder="请输入产品id" />
+      </el-form-item>
+      <el-form-item label="产品编码" prop="materialCode">
+        <el-input v-model="formData.materialCode" placeholder="请输入产品编码" />
+      </el-form-item>
+      <el-form-item label="产品名称" prop="materialName">
+        <el-input v-model="formData.materialName" placeholder="请输入产品名称" />
+      </el-form-item>
+      <el-form-item label="规格型号" prop="spec">
+        <el-input v-model="formData.spec" placeholder="请输入规格型号" />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input v-model="formData.unit" placeholder="请输入单位" />
+      </el-form-item>
+      <el-form-item label="计划数量" prop="planQty">
+        <el-input v-model="formData.planQty" placeholder="请输入计划数量" />
+      </el-form-item>
+      <el-form-item label="计划开始日期" prop="planBgDate">
+        <el-date-picker
+          v-model="formData.planBgDate"
+          type="date"
+          value-format="x"
+          placeholder="选择计划开始日期"
+        />
+      </el-form-item>
+      <el-form-item label="计划完成日期" prop="planEndDate">
+        <el-date-picker
+          v-model="formData.planEndDate"
+          type="date"
+          value-format="x"
+          placeholder="选择计划完成日期"
+        />
+      </el-form-item>
+      <el-form-item label="工艺流程" prop="processFlow">
+        <el-input v-model="formData.processFlow" placeholder="请输入工艺流程" />
+      </el-form-item>
+      <el-form-item label="订单状态（0 未下发 1已下发 2 执行中 3 已完成 4 暂停 5 关闭 ）" prop="planStatus">
+        <el-radio-group v-model="formData.planStatus">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="编制人id" prop="planEmpId">
+        <el-input v-model="formData.planEmpId" placeholder="请输入编制人id" />
+      </el-form-item>
+      <el-form-item label="编制人名称" prop="planEmpName">
+        <el-input v-model="formData.planEmpName" placeholder="请输入编制人名称" />
+      </el-form-item>
+      <el-form-item label="完成数量" prop="completeQty">
+        <el-input v-model="formData.completeQty" placeholder="请输入完成数量" />
+      </el-form-item>
+      <el-form-item label="是否所有产线( 0 是 1否)" prop="isAllLine">
+        <el-input v-model="formData.isAllLine" placeholder="请输入是否所有产线( 0 是 1否)" />
+      </el-form-item>
+      <el-form-item label="入库数量" prop="storeInQty">
+        <el-input v-model="formData.storeInQty" placeholder="请输入入库数量" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as ProOrderApi from '@/api/tpl/proorder'
+import { watch } from 'vue'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  proNo: undefined,
+  proDate: undefined,
+  remark: undefined,
+  materialId: undefined,
+  materialCode: undefined,
+  materialName: undefined,
+  spec: undefined,
+  unit: undefined,
+  planQty: undefined,
+  planBgDate: undefined,
+  planEndDate: undefined,
+  processFlow: undefined,
+  planStatus: undefined,
+  planEmpId: undefined,
+  planEmpName: undefined,
+  completeQty: undefined,
+  isAllLine: undefined,
+  storeInQty: undefined,
+})
+/** 弹窗关闭时通知父组件 */
+watch(dialogVisible, (val) => {
+  if (!val) {
+    emit('close')
+  }
+})
+
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ProOrderApi.getProOrder(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success', 'close']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ProOrderApi.ProOrderVO
+    if (formType.value === 'create') {
+      await ProOrderApi.createProOrder(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProOrderApi.updateProOrder(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    proNo: undefined,
+    proDate: undefined,
+    remark: undefined,
+    materialId: undefined,
+    materialCode: undefined,
+    materialName: undefined,
+    spec: undefined,
+    unit: undefined,
+    planQty: undefined,
+    planBgDate: undefined,
+    planEndDate: undefined,
+    processFlow: undefined,
+    planStatus: undefined,
+    planEmpId: undefined,
+    planEmpName: undefined,
+    completeQty: undefined,
+    isAllLine: undefined,
+    storeInQty: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

mes-ui/mes-ui-admin-vue3/src/views/biz/proorder/index.vue

@@ -0,0 +1,380 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="80px"
+    >
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="生产订单号(MO+年份+月份+3位流水号)" prop="proNo">
+        <el-input
+          v-model="queryParams.proNo"
+          placeholder="请输入生产订单号(MO+年份+月份+3位流水号)"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="生成日期" prop="proDate">
+        <el-date-picker
+          v-model="queryParams.proDate"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="产品id" prop="materialId">
+        <el-input
+          v-model="queryParams.materialId"
+          placeholder="请输入产品id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="产品编码" prop="materialCode">
+        <el-input
+          v-model="queryParams.materialCode"
+          placeholder="请输入产品编码"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="产品名称" prop="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入产品名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="规格型号" prop="spec">
+        <el-input
+          v-model="queryParams.spec"
+          placeholder="请输入规格型号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单位"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="计划数量" prop="planQty">
+        <el-input
+          v-model="queryParams.planQty"
+          placeholder="请输入计划数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="计划开始日期" prop="planBgDate">
+        <el-date-picker
+          v-model="queryParams.planBgDate"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="计划完成日期" prop="planEndDate">
+        <el-date-picker
+          v-model="queryParams.planEndDate"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="工艺流程" prop="processFlow">
+        <el-input
+          v-model="queryParams.processFlow"
+          placeholder="请输入工艺流程"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="订单状态（0 未下发 1已下发 2 执行中 3 已完成 4 暂停 5 关闭 ）" prop="planStatus">
+        <el-select
+          v-model="queryParams.planStatus"
+          placeholder="请选择订单状态（0 未下发 1已下发 2 执行中 3 已完成 4 暂停 5 关闭 ）"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="编制人id" prop="planEmpId">
+        <el-input
+          v-model="queryParams.planEmpId"
+          placeholder="请输入编制人id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="编制人名称" prop="planEmpName">
+        <el-input
+          v-model="queryParams.planEmpName"
+          placeholder="请输入编制人名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="完成数量" prop="completeQty">
+        <el-input
+          v-model="queryParams.completeQty"
+          placeholder="请输入完成数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="是否所有产线( 0 是 1否)" prop="isAllLine">
+        <el-input
+          v-model="queryParams.isAllLine"
+          placeholder="请输入是否所有产线( 0 是 1否)"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="入库数量" prop="storeInQty">
+        <el-input
+          v-model="queryParams.storeInQty"
+          placeholder="请输入入库数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['tpl:pro-order:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['tpl:pro-order:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="序号" align="center" type="index" width="60px"/>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="生产订单号(MO+年份+月份+3位流水号)" align="center" prop="proNo" />
+      <el-table-column label="生成日期" align="center" prop="proDate" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="产品id" align="center" prop="materialId" />
+      <el-table-column label="产品编码" align="center" prop="materialCode" />
+      <el-table-column label="产品名称" align="center" prop="materialName" />
+      <el-table-column label="规格型号" align="center" prop="spec" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="计划数量" align="center" prop="planQty" />
+      <el-table-column label="计划开始日期" align="center" prop="planBgDate" />
+      <el-table-column label="计划完成日期" align="center" prop="planEndDate" />
+      <el-table-column label="工艺流程" align="center" prop="processFlow" />
+      <el-table-column label="订单状态（0 未下发 1已下发 2 执行中 3 已完成 4 暂停 5 关闭 ）" align="center" prop="planStatus" />
+      <el-table-column label="编制人id" align="center" prop="planEmpId" />
+      <el-table-column label="编制人名称" align="center" prop="planEmpName" />
+      <el-table-column label="完成数量" align="center" prop="completeQty" />
+      <el-table-column label="是否所有产线( 0 是 1否)" align="center" prop="isAllLine" />
+      <el-table-column label="入库数量" align="center" prop="storeInQty" />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['tpl:pro-order:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['tpl:pro-order:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ProOrderForm ref="formRef" @success="getList" @close="handleQuery"/>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ProOrderApi from '@/api/tpl/proorder'
+import ProOrderForm from './ProOrderForm.vue'
+
+defineOptions({ name: 'ProOrder' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(false) // 列表的加载中（默认不加载）
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  createTime: [],
+  proNo: undefined,
+  proDate: [],
+  remark: undefined,
+  materialId: undefined,
+  materialCode: undefined,
+  materialName: undefined,
+  spec: undefined,
+  unit: undefined,
+  planQty: undefined,
+  planBgDate: [],
+  planEndDate: [],
+  processFlow: undefined,
+  planStatus: undefined,
+  planEmpId: undefined,
+  planEmpName: undefined,
+  completeQty: undefined,
+  isAllLine: undefined,
+  storeInQty: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProOrderApi.getProOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProOrderApi.deleteProOrder(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProOrderApi.exportProOrder(queryParams)
+    download.excel(data, '生产订单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  // 默认不自动查询，需手动点击搜索按钮
+})
+</script>

mes-ui/mes-ui-admin-vue3/src/views/biz/supplier/index.vue

@@ -89,7 +89,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
       <el-table-column label="序号" align="center" type="index" width="60px" />
       <el-table-column label="供应商编码" align="center" prop="supplierNo" />
       <el-table-column label="供应商名称" align="center" prop="supplierName" width="350px" />

mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/UserMachineForm.vue

@@ -57,7 +57,7 @@
             <Icon icon="ep:plus" class="mr-5px" /> 新增
           </el-button>
         </div>
-        <el-table :data="machineList" :show-overflow-tooltip="true">
+        <el-table :data="machineList" :show-overflow-tooltip="true" border>
           <el-table-column label="序号" align="center" type="index" width="60px" />
           <el-table-column label="机台编码" align="center" prop="machineCd" />
           <el-table-column label="机台名称" align="center" prop="machineName" />

mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/index.vue

@@ -65,7 +65,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-click="handleRowClick" :row-class-name="({ row }) => row.id === selectedRowId ? 'table-row-active' : ''">
+    <el-table v-loading="loading" :data="list" border :stripe="true" :show-overflow-tooltip="true" @row-click="handleRowClick" :row-class-name="({ row }) => row.id === selectedRowId ? 'table-row-active' : ''">
       <el-table-column label="序号" align="center" type="index" width="60px" />
       <el-table-column label="人员名称" align="center" prop="userName" />
       <el-table-column label="人员编码" align="center" prop="userNo" />
@@ -116,7 +116,7 @@
   <!-- 机台信息列表 -->
   <ContentWrap>
     <div class="font-weight-600 mb-15px">机台信息</div>
-    <el-table v-loading="machineLoading" :data="machineList" :show-overflow-tooltip="true" :stripe="true">
+    <el-table v-loading="machineLoading" :data="machineList" :show-overflow-tooltip="true" :stripe="true" border>
       <el-table-column label="序号" align="center" type="index" width="60px" />
       <el-table-column label="机台编码" align="center" prop="machineCd" />
       <el-table-column label="机台名称" align="center" prop="machineName" />