refactor(customer): 重构客户管理界面样式和组件结构

refactor(machine): 重构机台管理表单组件结构
refactor(proc): 重构工序管理表单组件结构
refactor(proline): 重构产线管理表单组件结构
style(customer): 调整客户列表页面组件名称和功能
style(machine): 调整机台列表页面组件名称
style(material): 调整物料列表页面组件名称
fix(common): 统一组件刷新事件参数传递

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java

@@ -66,7 +66,7 @@ public class MachineServiceImpl extends ServiceImpl<MachineMapper, MachineEntity
         if (ObjectUtil.isNotEmpty(machinePagination.getBelgProcId())) {
             machineWrapper.eq(MachineEntity::getBelgProcId, machinePagination.getBelgProcId());
         }
-        machineWrapper.isNull(MachineEntity::getDeleteMark);
+        machineWrapper.eq(MachineEntity::getDeleteMark,0);
         machineWrapper.orderByDesc(MachineEntity::getCreatorTime);
         if ("0".equals(machinePagination.getDataType())) {
             Page<MachineEntity> page = new Page<>(machinePagination.getCurrentPage(), machinePagination.getPageSize());

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MaterialServiceImpl.java

@@ -59,7 +59,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
         if (ObjectUtil.isNotEmpty(materialPagination.getSpec())) {
             materialWrapper.like(MaterialEntity::getSpec, materialPagination.getSpec());
         }
-//        materialWrapper.isNull(MaterialEntity::getDeleteMark);
+        materialWrapper.eq(MaterialEntity::getDeleteMark,0);
         materialWrapper.orderByDesc(MaterialEntity::getCreatorTime);
         if ("0".equals(materialPagination.getDataType())) {
             Page<MaterialEntity> page = new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java

@@ -48,7 +48,7 @@ public class ProLineServiceImpl extends ServiceImpl<ProLineMapper, ProLineEntity
         if (ObjectUtil.isNotEmpty(proLinePagination.getEnabledStatus())) {
             proLineWrapper.eq(ProLineEntity::getEnabledStatus, proLinePagination.getEnabledStatus());
         }
-        proLineWrapper.isNull(ProLineEntity::getDeleteMark);
+        proLineWrapper.eq(ProLineEntity::getDeleteMark,0);
         proLineWrapper.orderByDesc(ProLineEntity::getCreatorTime);
         if ("0".equals(proLinePagination.getDataType())) {
             Page<ProLineEntity> page = new Page<>(proLinePagination.getCurrentPage(), proLinePagination.getPageSize());

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProcServiceImpl.java

@@ -51,7 +51,7 @@ public class ProcServiceImpl extends ServiceImpl<ProcMapper, ProcEntity> impleme
         if (ObjectUtil.isNotEmpty(procPagination.getEnabledStatus())) {
             procWrapper.eq(ProcEntity::getEnabledStatus, procPagination.getEnabledStatus());
         }
-        procWrapper.isNull(ProcEntity::getDeleteMark);
+        procWrapper.eq(ProcEntity::getDeleteMark,0);
         procWrapper.orderByDesc(ProcEntity::getCreatorTime);
         if ("0".equals(procPagination.getDataType())) {
             Page<ProcEntity> page = new Page<>(procPagination.getCurrentPage(), procPagination.getPageSize());

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/TbaCustomerServiceImpl.java

@@ -59,7 +59,7 @@ public class TbaCustomerServiceImpl extends ServiceImpl<TabCustomerMapper, TbaCu
             wrapper.eq(TbaCustomerEntity::getEnabledStatus, customerPagination.getEnabledStatus());
         }
 
-        wrapper.isNull(TbaCustomerEntity::getDeleteMark);
+        wrapper.eq(TbaCustomerEntity::getDeleteMark, 0);
         wrapper.orderByDesc(TbaCustomerEntity::getCreatorTime);
 
         if ("0".equals(customerPagination.getDataType())) {

jnpf-java-boot/jnpf-web/src/views/example/customer/detail.vue

@@ -12,58 +12,58 @@
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="客户编码" prop="custNo">
-              <JnpfInput v-model="dataForm.custNo"></JnpfInput>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="客户简称" prop="custSimName">
-              <JnpfInput v-model="dataForm.custSimName"></JnpfInput>
+              <JnpfInput v-model="dataForm.custNo" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户全称" prop="custName">
-              <JnpfInput v-model="dataForm.custName"></JnpfInput>
+              <JnpfInput v-model="dataForm.custName" :style="{ width: '100%' }"></JnpfInput>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户简称" prop="custSimName">
+              <JnpfInput v-model="dataForm.custSimName" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="所属行业" prop="industryClass">
-              <JnpfInput :value="getLabel('industryClass', dataForm.industryClass)"></JnpfInput>
+              <JnpfInput :value="getLabel('industryClass', dataForm.industryClass)" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="合作状态" prop="coopStatus">
-              <JnpfInput :value="getLabel('coopStatus', dataForm.coopStatus)"></JnpfInput>
+              <JnpfInput :value="getLabel('coopStatus', dataForm.coopStatus)" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业性质" prop="enterpriseType">
-              <JnpfInput :value="getLabel('enterpriseType', dataForm.enterpriseType)"></JnpfInput>
+              <JnpfInput :value="getLabel('enterpriseType', dataForm.enterpriseType)" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="客户等级" prop="custReg">
-              <JnpfInput :value="getLabel('custReg', dataForm.custReg)"></JnpfInput>
+              <JnpfInput :value="getLabel('custReg', dataForm.custReg)" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="信用等级" prop="creditRate">
-              <JnpfInput :value="getLabel('creditRate', dataForm.creditRate)"></JnpfInput>
+              <JnpfInput :value="getLabel('creditRate', dataForm.creditRate)" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="启用状态" prop="enabledStatus">
-              <JnpfInput :value="dataForm.enabledStatus == '1' ? '启用' : '未启用'"></JnpfInput>
+              <JnpfInput :value="dataForm.enabledStatus == '1' ? '启用' : '未启用'" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <JnpfTextarea v-model="dataForm.remark" :autoSize="{ minRows: 2, maxRows: 4 }" type="textarea"></JnpfTextarea>
+              <JnpfTextarea v-model="dataForm.remark" :autoSize="{ minRows: 2, maxRows: 4 }" type="textarea" :style="{ width: '100%' }"></JnpfTextarea>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,34 +72,34 @@
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="联系人1" prop="contact1">
-              <JnpfInput v-model="dataForm.contact1"></JnpfInput>
+              <JnpfInput v-model="dataForm.contact1" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系电话1" prop="conPhone1">
-              <JnpfInput v-model="dataForm.conPhone1"></JnpfInput>
+              <JnpfInput v-model="dataForm.conPhone1" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系地址1" prop="conAddress1">
-              <JnpfInput v-model="dataForm.conAddress1"></JnpfInput>
+              <JnpfInput v-model="dataForm.conAddress1" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="联系人2" prop="contact2">
-              <JnpfInput v-model="dataForm.contact2"></JnpfInput>
+              <JnpfInput v-model="dataForm.contact2" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系电话2" prop="conPhone2">
-              <JnpfInput v-model="dataForm.conPhone2"></JnpfInput>
+              <JnpfInput v-model="dataForm.conPhone2" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系地址2" prop="conAddress2">
-              <JnpfInput v-model="dataForm.conAddress2"></JnpfInput>
+              <JnpfInput v-model="dataForm.conAddress2" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
@@ -108,29 +108,29 @@
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="公司税号" prop="comTaxNumber">
-              <JnpfInput v-model="dataForm.comTaxNumber"></JnpfInput>
+              <JnpfInput v-model="dataForm.comTaxNumber" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="开户地区" prop="accountRegion">
-              <JnpfInput v-model="dataForm.accountRegion"></JnpfInput>
+              <JnpfInput v-model="dataForm.accountRegion" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="开户银行" prop="accountBank">
-              <JnpfInput v-model="dataForm.accountBank"></JnpfInput>
+              <JnpfInput v-model="dataForm.accountBank" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="开户账号" prop="accountNo">
-              <JnpfInput v-model="dataForm.accountNo"></JnpfInput>
+              <JnpfInput v-model="dataForm.accountNo" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="付款方式" prop="payMeth">
-              <JnpfInput :value="getLabel('payMeth', dataForm.payMeth)"></JnpfInput>
+              <JnpfInput :value="getLabel('payMeth', dataForm.payMeth)" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>

jnpf-java-boot/jnpf-web/src/views/example/customer/form.vue

@@ -12,58 +12,58 @@
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="客户编码" prop="custNo">
-              <JnpfInput v-model="dataForm.custNo" placeholder="请输入客户编码" clearable :disabled="!!dataForm.id"></JnpfInput>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="客户简称" prop="custSimName">
-              <JnpfInput v-model="dataForm.custSimName" placeholder="请输入客户简称" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.custNo" placeholder="请输入客户编码" clearable :disabled="!!dataForm.id" :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户全称" prop="custName">
-              <JnpfInput v-model="dataForm.custName" placeholder="请输入客户全称" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.custName" placeholder="请输入客户全称" clearable :style="{ width: '100%' }"></JnpfInput>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户简称" prop="custSimName">
+              <JnpfInput v-model="dataForm.custSimName" placeholder="请输入客户简称" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="所属行业" prop="industryClass">
-              <JnpfSelect v-model="dataForm.industryClass" placeholder="请选择" :options="industryClassOptions" :props="dictProps" clearable></JnpfSelect>
+              <JnpfSelect v-model="dataForm.industryClass" placeholder="请选择" :options="industryClassOptions" :props="dictProps" clearable :style="{ width: '100%' }"></JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="合作状态" prop="coopStatus">
-              <JnpfSelect v-model="dataForm.coopStatus" placeholder="请选择" :options="coopStatusOptions" :props="dictProps" clearable></JnpfSelect>
+              <JnpfSelect v-model="dataForm.coopStatus" placeholder="请选择" :options="coopStatusOptions" :props="dictProps" clearable :style="{ width: '100%' }"></JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="企业性质" prop="enterpriseType">
-              <JnpfSelect v-model="dataForm.enterpriseType" placeholder="请选择" :options="enterpriseTypeOptions" :props="dictProps" clearable></JnpfSelect>
+              <JnpfSelect v-model="dataForm.enterpriseType" placeholder="请选择" :options="enterpriseTypeOptions" :props="dictProps" clearable :style="{ width: '100%' }"></JnpfSelect>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="客户等级" prop="custReg">
-              <JnpfSelect v-model="dataForm.custReg" placeholder="请选择" :options="custRegOptions" :props="dictProps" clearable></JnpfSelect>
+              <JnpfSelect v-model="dataForm.custReg" placeholder="请选择" :options="custRegOptions" :props="dictProps" clearable :style="{ width: '100%' }"></JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="信用等级" prop="creditRate">
-              <JnpfSelect v-model="dataForm.creditRate" placeholder="请选择" :options="creditRateOptions" :props="dictProps" clearable></JnpfSelect>
+              <JnpfSelect v-model="dataForm.creditRate" placeholder="请选择" :options="creditRateOptions" :props="dictProps" clearable :style="{ width: '100%' }"></JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="启用状态" prop="enabledStatus">
-              <JnpfSelect v-model="dataForm.enabledStatus" placeholder="请选择" :options="enabledStatusOptions" :props="dictProps" clearable></JnpfSelect>
+              <JnpfSelect v-model="dataForm.enabledStatus" placeholder="请选择" :options="enabledStatusOptions" :props="dictProps" clearable :style="{ width: '100%' }"></JnpfSelect>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <JnpfTextarea v-model="dataForm.remark" placeholder="请输入备注" :autoSize="{ minRows: 2, maxRows: 4 }" type="textarea"></JnpfTextarea>
+              <JnpfTextarea v-model="dataForm.remark" placeholder="请输入备注" :autoSize="{ minRows: 2, maxRows: 4 }" type="textarea" :style="{ width: '100%' }"></JnpfTextarea>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,34 +72,34 @@
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="联系人1" prop="contact1">
-              <JnpfInput v-model="dataForm.contact1" placeholder="请输入联系人" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.contact1" placeholder="请输入联系人" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系电话1" prop="conPhone1">
-              <JnpfInput v-model="dataForm.conPhone1" placeholder="请输入联系电话" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.conPhone1" placeholder="请输入联系电话" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系地址1" prop="conAddress1">
-              <JnpfInput v-model="dataForm.conAddress1" placeholder="请输入联系地址" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.conAddress1" placeholder="请输入联系地址" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="联系人2" prop="contact2">
-              <JnpfInput v-model="dataForm.contact2" placeholder="请输入联系人" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.contact2" placeholder="请输入联系人" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系电话2" prop="conPhone2">
-              <JnpfInput v-model="dataForm.conPhone2" placeholder="请输入联系电话" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.conPhone2" placeholder="请输入联系电话" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系地址2" prop="conAddress2">
-              <JnpfInput v-model="dataForm.conAddress2" placeholder="请输入联系地址" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.conAddress2" placeholder="请输入联系地址" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
@@ -108,29 +108,29 @@
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="公司税号" prop="comTaxNumber">
-              <JnpfInput v-model="dataForm.comTaxNumber" placeholder="请输入公司税号" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.comTaxNumber" placeholder="请输入公司税号" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="开户地区" prop="accountRegion">
-              <JnpfInput v-model="dataForm.accountRegion" placeholder="请输入开户地区" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.accountRegion" placeholder="请输入开户地区" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="开户银行" prop="accountBank">
-              <JnpfInput v-model="dataForm.accountBank" placeholder="请输入开户银行" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.accountBank" placeholder="请输入开户银行" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="8">
             <el-form-item label="开户账号" prop="accountNo">
-              <JnpfInput v-model="dataForm.accountNo" placeholder="请输入开户账号" clearable></JnpfInput>
+              <JnpfInput v-model="dataForm.accountNo" placeholder="请输入开户账号" clearable :style="{ width: '100%' }"></JnpfInput>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="付款方式" prop="payMeth">
-              <JnpfSelect v-model="dataForm.payMeth" placeholder="请选择" :options="payMethOptions" :props="dictProps" clearable></JnpfSelect>
+              <JnpfSelect v-model="dataForm.payMeth" placeholder="请选择" :options="payMethOptions" :props="dictProps" clearable :style="{ width: '100%' }"></JnpfSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -247,7 +247,7 @@ export default {
     },
     handleClose() {
       this.dialogVisible = false;
-      this.$emit('refresh')
+      this.$emit('refresh',true)
     },
   }
 }

jnpf-java-boot/jnpf-web/src/views/example/customer/index.vue

@@ -72,7 +72,7 @@
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑</el-button>
               <el-button type="text" @click="detailHandle(scope.row)">详情</el-button>
-              <el-button type="text" style="color: #f56c6c" @click="handleDelete(scope.row)">删除</el-button>
+<!--              <el-button type="text" style="color: #f56c6c" @click="handleDelete(scope.row)">删除</el-button>-->
             </template>
           </el-table-column>
         </JNPF-table>
@@ -92,7 +92,7 @@ import JNPFDetail from "./detail";
 import {customerOptions, getCustomerLabel} from "./options";
 
 export default {
-  name: "customer_list",
+  name: "tbaCustomer",
   components: {
     JNPFForm,
     JNPFDetail,

jnpf-java-boot/jnpf-web/src/views/example/machine/form.vue

@@ -1,79 +1,46 @@
 <template>
-  <transition name="el-zoom-in-center">
-    <div class="JNPF-preview-main">
-      <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
-<!--        <div class="options">-->
-<!--          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保 存</el-button>-->
-<!--          <el-button @click="goBack">取 消</el-button>-->
-<!--        </div>-->
-      </div>
-      <el-row :gutter="15" class="main" :style="{ margin: '0 auto', width: '1200px' }">
-        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
-          label-position="right">
+  <el-dialog
+    :title="!dataForm.id ? '新建' : '编辑'"
+    :visible.sync="dialogVisible"
+    width="600px"
+    :close-on-click-modal="false"
+    @close="handleClose"
+  >
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right">
       <template v-if="!loading">
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="机台编码" prop="machineCd">
-                <JnpfInput v-model="dataForm.machineCd" @change="changeData('machineCd', -1)" placeholder="请输入机台编码"
-                  clearable :disabled="!!dataForm.id" :style="{ width: '100%' }">
+        <el-form-item label="机台编码" prop="machineCd">
+          <JnpfInput v-model="dataForm.machineCd" placeholder="请输入机台编码" clearable :disabled="!!dataForm.id" :style="{ width: '100%' }">
           </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="机台名称" prop="machineName">
-                <JnpfInput v-model="dataForm.machineName" @change="changeData('machineName', -1)" placeholder="请输入机台名称"
-                  clearable :style="{ width: '100%' }">
+        </el-form-item>
+        <el-form-item label="机台名称" prop="machineName">
+          <JnpfInput v-model="dataForm.machineName" placeholder="请输入机台名称" clearable :style="{ width: '100%' }">
           </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="所属产线" prop="belgLineId">
+        </el-form-item>
+        <el-form-item label="所属产线" prop="belgLineId">
           <el-select v-model="dataForm.belgLineId" placeholder="请选择产线" clearable :style="{ width: '100%' }">
-                  <el-option
-                    v-for="item in proLineList"
-                    :key="item.id"
-                    :label="item.proLineName"
-                    :value="item.id">
-                  </el-option>
+            <el-option v-for="item in proLineList" :key="item.id" :label="item.proLineName" :value="item.id"></el-option>
           </el-select>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="所属工序" prop="belgProcId">
+        </el-form-item>
+        <el-form-item label="所属工序" prop="belgProcId">
           <el-select v-model="dataForm.belgProcId" placeholder="请选择工序" clearable :style="{ width: '100%' }">
-                  <el-option
-                    v-for="item in procList"
-                    :key="item.id"
-                    :label="item.procName"
-                    :value="item.id">
-                  </el-option>
+            <el-option v-for="item in procList" :key="item.id" :label="item.procName" :value="item.id"></el-option>
           </el-select>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="状态" prop="enabledStatus">
-                <JnpfSelect v-model="dataForm.enabledStatus" @change="changeData('enabledStatus', -1)"
-                  placeholder="请选择状态" :options="enabledStatusOptions" :props="enabledStatusProps" clearable
-                  :style="{ width: '100%' }">
+        </el-form-item>
+        <el-form-item label="状态" prop="enabledStatus">
+          <JnpfSelect v-model="dataForm.enabledStatus" placeholder="请选择状态" :options="enabledStatusOptions" :props="enabledStatusProps" clearable :style="{ width: '100%' }">
           </JnpfSelect>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24" :sm="24" :md="24" :xl="24" :xs="24">
-              <jnpf-form-tip-item label="备注" prop="remark">
-                <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入备注"
-                  :style="{ width: '100%' }" :autoSize="{ minRows: 4, maxRows: 4 }" type="textarea">
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <JnpfTextarea v-model="dataForm.remark" placeholder="请输入备注" :style="{ width: '100%' }" :autoSize="{ minRows: 4, maxRows: 4 }" type="textarea">
           </JnpfTextarea>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24" style="text-align: right; padding-top: 20px;">
-              <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保 存</el-button>
-              <el-button @click="goBack">取 消</el-button>
-            </el-col>
+        </el-form-item>
       </template>
     </el-form>
-      </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保 存</el-button>
+      <el-button @click="handleClose">取 消</el-button>
     </div>
-  </transition>
+  </el-dialog>
 </template>
 
 <script>
@@ -94,7 +61,7 @@ export default {
   },
   data() {
     return {
-      visible: false,
+      dialogVisible: false,
       loading: false,
       btnLoading: false,
       formRef: 'formRef',
@@ -158,7 +125,7 @@ export default {
   methods: {
     init(id) {
       this.dataForm.id = id || '';
-      this.visible = true;
+      this.dialogVisible = true;
       this.loading = true;
       this.$nextTick(() => {
         this.$refs.formRef.resetFields();
@@ -194,6 +161,7 @@ export default {
               duration: 1500,
               onClose: () => {
                 this.btnLoading = false;
+                this.dialogVisible = false;
                 this.$emit('refresh', true)
               }
             })
@@ -203,8 +171,9 @@ export default {
         }
       })
     },
-    goBack() {
-      this.$emit('refresh')
+    handleClose() {
+      this.dialogVisible = false;
+      this.$emit('refresh', true)
     },
     changeData(model, index) {
       this.isEdit = true

jnpf-java-boot/jnpf-web/src/views/example/machine/index.vue

@@ -94,7 +94,7 @@ import JNPFForm from "./form";
 import jnpf from "@/utils/jnpf";
 
 export default {
-  name: "machine_list",
+  name: "machine",
   components: {
     JNPFForm,
   },

jnpf-java-boot/jnpf-web/src/views/example/material/form.vue

@@ -165,7 +165,7 @@ export default {
     },
     handleClose() {
       this.dialogVisible = false;
-      this.$emit('refresh')
+      this.$emit('refresh',true)
     },
   }
 }

jnpf-java-boot/jnpf-web/src/views/example/material/index.vue

@@ -87,7 +87,7 @@ import JNFPDetail from "./detail";
 import jnpf from "@/utils/jnpf";
 
 export default {
-  name: "material_list",
+  name: "material",
   components: {
     JNPFForm,
     JNFPDetail,

jnpf-java-boot/jnpf-web/src/views/example/proc/form.vue

@@ -1,55 +1,36 @@
 <template>
-  <transition name="el-zoom-in-center">
-    <div class="JNPF-preview-main">
-      <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
-<!--        <div class="options">-->
-<!--          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保 存</el-button>-->
-<!--          <el-button @click="goBack">取 消</el-button>-->
-<!--        </div>-->
-      </div>
-      <el-row :gutter="15" class="main" :style="{ margin: '0 auto', width: '1200px' }">
-        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
-          label-position="right">
+  <el-dialog
+    :title="!dataForm.id ? '新建' : '编辑'"
+    :visible.sync="dialogVisible"
+    width="600px"
+    :close-on-click-modal="false"
+    @close="handleClose"
+  >
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right">
       <template v-if="!loading">
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="工序编码" prop="procCd">
-                <JnpfInput v-model="dataForm.procCd" @change="changeData('procCd', -1)" placeholder="请输入工序编码"
-                  clearable :disabled="!!dataForm.id" :style="{ width: '100%' }">
+        <el-form-item label="工序编码" prop="procCd">
+          <JnpfInput v-model="dataForm.procCd" placeholder="请输入工序编码" clearable :disabled="!!dataForm.id" :style="{ width: '100%' }">
           </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="工序名称" prop="procName" >
-                <JnpfInput v-model="dataForm.procName" @change="changeData('procName', -1)" placeholder="请输入工序名称"
-                  clearable :style="{ width: '100%' }">
+        </el-form-item>
+        <el-form-item label="工序名称" prop="procName">
+          <JnpfInput v-model="dataForm.procName" placeholder="请输入工序名称" clearable :style="{ width: '100%' }">
           </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="状态" prop="enabledStatus">
-                <JnpfSelect v-model="dataForm.enabledStatus" @change="changeData('enabledStatus', -1)"
-                  placeholder="请选择状态" :options="enabledStatusOptions" :props="enabledStatusProps" clearable
-                  :style="{ width: '100%' }">
+        </el-form-item>
+        <el-form-item label="状态" prop="enabledStatus">
+          <JnpfSelect v-model="dataForm.enabledStatus" placeholder="请选择状态" :options="enabledStatusOptions" :props="enabledStatusProps" clearable :style="{ width: '100%' }">
           </JnpfSelect>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24" :sm="24" :md="24" :xl="24" :xs="24">
-              <jnpf-form-tip-item label="备注" prop="remark">
-                <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入备注"
-                  :style="{ width: '100%' }" :autoSize="{ minRows: 4, maxRows: 4 }" type="textarea">
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <JnpfTextarea v-model="dataForm.remark" placeholder="请输入备注" :style="{ width: '100%' }" :autoSize="{ minRows: 4, maxRows: 4 }" type="textarea">
           </JnpfTextarea>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24" style="text-align: right; padding-top: 20px;">
-              <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保 存</el-button>
-              <el-button @click="goBack">取 消</el-button>
-            </el-col>
+        </el-form-item>
       </template>
     </el-form>
-      </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保 存</el-button>
+      <el-button @click="handleClose">取 消</el-button>
     </div>
-  </transition>
+  </el-dialog>
 </template>
 
 <script>
@@ -61,7 +42,7 @@ export default {
   props: [],
   data() {
     return {
-      visible: false,
+      dialogVisible: false,
       loading: false,
       btnLoading: false,
       formRef: 'formRef',
@@ -109,7 +90,7 @@ export default {
   methods: {
     init(id) {
       this.dataForm.id = id || '';
-      this.visible = true;
+      this.dialogVisible = true;
       this.loading = true;
       this.$nextTick(() => {
         this.$refs.formRef.resetFields();
@@ -145,6 +126,7 @@ export default {
               duration: 1500,
               onClose: () => {
                 this.btnLoading = false;
+                this.dialogVisible = false;
                 this.$emit('refresh', true)
               }
             })
@@ -154,8 +136,9 @@ export default {
         }
       })
     },
-    goBack() {
-      this.$emit('refresh')
+    handleClose() {
+      this.dialogVisible = false;
+      this.$emit('refresh',true)
     },
     changeData(model, index) {
       this.isEdit = true

jnpf-java-boot/jnpf-web/src/views/example/proc/index.vue

@@ -68,7 +68,7 @@ import JNPFForm from "./form";
 import jnpf from "@/utils/jnpf";
 
 export default {
-  name: "proc_list",
+  name: "proc",
   components: {
     JNPFForm,
   },

jnpf-java-boot/jnpf-web/src/views/example/proline/form.vue

@@ -1,55 +1,36 @@
 <template>
-  <transition name="el-zoom-in-center">
-    <div class="JNPF-preview-main">
-      <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
-<!--        <div class="options">-->
-<!--          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保 存</el-button>-->
-<!--          <el-button @click="goBack">取 消</el-button>-->
-<!--        </div>-->
-      </div>
-      <el-row :gutter="15" class="main" :style="{ margin: '0 auto', width: '1200px' }">
-        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
-          label-position="right">
+  <el-dialog
+    :title="!dataForm.id ? '新建' : '编辑'"
+    :visible.sync="dialogVisible"
+    width="600px"
+    :close-on-click-modal="false"
+    @close="handleClose"
+  >
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right">
       <template v-if="!loading">
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="产线编码" prop="proLineCd">
-                <JnpfInput v-model="dataForm.proLineCd" @change="changeData('proLineCd', -1)" placeholder="请输入产线编码"
-                  clearable :disabled="!!dataForm.id" :style="{ width: '100%' }">
+        <el-form-item label="产线编码" prop="proLineCd">
+          <JnpfInput v-model="dataForm.proLineCd" placeholder="请输入产线编码" clearable :disabled="!!dataForm.id" :style="{ width: '100%' }">
           </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="产线名称" prop="proLineName">
-                <JnpfInput v-model="dataForm.proLineName" @change="changeData('proLineName', -1)" placeholder="请输入产线名称"
-                  clearable :style="{ width: '100%' }">
+        </el-form-item>
+        <el-form-item label="产线名称" prop="proLineName">
+          <JnpfInput v-model="dataForm.proLineName" placeholder="请输入产线名称" clearable :style="{ width: '100%' }">
           </JnpfInput>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="12" :sm="24" :md="12" :xl="12" :xs="24">
-              <jnpf-form-tip-item label="状态" prop="enabledStatus">
-                <JnpfSelect v-model="dataForm.enabledStatus" @change="changeData('enabledStatus', -1)"
-                  placeholder="请选择状态" :options="enabledStatusOptions" :props="enabledStatusProps" clearable
-                  :style="{ width: '100%' }">
+        </el-form-item>
+        <el-form-item label="状态" prop="enabledStatus">
+          <JnpfSelect v-model="dataForm.enabledStatus" placeholder="请选择状态" :options="enabledStatusOptions" :props="enabledStatusProps" clearable :style="{ width: '100%' }">
           </JnpfSelect>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24" :sm="24" :md="24" :xl="24" :xs="24">
-              <jnpf-form-tip-item label="备注" prop="remark">
-                <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入备注"
-                  :style="{ width: '100%' }" :autoSize="{ minRows: 4, maxRows: 4 }" type="textarea">
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <JnpfTextarea v-model="dataForm.remark" placeholder="请输入备注" :style="{ width: '100%' }" :autoSize="{ minRows: 4, maxRows: 4 }" type="textarea">
           </JnpfTextarea>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24" style="text-align: right; padding-top: 20px;">
-              <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保 存</el-button>
-              <el-button @click="goBack">取 消</el-button>
-            </el-col>
+        </el-form-item>
       </template>
     </el-form>
-      </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保 存</el-button>
+      <el-button @click="handleClose">取 消</el-button>
     </div>
-  </transition>
+  </el-dialog>
 </template>
 
 <script>
@@ -61,7 +42,7 @@ export default {
   props: [],
   data() {
     return {
-      visible: false,
+      dialogVisible: false,
       loading: false,
       btnLoading: false,
       formRef: 'formRef',
@@ -109,7 +90,7 @@ export default {
   methods: {
     init(id) {
       this.dataForm.id = id || '';
-      this.visible = true;
+      this.dialogVisible = true;
       this.loading = true;
       this.$nextTick(() => {
         this.$refs.formRef.resetFields();
@@ -145,6 +126,7 @@ export default {
               duration: 1500,
               onClose: () => {
                 this.btnLoading = false;
+                this.dialogVisible = false;
                 this.$emit('refresh', true)
               }
             })
@@ -154,8 +136,9 @@ export default {
         }
       })
     },
-    goBack() {
-      this.$emit('refresh')
+    handleClose() {
+      this.dialogVisible = false;
+      this.$emit('refresh',true)
     },
     changeData(model, index) {
       this.isEdit = true

jnpf-java-boot/jnpf-web/src/views/example/proline/index.vue

@@ -68,7 +68,7 @@ import JNPFForm from "./form";
 import jnpf from "@/utils/jnpf";
 
 export default {
-  name: "proline_list",
+  name: "proline",
   components: {
     JNPFForm,
   },