diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java
index a1ea874..0233801 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java
@@ -119,6 +119,15 @@ public class ExampleOrderServiceImpl extends ServiceImpl<ExampleOrderMapper, Exa
             id = form.getId();
         }
         //主表字段验证
+        ExampleOrderEntity order = this.getInfo(id);
+        if (order == null) {
+            return "该销售订单不存在，请确认！";
+        }
+        if (ObjectUtil.isNotEmpty(form.getOrdStatus()) &&
+                ("3".equals(form.getOrdStatus()) || "5".equals(form.getOrdStatus())) &&
+                !"2".equals(order.getOrdStatus())) {
+            return "该销售订单状态不是已送审，请刷新界面！";
+        }
 
         return countRecover;
     }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java
index 08ee177..ad9c6e4 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java
@@ -146,7 +146,7 @@ public class OrderDetailController {
         OrderDetailEntity byId = orderDetailService.getById(id);
         // 对象存在判断
         if (ObjectUtil.isNotEmpty(byId )) {
-            if (!"1".equals(byId.getOrdItemStatus()))     return ActionResult.fail("该产品已转生产订单不允许删除，请确认！");
+            if (!"0".equals(byId.getOrdItemStatus()))     return ActionResult.fail("该产品已转生产订单不允许删除，请确认！");
             orderDetailService.removeById(id);
             return ActionResult.success("删除成功");
         }
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue
index a4e5291..8fa1a90 100644
--- a/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue
@@ -31,7 +31,7 @@
             </el-col>
             <el-col :span="6" >
               <jnpf-form-tip-item label="订单类型" prop="ordType">
-                <JnpfSelect v-model="dataForm.ordType"  placeholder="请选择" filterable :disabled="isDetail=='detail' || isDetail=='change'"
+                <JnpfSelect v-model="dataForm.ordType"  placeholder="请选择" filterable :disabled="isDetail=='detail' || isDetail=='change'||dataForm.id "
                             :style='{ "width": "100%" }' :options="ordTypeOptions"
                             :props="ordTypeProps">
                 </JnpfSelect>
@@ -130,7 +130,7 @@
             <el-col :span="6" >
               <jnpf-form-tip-item label="是否变更"  prop="isChange">
                 <JnpfRadio v-model="dataForm.isChange"
-                           :disabled="isDetail=='detail' || isDetail=='change'" optionType="default" direction="horizontal"
+                           disabled optionType="default" direction="horizontal"
                            size="small" :options="isUrgentOptions" :props="isUrgentProps">
                 </JnpfRadio>
               </jnpf-form-tip-item>
@@ -200,7 +200,11 @@
                   <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
                   <el-table-column label="物料名称"
                                    prop="materialName" width="150"
-                                   align="center">
+                                   align="center" >
+                    <template slot="header">
+                      物料名称(<span class="required-sign"
+                    >*</span>)
+                    </template>
                     <template slot-scope="scope">
                       {{scope.row.materialName}}
 <!--                        <materialslect v-model="scope.row.materialId"  placeholder="请选择" filterable :disabled="false"-->
@@ -212,6 +216,10 @@
                   <el-table-column label="规格型号"
                                    prop="spec" width="150"
                                    align="center">
+                    <template slot="header">
+                      规格型号(<span class="required-sign"
+                    >*</span>)
+                    </template>
                     <template slot-scope="scope">
                       {{scope.row.spec}}
 <!--                      <JnpfSelect v-model="scope.row.spec"  placeholder="请选择" filterable :disabled="false"-->
@@ -223,6 +231,10 @@
                   <el-table-column label="单位"
                                    prop="unit" width="150"
                                    align="center">
+                    <template slot="header">
+                      单位(<span class="required-sign"
+                    >*</span>)
+                    </template>
                     <template slot-scope="scope">
                       {{scope.row.unitName}}
                       <!--                      <JnpfSelect v-model="scope.row.unit"  placeholder="请选择" filterable :disabled="false"-->
@@ -235,8 +247,8 @@
                   <el-table-column label="订单数量"
                                    width="150" align="center">
                     <template slot="header">
-                    <span class="required-sign"
-                          >*</span>订单数量
+                      订单数量(<span class="required-sign"
+                    >*</span>)
                     </template>
                     <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.ordQty"
@@ -249,8 +261,8 @@
                   <el-table-column label="含税单价"
                                    width="150" align="center">
                     <template slot="header">
-                    <span class="required-sign"
-                    >*</span>含税单价
+                      含税单价(<span class="required-sign"
+                    >*</span>)
                     </template>
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.priceTax" :disabled="isDetail=='detail'"
@@ -263,8 +275,8 @@
                                    prop="materialUse" width="150"
                                    align="center">
                     <template slot="header">
-                    <span class="required-sign"
-                    >*</span>用途
+                      用途(<span class="required-sign"
+                    >*</span>)
                     </template>
                     <template slot-scope="scope">
                       <JnpfSelect v-model="scope.row.materialUse"  placeholder="请选择" filterable :disabled="isDetail=='detail'"
@@ -341,6 +353,20 @@
             </el-col>
 
           </template>
+          <el-col :span="24">
+            <div class="footer-buttons" style="text-align: center; margin-top: 20px;">
+              <el-button type="primary" @click="dataFormSubmit(0)" :loading="btnLoading" :disabled="continueBtnLoading" v-if="isDetail=='change'">
+                订单变更
+              </el-button>
+              <el-button type="primary" @click="dataFormSubmit(0)" :loading="btnLoading" :disabled="continueBtnLoading" v-if="isDetail!='detail'&&isDetail!='change'">
+                保 存
+              </el-button>
+              <el-button type="primary" @click="dataFormSubmit(1)" :loading="btnLoading" :disabled="continueBtnLoading" v-if="isDetail!='detail'&&isDetail!='change'" style="margin-left: 20px;">
+                送 审
+              </el-button>
+              <el-button @click="goBack" style="margin-left: 20px;">取 消</el-button>
+            </div>
+          </el-col>
         </el-form>
         <el-dialog
           title="选择"
@@ -351,6 +377,7 @@
           append-to-body
           width="1000px"
           height="400px"
+          @close="selectCancel()"
         >
           <el-row class="JNPF-common-search-box" :gutter="16">
             <el-form @submit.native.prevent>
@@ -397,15 +424,6 @@
       </span>
         </el-dialog>
       </el-row>
-      <div class="footer-buttons" style="text-align: center; margin-top: 20px;">
-        <el-button type="primary" @click="dataFormSubmit(0)" :loading="btnLoading" :disabled="continueBtnLoading" v-if="isDetail!='detail'">
-          保 存
-        </el-button>
-        <el-button type="primary" @click="dataFormSubmit(1)" :loading="btnLoading" :disabled="continueBtnLoading" v-if="isDetail!='detail'" style="margin-left: 20px;">
-          送 审
-        </el-button>
-        <el-button @click="goBack" style="margin-left: 20px;">取 消</el-button>
-      </div>
     </div>
   </transition>
 </template>
@@ -491,7 +509,7 @@ export default {
         version: 0,
         deliveryStatus:"1",
         ordDate:undefined,
-        ordStatus: undefined,
+        ordStatus: "1",
         remark: undefined,
         orderDetailList:[]
       },
@@ -501,9 +519,9 @@ export default {
         ordDate: [
           { required: true, message: '请选择下单日期', trigger: 'change' }
         ],
-        // ordStatus: [
-        //   { required: true, message: '请选择订单状态', trigger: 'change' }
-        // ],
+        ordStatus: [
+          { required: true, message: '请选择订单状态', trigger: 'change' }
+        ],
         saleDeptId: [
           { required: true, message: '请选择业务部门', trigger: 'change' }
         ],
@@ -679,7 +697,14 @@ export default {
         })
 
     },
-
+    reset() {
+      this.listQuery.matCode = ''
+      this.listQuery.matName = ''
+      this.listQuery.spec = ''
+      this.listQuery.currentPage = 1
+      this.listQuery.pageSize = this.pageSize
+      this.initData()
+    },
     getEnumLabel(options, value) {
       if (value === undefined || value === null || value === '') return value;
       const item = options.find(opt => opt.id == value);
@@ -1007,6 +1032,27 @@ export default {
       for (let i = 0; i < this.dataForm.orderDetailList.length; i++) {
         const row = this.dataForm.orderDetailList[i]
         const rowNumber = i + 1
+        if (!row.materialName || row.materialName === '') {
+          this.$message({
+            type: 'error',
+            message: `第${rowNumber}行的物料名称不能为空！`
+          })
+          return
+        }
+        if (!row.spec || row.spec === '') {
+          this.$message({
+            type: 'error',
+            message: `第${rowNumber}行的规格型号不能为空！`
+          })
+          return
+        }
+        if (!row.unitName || row.unitName === '') {
+          this.$message({
+            type: 'error',
+            message: `第${rowNumber}行的单位不能为空！`
+          })
+          return
+        }
         if (!row.ordQty || row.ordQty === '') {
           this.$message({
             type: 'error',
@@ -1035,6 +1081,9 @@ export default {
       }else {
         _data.ordStatus=2
       }
+      if (this.isDetail=='change'){
+        _data.isChange=0
+      }
       if (this.dataFormSubmitType == 2) {
         this.continueBtnLoading = true
       } else {
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/order/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/order/index.vue
index 029a96e..dc1e122 100644
--- a/jnpf-java-boot/jnpf-web/src/views/example/order/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/example/order/index.vue
@@ -5,7 +5,7 @@
         <el-form @submit.native.prevent >
           <el-col :span="8">
               <el-form-item label="下单日期">
-                <JnpfDateRangePicker v-model="query.ordDate" format="yyyy-MM-dd"
+                <JnpfDateRangePicker v-model="query.ordDate" format="yyyy-MM-dd" :clearable="false"
                                      startPlaceholder="开始日期" endPlaceholder="结束日期" />
               </el-form-item>
           </el-col>
@@ -62,8 +62,8 @@
           <el-table-column type="selection" width="50" align="center" fixed="left"/>
           <el-table-column prop="saleOrdNo" label="订单编码" align="center" fixed="left" width="100"/>
           <el-table-column prop="ordDate" label="下单日期" align="center" :formatter="jnpf.tableDateFormat1" fixed="left" width="90"/>
-          <el-table-column prop="custName" label="客户名称" align="center" />
-          <el-table-column prop="ordType" label="订单类型" align="center">
+          <el-table-column prop="custName" label="客户名称" align="center" width="200"/>
+          <el-table-column prop="ordType" label="订单类型" align="center" width="120">
             <template slot-scope="scope">
               {{ scope.row.ordType == 1 ? '备库订单' : scope.row.ordType == 2 ? '销售订单' : scope.row.ordType }}
             </template>
@@ -74,21 +74,21 @@
               {{ scope.row.isUrgent == 0 ? '是' : scope.row.isUrgent == 1 ? '否' : scope.row.isUrgent }}
             </template>
           </el-table-column>
-          <el-table-column prop="contractNo" label="合同编号" align="center"/>
+          <el-table-column prop="contractNo" label="合同编号" align="center" width="150"/>
           <el-table-column prop="saleManName" label="业务人员" align="center"/>
           <el-table-column prop="isChange" label="是否变更" align="center">
             <template slot-scope="scope">
               {{ scope.row.isChange == 0 ? '是' : scope.row.isChange == 1 ? '否' : scope.row.isChange }}
             </template>
           </el-table-column>
-          <el-table-column prop="proStatus" label="生产状态" align="center">
+          <el-table-column prop="proStatus" label="生产状态" align="center" width="120">
             <template slot-scope="scope">
               {{ scope.row.proStatus == 0 ? '正常' : scope.row.proStatus == 1 ? '部分转生产' : scope.row.proStatus == 2 ? "全部转生产":scope.row.proStatus}}
             </template>
           </el-table-column>
 
-          <el-table-column prop="qualityReq" label="质量要求" align="center"/>
-          <el-table-column prop="packReq" label="包装要求" align="center"/>
+          <el-table-column prop="qualityReq" label="质量要求" align="center" width="180"/>
+          <el-table-column prop="packReq" label="包装要求" align="center" width="180"/>
           <el-table-column prop="ordStatus" label="订单状态" align="center">
             <template slot-scope="scope">
               {{ (ordStatusOptions.find(item => item.enCode == scope.row.ordStatus) || {}).fullName || scope.row.ordStatus }}
@@ -103,8 +103,8 @@
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row,'update')" v-if='scope.row.ordStatus=="1"||scope.row.ordStatus=="5"' >编辑</el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-if='scope.row.ordStatus=="1"||scope.row.ordStatus=="5"'>作废</el-button>
-              <el-button type="text" @click="addOrUpdateHandle(scope.row,'change')" v-if='scope.row.ordStatus=="2"' >订单变更</el-button>
-              <el-button type="text" @click="addOrUpdateHandle(scope.row,'detail')" v-if='scope.row.ordStatus!="3"' >详情</el-button>
+              <el-button type="text" @click="addOrUpdateHandle(scope.row,'change')" v-if='scope.row.ordStatus=="3"' >订单变更</el-button>
+              <el-button type="text" @click="addOrUpdateHandle(scope.row,'detail')">详情</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
@@ -436,9 +436,14 @@ export default {
     },
     //初始化查询的默认数据
     async initSearchData() {
-      let date = new Date();
-      let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
-      this.query.ordDate = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
+      const now = new Date()
+      const year = now.getFullYear()
+      const month = String(now.getMonth() + 1).padStart(2, '0')
+      const startDate = `${year}-${month}-01 00:00:00`
+      const startDateTimestamp = new Date(startDate).getTime()
+      const endDate = `${year}-${month}-${new Date(year, now.getMonth() + 1, 0).getDate()}`
+      const endDateTimestamp = new Date(endDate).getTime()
+      this.query.ordDate = [startDateTimestamp, endDateTimestamp]
     },
     initData() {
       this.listLoading = true;
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/Detail.vue
new file mode 100644
index 0000000..fbf9716
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/Detail.vue
@@ -0,0 +1,206 @@
+<template>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" content="详情" />
+        <div class="options">
+          <el-button @click="goBack">取 消</el-button>
+        </div>
+      </div>
+      <el-row :gutter="15" class="main" :style="{ margin: '0 auto', width: '100%' }">
+        <el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right">
+          <template v-if="!loading">
+            <el-col :span="12">
+              <jnpf-form-tip-item label="供应商" prop="supplierId">
+                <p>{{ dataForm.supplierId }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="物料编码" prop="materialCode">
+                <p>{{ dataForm.materialCode }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="规格">
+                <p>{{ dataForm.materialCode_device_code }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="生产日期（批号）" prop="productLot">
+                <JnpfInput v-model="dataForm.productLot" placeholder="请输入" disabled detailed clearable :style="{ width: '100%' }"> </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="到货日期" prop="recieveDate">
+                <p>{{ dataForm.recieveDate }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="检验日期" prop="checkDate">
+                <p>{{ dataForm.checkDate }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="到货数量(kg)" prop="recieveKg">
+                <JnpfNumber v-model="dataForm.recieveKg" placeholder="数字文本" disabled :step="10"> </JnpfNumber>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="到货数量(件)" prop="recievePiece">
+                <JnpfNumber v-model="dataForm.recievePiece" placeholder="数字文本" disabled :step="10"> </JnpfNumber>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="抽检数量(件)" prop="sampleQty">
+                <JnpfNumber v-model="dataForm.sampleQty" placeholder="数字文本" disabled :step="10"> </JnpfNumber>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="检验结果" prop="checkResult">
+                <p>{{ dataForm.checkResult }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="处理结果" prop="processResult">
+                <p>{{ dataForm.processResult }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="问题原因" prop="problemReason">
+                <p>{{ dataForm.problemReason }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="备注" prop="remark">
+                <p>{{ dataForm.remark }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2>检验数据明细</h2>
+                </div>
+                <el-table :data="dataForm.tableField120" size="mini">
+                  <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+                  <el-table-column prop="avgValue" label="平均值" align="" fixed="${config.tableFixed}">
+                    <template slot-scope="scope">
+                      <JnpfNumber v-model="scope.row.avgValue" placeholder="数字文本" disabled :step="1"> </JnpfNumber>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="remark" label="备注" align="" fixed="${config.tableFixed}">
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.remark" placeholder="请输入" disabled detailed clearable :style="{ width: '100%' }"> </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="checkResult" label="判定结果" align="" fixed="${config.tableFixed}">
+                    <template slot-scope="scope">
+                      <p>{{ scope.row.checkResult }}</p>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2>样品数据</h2>
+                </div>
+                <el-table :data="dataForm.tableField126" size="mini">
+                  <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+                  <el-table-column prop="actValue" label="实际的检验值" align="" fixed="${config.tableFixed}">
+                    <template slot-scope="scope">
+                      <JnpfNumber v-model="scope.row.actValue" placeholder="数字文本" disabled :step="1"> </JnpfNumber>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </jnpf-form-tip-item>
+            </el-col>
+          </template>
+        </el-form>
+      </el-row>
+    </div>
+  </transition>
+</template>
+<script>
+  import request from '@/utils/request';
+
+  import { getConfigData } from '@/api/onlineDev/visualDev';
+  import jnpf from '@/utils/jnpf';
+  import Detail from '@/views/basic/dynamicModel/list/detail';
+  import { thousandsFormat } from '@/components/Generator/utils/index';
+  export default {
+    components: { Detail },
+    props: [],
+    data() {
+      return {
+        visible: false,
+        detailVisible: false,
+        loading: false,
+
+        //掩码配置
+        maskConfig: {
+          productLot: {},
+          qa_material_check_data_twremark: {},
+        },
+        //定位属性
+        locationScope: {},
+
+        dataForm: {},
+        checkResultOptions: [
+          { fullName: '合格', id: '1' },
+          { fullName: '不合格', id: '0' },
+        ],
+        checkResultProps: { label: 'fullName', value: 'id' },
+
+        checkResultOptions: [
+          { fullName: '合格', id: '1' },
+          { fullName: '不合格', id: '0' },
+        ],
+        checkResultProps: { label: 'fullName', value: 'id' },
+      };
+    },
+    computed: {},
+    watch: {},
+    created() {},
+    mounted() {},
+    methods: {
+      toDetail(defaultValue, modelId) {
+        if (!defaultValue) return;
+        getConfigData(modelId).then(res => {
+          if (!res.data || !res.data.formData) return;
+          let formData = JSON.parse(res.data.formData);
+          formData.popupType = 'general';
+          this.detailVisible = true;
+          this.$nextTick(() => {
+            this.$refs.Detail.init(formData, modelId, defaultValue);
+          });
+        });
+      },
+      dataInfo(dataAll) {
+        let _dataAll = dataAll;
+        this.dataForm = _dataAll;
+      },
+
+      goBack() {
+        this.$emit('refresh');
+      },
+      init(id) {
+        this.dataForm.id = id || 0;
+        this.visible = true;
+        this.$nextTick(() => {
+          if (this.dataForm.id) {
+            this.loading = true;
+            request({
+              url: '/api/example/Qa_material_check_data/detail/' + this.dataForm.id,
+              method: 'get',
+            }).then(res => {
+              this.dataInfo(res.data);
+              this.loading = false;
+            });
+          }
+        });
+      },
+    },
+  };
+</script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/columnList.js b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/columnList.js
new file mode 100644
index 0000000..139b719
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/columnList.js
@@ -0,0 +1,2 @@
+const columnList = [{"popupType":"dialog","hasPage":true,"pageSize":20,"columnOptions":[{"label":"母件编码","value":"piece_id"},{"label":"母件名称","value":"piece_name"},{"label":"规格型号","value":"models"},{"label":"计量单位","value":"unit"},{"label":"版本","value":"version_code"}],"align":"left","templateJson":[],"__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"产品名称","trigger":"change","showLabel":true,"required":true,"tableName":"qa_final_check_data","renderKey":1728102516239,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":12},"prop":"checkSeq","__vModel__":"checkSeq","disabled":false,"id":"checkSeq","placeholder":"请选择","interfaceName":"查询产品信息","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"产品名称","label":"产品名称","sortable":false,"relationField":"piece_name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"605051365542070405","propsValue":"id"},{"jnpfKey":"popupAttr","fullName":"产品货号","label":"产品货号","sortable":false,"align":"left","relationField":"checkSeq_jnpfTable_qa_final_check_data1","isStorage":1,"__config__":{"formId":110,"visibility":["pc","app"],"jnpfKey":"popupAttr","noShow":false,"defaultValue":"","tipLabel":"","dragDisabled":false,"className":[],"label":"产品货号","showLabel":true,"required":false,"renderKey":1728103741201,"tableName":"qa_final_check_data","layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup-attr","tag":"JnpfPopupAttr","span":12},"showField":"piece_id","prop":"productNumber","width":0,"__vModel__":"productNumber","fixed":"none","style":{"width":"100%"},"id":"productNumber"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"生产批号","label":"生产批号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"生产批号","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102534593,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"productLot","showWordLimit":false,"width":0,"__vModel__":"productLot","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"productLot","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"jnpfKey":"userSelect","ableIds":[],"multiple":false,"fullName":"检验人员","label":"检验人员","sortable":false,"align":"left","relationField":"","__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"检验人员","trigger":"change","showLabel":true,"required":false,"relationField":"","tableName":"qa_final_check_data","renderKey":1728102556217,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":12},"prop":"checkUserName","width":0,"__vModel__":"checkUserName","fixed":"none","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"checkUserName","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"检验日期","label":"检验日期","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102580205,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":106,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"检验日期","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":12},"readonly":false,"prop":"checkDate","width":0,"__vModel__":"checkDate","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"checkDate","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"jnpfKey":"inputNumber","fullName":"抽检数量(件)","label":"抽检数量(件)","sortable":false,"align":"left","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"抽检数量(件)","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102608266,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":12},"prop":"sampleQty","width":0,"__vModel__":"sampleQty","fixed":"none","style":{"width":null},"step":1,"disabled":false,"id":"sampleQty","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"jnpfKey":"radio","fullName":"检验结果","label":"检验结果","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"default","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"检验结果","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102616208,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":12},"size":"small","prop":"checkResult","width":0,"options":[{"fullName":"合格","id":"1"},{"fullName":"不合格","id":"0"}],"__vModel__":"checkResult","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"checkResult","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"maxlength":null,"jnpfKey":"textarea","fullName":"备注","label":"备注","sortable":false,"align":"left","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102621547,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":14},"readonly":false,"prop":"remark","showWordLimit":true,"width":0,"__vModel__":"remark","fixed":"none","style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"请输入","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}}]
+export default columnList
\ No newline at end of file
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/form.vue
new file mode 100644
index 0000000..997f115
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/form.vue
@@ -0,0 +1,1247 @@
+<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>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+                 label-position="right"
+        >
+          <!-- 具体表单 -->
+          <el-col :span="24">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+            </div>
+          </el-col>
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="6">
+              <jnpf-form-tip-item
+                label="订单编号" prop="saleOrdNo"
+              >
+                <JnpfInput v-model="dataForm.saleOrdNo" disabled
+                           placeholder="自动生成" clearable :style='{"width":"100%"}'
+                >
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="订单类型" prop="ordType">
+                <JnpfSelect v-model="dataForm.ordType"  placeholder="请选择" filterable disabled
+                            :style='{ "width": "100%" }' :options="ordTypeOptions"
+                            :props="ordTypeProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="订单状态" prop="ordStatus">
+                <JnpfSelect v-model="dataForm.ordStatus"  placeholder="请选择"
+                            disabled :style='{ "width": "100%" }' :options="ordStatusOptions"
+                            :props="ordStatusProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="下单日期"  prop="ordDate">
+                <JnpfDatePicker v-model="dataForm.ordDate"
+                                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                                disabled :style='{ "width": "100%" }' format="yyyy-MM-dd">
+                </JnpfDatePicker>
+              </jnpf-form-tip-item>
+            </el-col>
+
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="业务部门" prop="saleDeptId">
+                <el-select v-model="dataForm.saleDeptId" placeholder="请选择" clearable ref="saleDeptSelect" disabled
+                          :style='{ "width": "100%" }' @clear="saleDeptIdLabel = ''">
+                  <el-option :value="dataForm.saleDeptId" :label="saleDeptIdLabel" style="height: auto; padding: 0;">
+                    <el-tree
+                      :data="saleDeptIdOptions"
+                      :props="{ children: 'children', label: 'name' }"
+                      @node-click="handleDeptSelect"
+                      node-key="id"
+                      default-expand-all
+                      :expand-on-click-node="true">
+                    </el-tree>
+                  </el-option>
+                </el-select>
+              </jnpf-form-tip-item>
+            </el-col>
+
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="业务人员" prop="saleMan">
+                <JnpfSelect v-model="dataForm.saleMan"  placeholder="请选择" filterable disabled
+                            :style='{ "width": "100%" }' :options="userIdOptions"
+                            :props="userIdProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="客户名称" prop="custId">
+                <JnpfSelect v-model="dataForm.custId"  placeholder="请选择" filterable disabled
+                            :style='{ "width": "100%" }' :options="custIdOptions" @change="handleCustChange"
+                            :props="custIdProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="是否急单"  prop="isUrgent">
+                <JnpfRadio v-model="dataForm.isUrgent"
+                           disabled optionType="default" direction="horizontal"
+                           size="small" :options="isUrgentOptions" :props="isUrgentProps">
+                </JnpfRadio>
+              </jnpf-form-tip-item>
+            </el-col>
+
+
+
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="交货日期"  prop="reqDeliveryDate">
+                <JnpfDatePicker v-model="dataForm.reqDeliveryDate"
+                                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                                disabled :style='{ "width": "100%" }' format="yyyy-MM-dd" >
+                </JnpfDatePicker>
+              </jnpf-form-tip-item>
+            </el-col>
+
+            <el-col :span="6">
+              <jnpf-form-tip-item
+                label="合同编号" prop="contractNo"
+              >
+                <JnpfInput v-model="dataForm.contractNo" disabled
+                           placeholder="自动生成" clearable :style='{"width":"100%"}'
+                >
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="付款方式" >
+                <JnpfSelect v-model="dataForm.paymentTerms"  placeholder="请选择" filterable disabled
+                            :style='{ "width": "100%" }' :options="paymentTermsOptions"
+                            :props="paymentTermsProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="是否变更"  prop="isChange">
+                <JnpfRadio v-model="dataForm.isChange"
+                           disabled optionType="default" direction="horizontal"
+                           size="small" :options="isUrgentOptions" :props="isUrgentProps">
+                </JnpfRadio>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="6">
+              <jnpf-form-tip-item
+                label="税率" prop="taxRate"
+              >
+                <JnpfInput v-model="dataForm.taxRate"  disabled
+                           @blur="handleNumberInput('taxRate')"
+                           placeholder="两位小数" clearable :style='{"width":"100%"}'
+                >
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="6">
+              <jnpf-form-tip-item
+                label="含税总金额" prop="totalAmount"
+              >
+                <JnpfInput v-model="dataForm.totalAmount" :addon-after="'人民币'" disabled
+                           @blur="handleNumberInput('totalAmount')"
+                           placeholder="两位小数" clearable :style='{"width":"100%"}'
+                >
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+
+            <el-col :span="6" >
+              <jnpf-form-tip-item label="发货状态" prop="deliveryStatus">
+                <JnpfSelect v-model="dataForm.deliveryStatus"  placeholder="请选择" filterable disabled
+                            :style='{ "width": "100%" }' :options="deliveryStatusOptions"
+                            :props="deliveryStatusProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12"  >
+              <jnpf-form-tip-item label="包装要求"  prop="packReq">
+                <JnpfTextarea v-model="dataForm.packReq"  placeholder="请输入"
+                              disabled :style='{"width":"100%"}'  type="textarea"
+                              :auto-size='{"minRows":4,"maxRows":4}'>
+                </JnpfTextarea>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12"  >
+              <jnpf-form-tip-item label="质量要求" prop="qualityReq">
+                <JnpfTextarea v-model="dataForm.qualityReq"  placeholder="请输入" disabled
+                              :style='{"width":"100%"}'  type="textarea"
+                              :auto-size='{"minRows":4,"maxRows":4}'>
+                </JnpfTextarea>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <div style="padding:15px 0px">
+                <span style="color: #409EFF;">▋</span>
+                <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">产品信息</span>
+              </div>
+            </el-col>
+            <el-col :span="24" >
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2></h2>
+                </div>
+                <el-table :data="dataForm.orderDetailList" size='mini'
+                        >
+                  <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+                  <el-table-column label="物料名称"
+                                   prop="materialName" width="150"
+                                   align="center" >
+                    <template slot="header">
+                      物料名称(<span class="required-sign"
+                    >*</span>)
+                    </template>
+                    <template slot-scope="scope">
+                      {{scope.row.materialName}}
+<!--                        <materialslect v-model="scope.row.materialId"  placeholder="请选择" filterable :disabled="false"-->
+<!--                                    :style='{ "width": "100%" }' :options="materialIdOptions"-->
+<!--                                    :props="materialIdProps">-->
+<!--                        </materialslect>-->
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="规格型号"
+                                   prop="spec" width="150"
+                                   align="center">
+                    <template slot="header">
+                      规格型号(<span class="required-sign"
+                    >*</span>)
+                    </template>
+                    <template slot-scope="scope">
+                      {{scope.row.spec}}
+<!--                      <JnpfSelect v-model="scope.row.spec"  placeholder="请选择" filterable :disabled="false"-->
+<!--                                  :style='{ "width": "100%" }' :options="specOptions"-->
+<!--                                  :props="specProps">-->
+<!--                      </JnpfSelect>-->
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="单位"
+                                   prop="unit" width="150"
+                                   align="center">
+                    <template slot="header">
+                      单位(<span class="required-sign"
+                    >*</span>)
+                    </template>
+                    <template slot-scope="scope">
+                      {{scope.row.unitName}}
+                      <!--                      <JnpfSelect v-model="scope.row.unit"  placeholder="请选择" filterable :disabled="false"-->
+<!--                                  :style='{ "width": "100%" }' :options="unitOptions"-->
+<!--                                  :props="unitProps">-->
+<!--                      </JnpfSelect>-->
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="订单数量"
+                                   width="150" align="center">
+                    <template slot="header">
+                      订单数量(<span class="required-sign"
+                    >*</span>)
+                    </template>
+                    <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.ordQty"
+                                 placeholder="请输入" disabled
+                                 @blur="handleTableNumberInput(scope, 'ordQty')"
+                                 clearable :style='{ "width": "100%" }'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="含税单价"
+                                   width="150" align="center">
+                    <template slot="header">
+                      含税单价(<span class="required-sign"
+                    >*</span>)
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.priceTax" disabled
+                                 placeholder="请输入"
+                                 clearable :style='{ "width": "100%" }'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="用途"
+                                   prop="materialUse" width="150"
+                                   align="center">
+                    <template slot="header">
+                      用途(<span class="required-sign"
+                    >*</span>)
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfSelect v-model="scope.row.materialUse"  placeholder="请选择" filterable disabled
+                                  :style='{ "width": "100%" }' :options="materialUseOptions"
+                                  :props="materialUseProps">
+                      </JnpfSelect>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="发货数量"  prop="deliveriedQty"
+                                   width="150" align="center">
+                    <template slot-scope="scope">
+<!--                      <JnpfInput v-model="scope.row.deliveriedQty"-->
+<!--                                 placeholder="请输入"-->
+<!--                                 @input="handleTableNumberInput(scope, 'ordQty')"-->
+<!--                                 clearable :style='{ "width": "100%" }'>-->
+<!--                      </JnpfInput>-->
+                      {{scope.row.deliveriedQty}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="已转生产数量"  prop="produceQty"
+                                   width="150" align="center">
+                    <template slot-scope="scope">
+                      <!--                      <JnpfInput v-model="scope.row.deliveriedQty"-->
+                      <!--                                 placeholder="请输入"-->
+                      <!--                                 @input="handleTableNumberInput(scope, 'ordQty')"-->
+                      <!--                                 clearable :style='{ "width": "100%" }'>-->
+                      <!--                      </JnpfInput>-->
+                      {{scope.row.produceQty}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="备注"  prop="remark"
+                                   width="250" align="center">
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.remark"
+                                 placeholder="请输入"  disabled
+                                 clearable :style='{ "width": "100%" }'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <template>
+                    <el-table-column label="操作" width="70"
+                                     align="center">
+                      <template slot-scope="scope">
+
+                      </template>
+                    </el-table-column>
+                  </template>
+                </el-table>
+<!--                <template >-->
+<!--                  <div class="table-actions" @click="addOrderDetailListList">-->
+<!--                    <el-button type="text" icon="el-icon-plus">添加</el-button>-->
+<!--                  </div>-->
+<!--                </template>-->
+              </jnpf-form-tip-item>
+            </el-col>
+
+            <el-col :span="24">
+              <div style="padding:15px 0px">
+                <span style="color: #409EFF;">▋</span>
+                <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">附件信息
+                </span>
+              </div>
+            </el-col>
+
+            <el-col :span="24">
+              <jnpf-form-tip-item label="附件"  prop="attFile">
+                <JnpfUploadFile v-model="dataForm.attFile" disabled
+                                tipText="支持格式： doc,docx,xls,xlsx,ppt,pptx,pdf 单个文件不能超过20MB" :fileSize="20" sizeUnit="MB" :limit="9"
+                                pathType="defaultPath" :isAccount="0" buttonText="点击上传">
+                </JnpfUploadFile>
+              </jnpf-form-tip-item>
+            </el-col>
+
+          </template>
+          <el-col :span="24">
+            <div class="footer-buttons" style="text-align: center; margin-top: 20px;">
+
+              <el-button type="primary" @click="dataFormSubmit(3)" :loading="btnLoading" :disabled="continueBtnLoading" v-if="isDetail!='detail'">
+                审 核
+              </el-button>
+              <el-button type="danger"    @click="dataFormSubmit(5)" :loading="btnLoading" :disabled="continueBtnLoading" v-if="isDetail!='detail'" style="margin-left: 20px;">
+               打 回
+              </el-button>
+              <el-button @click="goBack" style="margin-left: 20px;">取 消</el-button>
+            </div>
+          </el-col>
+        </el-form>
+        <el-dialog
+          title="选择"
+          :close-on-click-modal="false"
+          :visible.sync="itemVisible"
+          class="JNPF-dialog JNPF-dialog_center"
+          lock-scroll
+          append-to-body
+          width="1000px"
+          height="400px"
+          @close="selectCancel()"
+        >
+          <el-row class="JNPF-common-search-box" :gutter="16">
+            <el-form @submit.native.prevent>
+              <el-col :span="8">
+                <el-form-item label="产品编码">
+                  <el-input v-model="listQuery.matCode" placeholder="请输入产品编码查询" clearable  class="search-input" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="产品名称">
+                  <el-input v-model="listQuery.matName" placeholder="请输入产品名称查询" clearable class="search-input" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="规格型号">
+                  <el-input v-model="listQuery.spec" placeholder="请输入规格型号查询" clearable class="search-input" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item>
+                  <el-button type="primary" icon="el-icon-search" @click="search()">
+                    {{ $t('common.search') }}
+                  </el-button>
+                  <el-button icon="el-icon-refresh-right" @click="reset()">{{ $t('common.reset') }} </el-button>
+                </el-form-item>
+              </el-col>
+            </el-form>
+
+          </el-row>
+          <JNPF-table v-loading="listLoading" :data="list" :border="false" highlight-current-row @row-dblclick="rowClickMultiple" :hasNO="false" height="400px">
+            <el-table-column width="35">
+              <template slot-scope="scope">
+                <!-- <el-radio :label="scope.row.id" v-model="checked">&nbsp;</el-radio> -->
+                <el-checkbox :value="selectedIds.includes(scope.row.id)" @change="() => rowClickMultiple(scope.row)" class="table-checkbox">&nbsp;</el-checkbox>
+              </template>
+            </el-table-column>
+            <el-table-column type="index" width="50" label="序号" align="center" />
+            <el-table-column :prop="item.value" :label="item.label" v-for="(item, i) in materialOptions" :key="i"  align="center"/>
+          </JNPF-table>
+          <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
+          <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="add()" size="small">保存</el-button>
+        <el-button @click="selectCancel()" size="small">取消</el-button>
+      </span>
+        </el-dialog>
+      </el-row>
+    </div>
+  </transition>
+</template>
+
+
+<script>
+import request from '@/utils/request'
+import { mapGetters } from 'vuex'
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+
+import {
+  getDateDay,
+  getLaterData,
+  getBeforeData,
+  getBeforeTime,
+  getLaterTime
+} from '@/components/Generator/utils/index.js'
+import Materialslect from "@/views/example/order/materialslect.vue";
+
+export default {
+  components: {Materialslect},
+  props: [],
+  data() {
+    return {
+      listLoading: false,
+      list: [],
+      selectedData: [],
+      selectedIds: [],
+      itemVisible:false,
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      total: 0,
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {},
+      materialOptions: [
+        { label: '产品编码', value: 'matCode' },
+        { label: '产品名称', value: 'matName' },
+        { label: '规格型号', value: 'spec' },
+        { label: '单位', value: 'unitName' },
+        { label: '物料类型', value: 'matType' },
+      ],
+      isDetail:'',
+      //可选范围默认值
+      ableAll: {},
+      tableRows: {},
+      Vmodel: '',
+      currVmodel: '',
+      dataForm: {
+        id: undefined,
+        saleOrdNo: undefined,
+        contractNo: undefined,
+        saleDeptId: undefined,
+        custId: undefined,
+        custName: undefined,
+        projectName: undefined,
+        contact: undefined,
+        conPhone: undefined,
+        reqDeliveryDate: undefined,
+        ordType: undefined,
+        paymentTerms: undefined,
+        totalAmount: undefined,
+        isChange: "1",
+        packReq: undefined,
+        qualityReq: undefined,
+        taxRate: undefined,
+        saleMan: undefined,
+        attFile:undefined,
+        isUrgent:"1",
+        version: 0,
+        deliveryStatus:"1",
+        ordDate:undefined,
+        ordStatus: "1",
+        remark: undefined,
+        orderDetailList:[]
+      },
+      saleDeptIdLabel: '',
+      tableRequiredData: {},
+      dataRule: {
+        ordDate: [
+          { required: true, message: '请选择下单日期', trigger: 'change' }
+        ],
+        ordStatus: [
+          { required: true, message: '请选择订单状态', trigger: 'change' }
+        ],
+        saleDeptId: [
+          { required: true, message: '请选择业务部门', trigger: 'change' }
+        ],
+        saleMan: [
+          { required: true, message: '请选择业务人员', trigger: 'change' }
+        ],
+        isUrgent: [
+          { required: true, message: '请选择是否急单', trigger: 'change' }
+        ],
+        reqDeliveryDate: [
+          { required: true, message: '请选择交货日期', trigger: 'change' }
+        ],
+        ordType: [
+          { required: true, message: '请选择订单类型', trigger: 'change' }
+        ],
+        isChange: [
+          { required: true, message: '请选择是否变更', trigger: 'change' }
+        ]
+      },
+      ordStatusOptions: [
+      ],
+      ordStatusProps: { label: "fullName", value: "enCode" },
+      saleDeptIdOptions: [],
+      saleDeptIdProps: { 'label': 'name', 'value': 'id', 'children': 'children', 'emitPath': false, 'checkStrictly': true },
+      userIdOptions: [],
+      userIdProps: { 'label': 'realName', 'value': 'id' },
+      custIdOptions: [],
+      custIdProps: { 'label': 'name', 'value': 'id' },
+      materialIdOptions: [],
+      materialIdProps: { 'label': 'mat_name', 'labels':"mat_code", 'value': 'id' },
+      ordTypeOptions: [
+        { fullName: "备库订单", id: "1" },
+        { fullName: "销售订单", id: "2" },
+      ],
+      ordTypeProps: { label: "fullName", value: "id" },
+      paymentTermsOptions: [
+        { fullName: "预付", id: "1" },
+        { fullName: "月付", id: "2" },
+        { fullName: "承兑", id: "3" },
+      ],
+      paymentTermsProps: { label: "fullName", value: "id" },
+      deliveryStatusOptions: [
+        { fullName: "未发货", id: "1" },
+        { fullName: "部分发货", id: "2" },
+        { fullName: "全部发货", id: "3" },
+      ],
+      deliveryStatusProps: { label: "fullName", value: "id" },
+      isUrgentOptions: [
+        { fullName: "是", id: "0" },
+        { fullName: "否", id: "1" },
+      ],
+      isUrgentProps: { label: "fullName", value: "id" },
+      specOptions: [
+        { fullName: "9cm", id: "9cm" }
+      ],
+      specProps: { label: "fullName", value: "id" },
+      unitOptions: [
+        { fullName: "kg", id: "1" },
+        { fullName: "T", id: "2" }
+      ],
+      unitProps: { label: "fullName", value: "id" },
+      matTypeOptions: [
+        { fullName: "原材料", id: "1" },
+        { fullName: "半成品", id: "2" },
+        { fullName: "成品", id: "3" },
+      ],
+      materialUseOptions: [
+        { fullName: "用途1", id: "1" },
+        { fullName: "用途2", id: "2" },
+        { fullName: "用途3", id: "3" }
+      ],
+      materialUseProps: { label: "fullName", value: "id" },
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        matCode:undefined,
+        matName:undefined,
+        spec:undefined,
+      },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        code: [],
+        name: [],
+        spec: [],
+        photo: [],
+        productTypeId: [],
+        brandId: [],
+        inventoryUnitId: [],
+        batchNumber: [],
+        businessNo: [],
+        relevanceBusinessNo: [],
+        changeNumber: [],
+        warehouseId: [],
+        inventoryNumber: [],
+        purchasePrice: [],
+        retailPrice: [],
+        businessType: []
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() {
+  },
+  methods: {
+    getOrdStatusOptions() {
+      getDictionaryDataSelector("811520443046428805").then(res => {
+        this.ordStatusOptions = res.data.list;
+      });
+    },
+    selectCancel() {
+      this.initDefaultDatas()
+      this.itemVisible = false
+    },
+    add() {
+      let newArr = this.selectedData.filter(o => {
+        return this.dataForm.orderDetailList.every(item => {
+          return o.id !== item.materialId
+        })
+      })
+
+      newArr.forEach(o => {
+
+        let item = {
+          materialId: o.id,
+          materialCode:o.matCode,
+          materialName:o.matName,
+          spec: o.spec,
+          unit: o.unit,
+          unitName: o.unitName,
+        }
+        this.dataForm.orderDetailList.push(item)
+      })
+      this.initDefaultDatas()
+      this.itemVisible = false
+    },
+    search() {
+      this.listQuery.currentPage = 1
+      this.listQuery.pageSize = this.pageSize
+      this.initData()
+    },
+    initData() {
+      this.listLoading = true
+      let _query = {
+        ...this.listQuery,
+        matType:"3",
+        enabledStatus:1,
+      }
+      request({
+        url: `/api/example/material/getList`,
+        method: 'post',
+        data: _query,
+      }).then(res => {
+        this.list = res.data.list.map(item => ({
+          ...item,
+          unitName: this.getEnumLabel(this.unitOptions, item.unit),
+          matType: this.getEnumLabel(this.matTypeOptions, item.matType)
+        }))
+
+        this.total =  this.list.length
+        this.listLoading = false
+      })
+        .catch(() => {
+          this.listLoading = false
+        })
+
+    },
+    reset() {
+      this.listQuery.matCode = ''
+      this.listQuery.matName = ''
+      this.listQuery.spec = ''
+      this.listQuery.currentPage = 1
+      this.listQuery.pageSize = this.pageSize
+      this.initData()
+    },
+    getEnumLabel(options, value) {
+      if (value === undefined || value === null || value === '') return value;
+      const item = options.find(opt => opt.id == value);
+      return item ? item.fullName : value;
+    },
+    handleNumberInput(fieldName) {
+      let value = this.dataForm[fieldName];
+      if (value === undefined || value === null || value === '') {
+        return;
+      }
+      // 移除非数字字符（保留小数点）
+      value = value.toString().replace(/[^\d.]/g, '');
+      // 只允许一个小数点
+      const parts = value.split('.');
+      if (parts.length > 2) {
+        value = parts[0] + '.' + parts.slice(1).join('');
+      }
+      // 限制小数点后两位
+      if (value.includes('.')) {
+        const newParts = value.split('.');
+        if (newParts[1] && newParts[1].length > 2) {
+          value = newParts[0] + '.' + newParts[1].substring(0, 2);
+        }
+      }
+      this.dataForm[fieldName] = value;
+      this.$forceUpdate();
+    },
+    handleTableNumberInput(scope, fieldName) {
+      let value = scope.row[fieldName];
+      if (value === undefined || value === null || value === '') {
+        return;
+      }
+      // 移除非数字字符
+      value = value.toString().replace(/[^\d]/g, '');
+      // 不能以0开头（除非是单个0）
+      if (value.length > 1 && value.startsWith('0')) {
+        value = value.replace(/^0+/, '');
+        if (value === '') value = '0';
+      }
+      this.$set(scope.row, fieldName, value);
+    },
+    delOrderDetailListList(index) {
+      const row = this.dataForm.orderDetailList[index]
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
+        if (row.id) {
+          request({
+            url: `/api/example/orderDetail/delete/${row.id}`,
+            method: 'DELETE',
+          }).then(res => {
+            if (res.msg=='删除成功'){
+              this.$message({
+                type: 'success',
+                message: res.msg
+              })
+              this.dataForm.orderDetailList.splice(index, 1)
+            }else {
+              this.$message({
+                type: 'error',
+                message: res.msg
+              })
+            }
+          }).catch(() => {})
+        } else {
+          this.dataForm.orderDetailList.splice(index, 1)
+        }
+      }).catch(() => {
+      });
+    },
+    rowClickMultiple(row) {
+      const boo = this.selectedIds.includes(row.id)
+      if (boo) {
+        this.selectedData = this.selectedData.filter(o => o.id !== row.id)
+        this.selectedIds = this.selectedIds.filter(o => o !== row.id)
+      } else {
+
+        this.selectedData.push(row)
+        this.selectedIds.push(row.id)
+      }
+    },
+    addOrderDetailListList() {
+      this.listQuery.currentPage=1,
+        this.listQuery.pageSize=20,
+        this.listQuery.matCode='',
+        this.listQuery.matName='',
+        this.listQuery.spec='' ,
+        this.dataForm.orderDetailList.forEach(o => {
+        this.selectedIds.push(o.materialId)
+      })
+      this.itemVisible = true
+      this.initData()
+    },
+    prev() {
+      this.index
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index]
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index]
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/example/exampleOrder/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      })
+    },
+    goBack() {
+      this.$emit('refresh', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split('-')
+      let faceMode = ''
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i]
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options'
+              if (this[options]) {
+                this[options]()
+              }
+              this.changeData(key, index)
+            }
+          }
+        }
+      }
+    },
+
+    dataAll() {
+      this.getOrdStatusOptions()
+      this.getSaleDeptIdOptions()
+      // this.getUserIdOptions()
+      this.getCustIdOptions()
+      this.getMaterialIdOptions()
+    },
+    getSaleDeptIdOptions() {
+      return getDataInterfaceRes('811583643129479301').then(res => {
+        let data = res.data
+        this.saleDeptIdOptions = this.buildTree(data)
+        return this.saleDeptIdOptions
+      })
+    },
+    buildTree(list) {
+      if (!list || !list.length) return []
+      const tree = []
+      const map = {}
+      list.forEach(item => {
+        map[item.id] = { ...item, children: [] }
+      })
+      list.forEach(item => {
+        if (item.parentId && map[item.parentId]) {
+          map[item.parentId].children.push(map[item.id])
+        } else {
+          tree.push(map[item.id])
+        }
+      })
+      return tree
+    },
+    handleDeptSelect(data) {
+      this.dataForm.saleDeptId = data.id
+      this.saleDeptIdLabel = data.name
+      if (this.$refs.saleDeptSelect) {
+        this.$refs.saleDeptSelect.visible = false
+      }
+      this.getUserList()
+    },
+    getUserList(){
+      request({
+        url: '/api/example/exampleOrder/getByDeptId/' + this.dataForm.saleDeptId,
+        method: 'get'
+      }).then(res => {
+        this.userIdOptions=res.data;
+      })
+    },
+
+    findDeptNameById(id, list) {
+      if (!id || !list || !list.length) return ''
+      for (let item of list) {
+        if (item.id === id) {
+          return item.name
+        }
+        if (item.children && item.children.length) {
+          const found = this.findDeptNameById(id, item.children)
+          if (found) return found
+        }
+      }
+      return ''
+    },
+    // getUserIdOptions() {
+    //   getDataInterfaceRes('811594014137516101').then(res => {
+    //     let data = res.data
+    //     this.userIdOptions = data
+    //   })
+    // },
+    getCustIdOptions() {
+      getDataInterfaceRes('811594631945912389').then(res => {
+        let data = res.data
+        this.custIdOptions = data
+      })
+    },
+    getMaterialIdOptions() {
+      getDataInterfaceRes('811594958946435141').then(res => {
+        let data = res.data
+        this.materialIdOptions = data
+      })
+    },
+
+    handleCustChange(value) {
+      if (value) {
+        const customer = this.custIdOptions.find(item => item.id === value)
+        if (customer) {
+          this.dataForm.custName = customer.name
+        }
+      } else {
+        this.dataForm.custName = undefined
+      }
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.isDetail = isDetail
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
+          this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true
+        }
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0
+      this.visible = true
+
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/example/exampleOrder/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.getUserList()
+            this.loading = false
+          })
+        } else {
+          this.clearData()
+          this.initDefaultData()
+        }
+      })
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
+      if (!this.dataForm.ordDate) {
+        const today = new Date()
+        today.setHours(0, 0, 0, 0)
+        this.dataForm.ordDate = today.getTime()
+      }
+    },
+    initDefaultDatas() {
+      this.selectedIds = []
+      this.selectedData = []
+      this.listQuery.matCode = ''
+      this.listQuery.matName = ''
+      this.listQuery.spec = ''
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      if (!this.dataForm.orderDetailList || this.dataForm.orderDetailList.length === 0){
+        this.$message({
+          type: 'error',
+          message: "订单产品信息不能为空，请确认！"
+        })
+        return
+      }
+      if (this.dataForm.ordType == '2' && !this.dataForm.custId){
+        this.$message({
+          type: 'error',
+          message: "订单类型是销售订单必须选择客户名称，请确认！"
+        })
+        return
+      }
+      // 校验订单详情必填字段
+      for (let i = 0; i < this.dataForm.orderDetailList.length; i++) {
+        const row = this.dataForm.orderDetailList[i]
+        const rowNumber = i + 1
+        if (!row.materialName || row.materialName === '') {
+          this.$message({
+            type: 'error',
+            message: `第${rowNumber}行的物料名称不能为空！`
+          })
+          return
+        }
+        if (!row.spec || row.spec === '') {
+          this.$message({
+            type: 'error',
+            message: `第${rowNumber}行的规格型号不能为空！`
+          })
+          return
+        }
+        if (!row.unitName || row.unitName === '') {
+          this.$message({
+            type: 'error',
+            message: `第${rowNumber}行的单位不能为空！`
+          })
+          return
+        }
+        if (!row.ordQty || row.ordQty === '') {
+          this.$message({
+            type: 'error',
+            message: `第${rowNumber}行的订单数量不能为空！`
+          })
+          return
+        }
+        if (!row.priceTax || row.priceTax === '') {
+          this.$message({
+            type: 'error',
+            message: `第${rowNumber}行的含税单价不能为空！`
+          })
+          return
+        }
+        if (!row.materialUse || row.materialUse === '') {
+          this.$message({
+            type: 'error',
+            message: `第${rowNumber}行的用途不能为空！`
+          })
+          return
+        }
+      }
+      let _data = this.dataForm
+        _data.ordStatus=this.dataFormSubmitType
+
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/example/exampleOrder',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
+                this.$nextTick(() => {
+                  this.clearData()
+                  this.initDefaultData()
+                })
+                this.continueBtnLoading = false
+                return
+              }
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/example/exampleOrder/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
+        }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = ''
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = ''
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+          }
+        }
+      }
+      return timeDataValue
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
+          }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = ''
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = ''
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        }
+      }
+      return timeDataValue
+    },
+    dataList() {
+      var _data = this.dataForm
+      return _data
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      const deptPromise = this.getSaleDeptIdOptions()
+      this.getOrdStatusOptions()
+      this.getCustIdOptions()
+      this.getMaterialIdOptions()
+
+      deptPromise.then(() => {
+        this.$nextTick(() => {
+          this.saleDeptIdLabel = this.findDeptNameById(this.dataForm.saleDeptId, this.saleDeptIdOptions)
+        })
+      })
+      this.childIndex = -1
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+::v-deep .el-tree-node__content.is-current {
+  font-weight: normal !important;
+}
+::v-deep .el-tree-node.is-current > .el-tree-node__content {
+  font-weight: normal !important;
+}
+::v-deep .el-tree-node__content:hover {
+  font-weight: normal !important;
+}
+</style>
+
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/index.vue
new file mode 100644
index 0000000..e705527
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/index.vue
@@ -0,0 +1,568 @@
+<template>
+  <div class="JNPF-common-layout finalcheckdata_new">
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent >
+          <el-col :span="8">
+              <el-form-item label="下单日期">
+                <JnpfDateRangePicker v-model="query.ordDate" format="yyyy-MM-dd" :clearable="false"
+                                     startPlaceholder="开始日期" endPlaceholder="结束日期" />
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="8" >
+            <el-form-item label="订单编号">
+              <el-input v-model="query.saleOrdNo" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="订单类型">
+              <JnpfSelect v-model="query.ordType" placeholder="请选择" clearable :options="ordTypeOptions"
+                          :props="ordTypeProps">
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="订单状态">
+              <JnpfSelect v-model="query.ordStatus" placeholder="请选择" clearable  filterable :options="ordStatusOptions"
+                          :props="ordStatusProps">
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否急单">
+              <JnpfSelect v-model="query.isUrgent" placeholder="请选择" clearable :options="isUrgentOptions"
+                          :props="isUrgentProps">
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" >
+            <el-form-item class="btn">
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+
+          </div>
+          <div class="JNPF-common-head-right">
+          </div>
+        </div>
+        <JNPF-table v-loading="listLoading" :data="list"
+          :span-method="arraySpanMethod" @selection-change="handleSelectionChange" :hasNOFixed="true" border>
+          <el-table-column prop="saleOrdNo" label="订单编码" align="center" fixed="left" width="100"/>
+          <el-table-column prop="ordDate" label="下单日期" align="center" :formatter="jnpf.tableDateFormat1" fixed="left" width="90"/>
+          <el-table-column prop="custName" label="客户名称" align="center" width="200"/>
+          <el-table-column prop="ordType" label="订单类型" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.ordType == 1 ? '备库订单' : scope.row.ordType == 2 ? '销售订单' : scope.row.ordType }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="reqDeliveryDate" label="要求交货日期" align="center" :formatter="jnpf.tableDateFormat1" width="100"/>
+          <el-table-column prop="isUrgent" label="是否急单" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.isUrgent == 0 ? '是' : scope.row.isUrgent == 1 ? '否' : scope.row.isUrgent }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="contractNo" label="合同编号" align="center" width="150"/>
+          <el-table-column prop="saleManName" label="业务人员" align="center"/>
+          <el-table-column prop="isChange" label="是否变更" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.isChange == 0 ? '是' : scope.row.isChange == 1 ? '否' : scope.row.isChange }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="proStatus" label="生产状态" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.proStatus == 0 ? '正常' : scope.row.proStatus == 1 ? '部分转生产' : scope.row.proStatus == 2 ? "全部转生产":scope.row.proStatus}}
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="qualityReq" label="质量要求" align="center" width="180"/>
+          <el-table-column prop="packReq" label="包装要求" align="center" width="180"/>
+          <el-table-column prop="ordStatus" label="订单状态" align="center">
+            <template slot-scope="scope">
+              {{ (ordStatusOptions.find(item => item.enCode == scope.row.ordStatus) || {}).fullName || scope.row.ordStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="deliveryStatus" label="发货状态" align="center" fixed="right">
+            <template slot-scope="scope">
+              {{ scope.row.deliveryStatus ==1  ? '未发货' : scope.row.deliveryStatus == 1 ? '部分发货' : scope.row.deliveryStatus == 2 ? "全部发货":scope.row.deliveryStatus}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" align="center" width="160" >
+            <template slot-scope="scope">
+              <el-button type="text" @click="addOrUpdateHandle(scope.row,'approval')" v-if='scope.row.ordStatus=="2"'>审批</el-button>
+              <el-button type="text" @click="addOrUpdateHandle(scope.row,'detail')">详情</el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
+      </div>
+    </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+
+    <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+
+  </div>
+</template>
+
+<script>
+import request from "@/utils/request";
+import { mapGetters } from "vuex";
+import JNPFForm from "./form";
+import Detail from "./Detail";
+import ExportBox from "@/components/ExportBox";
+import ToFormDetail from "@/views/basic/dynamicModel/list/detail";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import { getConfigData } from "@/api/onlineDev/visualDev";
+import columnList from "./columnList";
+import SuperQuery from "@/components/SuperQuery";
+import superQueryJson from "./superQueryJson";
+import { noGroupList } from "@/components/Generator/generator/comConfig";
+import {getDictionaryDataSelector} from "@/api/systemData/dictionary";
+import {formatDate} from "element-ui";
+import {toDate} from "@/filters";
+import jnpf from "@/utils/jnpf";
+
+
+export default {
+  name: "orderApproval",
+  components: {
+    JNPFForm,
+    Detail,
+    ExportBox,
+    ToFormDetail,
+    SuperQuery,
+
+  },
+  data() {
+    return {
+      keyword: "",
+      expandsTree: true,
+      refreshTree: true,
+      toFormDetailVisible: false,
+      hasBatchBtn: false,
+      expandObj: {},
+      columnOptions: [],
+      mergeList: [],
+      exportList: [],
+      columnList,
+      ordTypeOptions: [
+        { fullName: "备库订单", id: "1" },
+        { fullName: "销售订单", id: "2" },
+      ],
+      ordTypeProps: { label: "fullName", value: "id" },
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        saleOrdNo: undefined,
+        ordDate: undefined,
+        projectName: undefined,
+        isUrgent: undefined,
+        ordStatus: "2",
+        saleManName:undefined,
+      },
+      defListQuery: {
+        sort: "desc",
+        sidx: "",
+      },
+      //排序默认值
+
+      list: [],
+      listLoading: false,
+      multipleSelection: [],
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: "",
+        currentPage: 1,
+        pageSize: 20,
+        sort: "",
+        sidx: "",
+      },
+      //多列排序
+      ordersList: [],
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      isUrgentOptions: [
+        { fullName: "是", id: "0" },
+        { fullName: "否", id: "1" },
+      ],
+      isUrgentProps: { label: "fullName", value: "id" },
+      ordStatusOptions: [
+      ],
+      ordStatusProps: { label: "fullName", value: "enCode" },
+
+    };
+  },
+  computed: {
+    jnpf() {
+      return jnpf
+    },
+    ...mapGetters(["userInfo"]),
+    menuId() {
+      return this.$route.meta.modelId || "";
+    },
+  },
+  created() {
+    this.getColumnList(),
+      this.getOrdStatusOptions(),
+      this.initSearchDataAndListData();
+    this.queryData = JSON.parse(JSON.stringify(this.query));
+  },
+  methods: {
+    //  请求接口导出excel
+    exportExcel(row) {
+      request({
+        url: `/api/example/QaProMaterialCheck/exportExcel`,
+        method: "post",
+        data: {
+          id: row.id,
+          checkCode: row.printCode,
+          // checkCode: 2
+        }
+      }).then((res) => {
+        if (!res.data || !res.data.url) {
+          this.$message.error('导出失败：未返回下载地址');
+          return;
+        }
+        this.jnpf.downloadFile(res.data.url);
+        // 安全地关闭导出弹窗
+        if (this.$refs.ExportBox) {
+          this.$refs.ExportBox.visible = false;
+        }
+        this.exportBoxVisible = false;
+      }).catch(err => {
+        console.error('导出Excel失败:', err);
+        this.$message.error(err.message || '导出Excel失败，请重试');
+      });
+    },
+
+    getOrdStatusOptions() {
+      getDictionaryDataSelector("811520443046428805").then(res => {
+        this.ordStatusOptions = res.data.list;
+      });
+    },
+
+
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+
+
+    toDetail(defaultValue, modelId) {
+      if (!defaultValue) return;
+      getConfigData(modelId).then((res) => {
+        if (!res.data || !res.data.formData) return;
+        let formData = JSON.parse(res.data.formData);
+        formData.popupType = "general";
+        this.toFormDetailVisible = true;
+        this.$nextTick(() => {
+          this.$refs.toFormDetail.init(formData, modelId, defaultValue);
+        });
+      });
+    },
+    toggleTreeExpand(expands) {
+      this.refreshTree = false;
+      this.expandsTree = expands;
+      this.$nextTick(() => {
+        this.refreshTree = true;
+        this.$nextTick(() => {
+          this.$refs.treeBox.setCurrentKey(null);
+        });
+      });
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data[this.treeProps.label].indexOf(value) !== -1;
+    },
+    loadNode(node, resolve) {
+      const nodeData = node.data;
+      const config = {
+        treeInterfaceId: "",
+        treeTemplateJson: [],
+      };
+      if (config.treeInterfaceId) {
+        //这里是为了拿到参数中关联的字段的值，后端自行拿
+        if (config.treeTemplateJson && config.treeTemplateJson.length) {
+          for (let i = 0; i < config.treeTemplateJson.length; i++) {
+            const element = config.treeTemplateJson[i];
+            element.defaultValue = nodeData[element.relationField] || "";
+          }
+        }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
+        };
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then((res) => {
+          let data = res.data;
+          if (Array.isArray(data)) {
+            resolve(data);
+          } else {
+            resolve([]);
+          }
+        });
+      }
+    },
+    getColumnList() {
+      // 没有开启权限
+      this.columnOptions = this.transformColumnList(this.columnList);
+    },
+    transformColumnList(columnList) {
+      let list = [];
+      for (let i = 0; i < columnList.length; i++) {
+        const e = columnList[i];
+        if (!e.prop.includes("-")) {
+          list.push(e);
+        } else {
+          let prop = e.prop.split("-")[0];
+          let label = e.label.split("-")[0];
+          let vModel = e.prop.split("-")[1];
+          let newItem = {
+            align: "center",
+            jnpfKey: "table",
+            prop,
+            label,
+            children: [],
+          };
+          e.vModel = vModel;
+          if (!this.expandObj.hasOwnProperty(`${prop}Expand`))
+            this.$set(this.expandObj, `${prop}Expand`, false);
+          if (!list.some((o) => o.prop === prop)) list.push(newItem);
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].prop === prop) {
+              list[i].children.push(e);
+              break;
+            }
+          }
+        }
+      }
+      this.getMergeList(list);
+      // this.getExportList(list);
+      return list;
+    },
+    arraySpanMethod({ column }) {
+      for (let i = 0; i < this.mergeList.length; i++) {
+        if (column.property == this.mergeList[i].prop) {
+          return [this.mergeList[i].rowspan, this.mergeList[i].colspan];
+        }
+      }
+    },
+    getMergeList(list) {
+      let newList = JSON.parse(JSON.stringify(list));
+      newList.forEach((item) => {
+        if (item.children && item.children.length) {
+          let child = {
+            prop: item.prop + "-child-first",
+          };
+          item.children.unshift(child);
+        }
+      });
+      newList.forEach((item) => {
+        if (item.children && item.children.length) {
+          item.children.forEach((child, index) => {
+            if (index == 0) {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 1,
+                colspan: item.children.length,
+              });
+            } else {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 0,
+                colspan: 0,
+              });
+            }
+          });
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1,
+          });
+        }
+      });
+    },
+    getExportList(list) {
+      let exportList = [];
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === "table") {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j]);
+          }
+        } else {
+          exportList.push(list[i]);
+        }
+      }
+      this.exportList = exportList.filter(
+        (o) => !noGroupList.includes(o.__config__.jnpfKey)
+      );
+    },
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
+    },
+
+    async initSearchDataAndListData() {
+      await this.initSearchData();
+      // this.initData();
+    },
+    //初始化查询的默认数据
+    async initSearchData() {
+      const now = new Date()
+      const year = now.getFullYear()
+      const month = String(now.getMonth() + 1).padStart(2, '0')
+      const startDate = `${year}-${month}-01 00:00:00`
+      const startDateTimestamp = new Date(startDate).getTime()
+      const endDate = `${year}-${month}-${new Date(year, now.getMonth() + 1, 0).getDate()}`
+      const endDateTimestamp = new Date(endDate).getTime()
+      this.query.ordDate = [startDateTimestamp, endDateTimestamp]
+    },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        dataType: 0,
+      };
+      request({
+        url: `/api/example/exampleOrder/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          _list.push(_data);
+        }
+        this.list = _list.map((o) => ({
+          ...o,
+          ...this.expandObj,
+        }));
+        this.total = res.data.pagination.total;
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将作废该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          request({
+            url: `/api/example/exampleOrder/${id}`,
+            method: "DELETE",
+          }).then((res) => {
+            this.$message({
+              type: "success",
+              message: res.msg,
+              onClose: () => {
+                this.initData();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
+
+    addOrUpdateHandle(row, isDetail) {
+      let id = row ? row.id : "";
+      this.formVisible = true;
+      if (!this.treeActiveId) {
+        this.leftTreeActiveInfo = {};
+      }
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(
+          id,
+          isDetail,
+          this.list,
+          this.leftTreeActiveInfo
+        );
+      });
+    },
+
+    exportData() {
+      let temp = [
+        { label: "订单编码", prop: "saleOrdNo" },
+        { label: "下单日期", prop: "ordDate" },
+        { label: "客户名称", prop: "custName" },
+        { label: "订单类型", prop: "ordType" },
+        { label: "要求交货日期", prop: "reqDeliveryDate" },
+        { label: "是否急单", prop: "isUrgent" },
+        { label: "合同编号", prop: "contractNo" },
+        { label: "业务人员", prop: "saleManName" },
+        { label: "是否变更", prop: "isChange" },
+        { label: "生产状态", prop: "proStatus" },
+        { label: "质量要求", prop: "qualityReq" },
+        { label: "包装要求", prop: "packReq" },
+        { label: "订单状态", prop: "ordStatus" },
+        { label: "发货状态", prop: "deliveryStatus" },
+      ];
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(temp);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/exampleOrder/Actions/Export`,
+        method: "post",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      this.listQuery.pageSize = 20;
+      this.initData();
+      this.update_count += 1;
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.search();
+    },
+    reset() {
+      this.query = JSON.parse(JSON.stringify(this.queryData));
+      this.search();
+    },
+
+
+
+  },
+
+};
+</script>
+<style scoped>
+::v-deep .el-form-item__label {
+  text-align: left !important;
+}
+</style>
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/materialslect.vue b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/materialslect.vue
new file mode 100644
index 0000000..c2ca88c
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/materialslect.vue
@@ -0,0 +1,97 @@
+<template>
+  <el-select v-model="innerValue" :placeholder="placeholder" :clearable="clearable"
+    @change="onChange()" :multiple="multiple" :disabled="disabled" :filterable="filterable">
+    <el-option v-for="item in options" :key="item[props.value]" :label="item[props.label] +' ' + item[props.labels]"
+      :value="item[props.value]">
+    </el-option>
+  </el-select>
+</template>
+<script>
+export default {
+  name: 'materialslect',
+  components: {},
+  props: {
+    value: {
+      default: undefined
+    },
+    options: {
+      type: Array,
+      default: () => []
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    filterable: {
+      type: Boolean,
+      default: false
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    props: {
+      label: "fullName",
+      value: "id"
+    }
+  },
+  data() {
+    return {
+      innerValue: this.value,
+    }
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.innerValue = val
+      },
+      immediate: true
+    },
+  },
+  computed: {},
+  mounted() { },
+  methods: {
+    onChange() {
+      if (this.multiple) this.innerValue = this.innerValue ? this.innerValue : []
+      if (!this.multiple) this.innerValue = this.innerValue ? this.innerValue : ""
+      this.$emit('input', this.innerValue)
+      this.$emit('change', this.innerValue)
+    },
+  }
+
+}
+</script>
+<style lang="scss" scoped>
+.input-number {
+  width: 100%;
+  border-radius: 0px !important;
+  >>> .el-input__inner {
+    border-radius: 0px !important;
+  }
+}
+.select-item {
+  display: block;
+  margin: 10px 0;
+}
+.select-border {
+  display: block;
+  margin: 8px 0;
+}
+.select-horizontal {
+  display: inline-block;
+  line-height: 1;
+  vertical-align: middle;
+  margin: 0 10px;
+}
+.vertical-button {
+  margin: 5px 0;
+}
+</style>
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/superQueryJson.js
new file mode 100644
index 0000000..0884c78
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/example/orderapproval/superQueryJson.js
@@ -0,0 +1,2 @@
+const superQueryJson = [{"popupType":"dialog","hasPage":true,"clearable":true,"fullName":"产品名称","pageSize":20,"columnOptions":[{"label":"母件编码","value":"piece_id"},{"label":"母件名称","value":"piece_name"},{"label":"规格型号","value":"models"},{"label":"计量单位","value":"unit"},{"label":"版本","value":"version_code"}],"templateJson":[],"relationField":"piece_name","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"产品名称","trigger":"change","showLabel":true,"required":true,"tableName":"qa_final_check_data","renderKey":1728102516239,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":12},"popupTitle":"选择数据","__vModel__":"checkSeq","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"checkSeq","placeholder":"请选择","interfaceId":"605051365542070405","interfaceName":"查询产品信息","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"propsValue":"id"},{"isStorage":1,"__config__":{"formId":110,"visibility":["pc","app"],"jnpfKey":"popupAttr","noShow":false,"defaultValue":"","tipLabel":"","dragDisabled":false,"className":[],"label":"产品货号","showLabel":true,"required":false,"renderKey":1728103741201,"tableName":"qa_final_check_data","layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup-attr","tag":"JnpfPopupAttr","span":12},"showField":"piece_id","__vModel__":"productNumber","fullName":"产品货号","style":{"width":"100%"},"id":"productNumber","relationField":"checkSeq_jnpfTable_qa_final_check_data1"},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"生产批号","addonAfter":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"生产批号","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102534593,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"productLot","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"productLot","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"ableIds":[],"multiple":false,"fullName":"检验人员","relationField":"","__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"检验人员","trigger":"change","showLabel":true,"required":false,"relationField":"","tableName":"qa_final_check_data","renderKey":1728102556217,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":12},"__vModel__":"checkUserName","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"checkUserName","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"format":"yyyy-MM-dd","fullName":"检验日期","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102580205,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":106,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"检验日期","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":12},"readonly":false,"__vModel__":"checkDate","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"checkDate","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"step-strictly":false,"controls":false,"fullName":"抽检数量(件)","thousands":false,"isAmountChinese":false,"addonAfter":null,"__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"inputNumber","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"抽检数量(件)","trigger":["blur","change"],"showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102608266,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-number","tag":"JnpfInputNumber","regList":[],"span":12},"__vModel__":"sampleQty","style":{"width":null},"step":1,"disabled":false,"id":"sampleQty","placeholder":"数字文本","controlsPosition":"","addonBefore":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"fullName":"检验结果","props":{"label":"fullName","value":"id"},"optionType":"default","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"检验结果","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102616208,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":12},"size":"small","options":[{"fullName":"合格","id":"1"},{"fullName":"不合格","id":"0"}],"__vModel__":"checkResult","style":{},"disabled":false,"interfaceHasPage":false,"id":"checkResult","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"maxlength":null,"fullName":"备注","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_final_check_data","renderKey":1728102621547,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":14},"readonly":false,"showWordLimit":true,"__vModel__":"remark","style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"请输入","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}}]
+export default superQueryJson
\ No newline at end of file