diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js
index 5f21980..9ce113a 100644
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@@ -28,7 +28,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     }
   },
   devServer: {
-    https: true,
+    https: false,
     historyApiFallback: true,
     hot: true,
     compress: true,
diff --git a/favicon.ico b/favicon.ico
index 24263e6..ec465b2 100644
Binary files a/favicon.ico and b/favicon.ico differ
diff --git a/src/assets/img/LOGO.png b/src/assets/img/LOGO.png
index c88d58d..3ba3af0 100644
Binary files a/src/assets/img/LOGO.png and b/src/assets/img/LOGO.png differ
diff --git a/src/assets/img/leftPic.png b/src/assets/img/leftPic.png
index f51f83b..3ba3af0 100644
Binary files a/src/assets/img/leftPic.png and b/src/assets/img/leftPic.png differ
diff --git a/src/assets/img/logo1.png b/src/assets/img/logo1.png
new file mode 100644
index 0000000..2b0ffe7
Binary files /dev/null and b/src/assets/img/logo1.png differ
diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue
index c370ed9..ccc6fcc 100644
--- a/src/views/BasicData/MenuManagement/index.vue
+++ b/src/views/BasicData/MenuManagement/index.vue
@@ -2,10 +2,10 @@
   <div class="app-container">
     <el-row>
       <el-col :span="7">
-        <el-card style="margin-bottom: 10px">
-          <el-button size="small" type="distribution" @click="addFisrtLevel">创建一级菜单</el-button>
-        </el-card>
-        <el-card>
+<!--        <el-card style="margin-bottom: 10px">-->
+<!--          <el-button size="small" type="distribution" @click="addFisrtLevel">创建一级菜单</el-button>-->
+<!--        </el-card>-->
+        <el-card style="height: 550px">
           <div slot="header">
             <el-input v-model="filterTextLeft" clearable placeholder="输入关键字进行过滤" size="small"/>
           </div>
@@ -16,7 +16,6 @@
             highlight-current-row
             size="mini"
             stripe
-            style="height:calc(100vh - 330px);"
             @selection-change="handleSelectionChangeLeft">
             <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
             <el-table-column align="center" type="index" width="60"/>
@@ -40,25 +39,26 @@
         </el-tooltip>
       </el-col>
       <el-col :span="8">
-        <el-card style="margin-bottom: 10px">
-          <span>角色:</span>
-          <el-select
-            v-model="roleName"
-            filterable
-            placeholder="请选择"
-            size="small"
-            style="width:200px;margin-left:10px"
-            @change="getModule">
-            <el-option
-              v-for="item in roleNames"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-card>
-        <el-card style="height: 550px;overflow: auto">
+<!--        <el-card style="margin-bottom: 10px">-->
+<!-- -->
+<!--        </el-card>-->
+        <el-card style="height: 550px">
           <div slot="header">
-            <el-input v-model="filterText" clearable placeholder="输入关键字进行过滤" size="small"/>
+            <span>角色:</span>
+            <el-select
+              v-model="roleName"
+              filterable
+              placeholder="请选择"
+              size="small"
+              style="width:150px;margin-left:10px"
+              @change="getModule">
+              <el-option
+                v-for="item in roleNames"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+            <el-input v-model="filterText" clearable placeholder="输入关键字进行过滤" size="small" style="width:200px;margin-left:10px"/>
           </div>
           <el-tree
             ref="moduleTree"
@@ -109,13 +109,13 @@
         </el-tooltip>
       </el-col>
       <el-col :span="7">
-        <el-card style="margin-bottom: 10px">
-          <el-button size="small" type="distribution" @click="addSecondLevel">创建二级菜单</el-button>
-          <el-button size="small" style="float: right" type="success" @click="RoleNameasdShow=!RoleNameasdShow">
-            模块分配情况
-          </el-button>
-        </el-card>
-        <el-card>
+<!--        <el-card style="margin-bottom: 10px">-->
+<!--          <el-button size="small" type="distribution" @click="addSecondLevel">创建二级菜单</el-button>-->
+<!--          <el-button size="small" style="float: right" type="success" @click="RoleNameasdShow=!RoleNameasdShow">-->
+<!--            模块分配情况-->
+<!--          </el-button>-->
+<!--        </el-card>-->
+        <el-card style="height: 550px;">
           <div slot="header">
             <el-input v-model="filterTextRight" clearable placeholder="输入关键字进行过滤" size="small"/>
           </div>
@@ -126,7 +126,6 @@
             highlight-current-row
             size="mini"
             stripe
-            style="height:calc(100vh - 330px);"
             @selection-change="handleSelectionChangeRight">
             <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
             <el-table-column align="center" type="index" width="60"/>
diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue
index 116a9be..81e6a18 100644
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -107,6 +107,7 @@
               align="center"
               type="selection"
               width="50"/>
+            <el-table-column align="center" type="index" label="序号" />
             <!--<el-table-column align="center" label="照片" width="200">-->
             <!--  <template slot-scope="scope">-->
             <!--    <el-popover-->
@@ -170,11 +171,11 @@
             <!--                {{ scope.row.身份证号 }}-->
             <!--              </template>-->
             <!--            </el-table-column>-->
-            <el-table-column align="center" label="学历" width="100">
-              <template slot-scope="scope">
-                {{ scope.row.学历名称 }}
-              </template>
-            </el-table-column>
+<!--            <el-table-column align="center" label="学历" width="100">-->
+<!--              <template slot-scope="scope">-->
+<!--                {{ scope.row.学历名称 }}-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <!--            <el-table-column align="center" label="入职时间" width="100">-->
             <!--              <template slot-scope="scope">-->
             <!--                {{-->
@@ -189,16 +190,16 @@
             <!--                }}-->
             <!--              </template>-->
             <!--            </el-table-column>-->
-            <el-table-column align="center" label="联系方式" width="110">
-              <template slot-scope="scope">
-                {{ scope.row.联系电话 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="班组" width="110">
-              <template slot-scope="scope">
-                {{ scope.row.班组名称 }}
-              </template>
-            </el-table-column>
+<!--            <el-table-column align="center" label="联系方式" width="110">-->
+<!--              <template slot-scope="scope">-->
+<!--                {{ scope.row.联系电话 }}-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column align="center" label="班组" width="110">-->
+<!--              <template slot-scope="scope">-->
+<!--                {{ scope.row.班组名称 }}-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <!--            <el-table-column align="center" label="民族" width="100">-->
             <!--              <template slot-scope="scope">-->
             <!--                {{ scope.row.民族 }}-->
@@ -209,7 +210,7 @@
             <!--                {{ scope.row.家庭住址 }}-->
             <!--              </template>-->
             <!--            </el-table-column>-->
-            <el-table-column align="center" fixed="right" label="操作" width="150">
+            <el-table-column align="center" label="操作" width="150">
               <template slot-scope="scope">
                 <!--                <el-button-->
                 <!--                  :disabled="scope.row.文件标识 && scope.row.文件标识 !== 'null'"-->
@@ -287,7 +288,7 @@
       :visible.sync="people_DFV"
       center
       style="min-height: 200px"
-      width="800px">
+      width="400px">
       <el-form
         ref="people_form"
         :model="people_form"
@@ -296,90 +297,86 @@
         label-position="left"
         label-width="110px">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="工号" prop="AccountNumber">
-              <el-input v-model="people_form.AccountNumber" size="small" style="width:200px"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="密码" prop="Password">
-              <el-input v-model="people_form.Password" size="small" style="width:200px"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="姓名" prop="Name">
-              <el-input v-model="people_form.Name" size="small" style="width:200px"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="性别" prop="Sex">
-              <el-select v-model="people_form.Sex" clearable placeholder="请选择性别" size="small" style="width: 200px">
-                <el-option
-                  v-for="item in SexData"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="出生日期" prop="Birthday">
-              <el-date-picker
-                v-model="people_form.Birthday"
-                placeholder="请选择出生日期"
-                size="small"
-                style="width: 200px"
-                type="date"
-                value-format="yyyy-MM-dd"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="身份证号" prop="IDcard">
-              <el-input v-model="people_form.IDcard" size="small" style="width:200px"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="入职时间" prop="TimeOfEntry">
-              <el-date-picker
-                v-model="people_form.TimeOfEntry"
-                placeholder="请选择入职时间"
-                size="small"
-                style="width: 200px"
-                type="date"
-                value-format="yyyy-MM-dd"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系方式" prop="ContactInformation">
-              <el-input v-model="people_form.ContactInformation" size="small" style="width:200px"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="学历" prop="Education">
-              <el-select
-                v-model="people_form.Education"
-                clearable
-                placeholder="请选择学历"
-                size="small"
-                style="width: 200px">
-                <el-option
-                  v-for="item in EducationDate"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="家庭住址" prop="Address">
-              <el-input v-model="people_form.Address" size="small" style="width:200px"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="民族" prop="Nation">
-              <el-input v-model="people_form.Nation" size="small" style="width:200px"/>
-            </el-form-item>
-          </el-col>
+          <el-form-item label="姓名" prop="Name">
+            <el-input v-model="people_form.Name" size="small" style="width:200px"/>
+          </el-form-item>
+          <el-form-item label="工号" prop="AccountNumber">
+            <el-input v-model="people_form.AccountNumber" size="small" style="width:200px"/>
+          </el-form-item>
+          <el-form-item label="密码" prop="Password">
+            <el-input v-model="people_form.Password" size="small" style="width:200px"/>
+          </el-form-item>
+
+
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="性别" prop="Sex">-->
+<!--              <el-select v-model="people_form.Sex" clearable placeholder="请选择性别" size="small" style="width: 200px">-->
+<!--                <el-option-->
+<!--                  v-for="item in SexData"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="出生日期" prop="Birthday">-->
+<!--              <el-date-picker-->
+<!--                v-model="people_form.Birthday"-->
+<!--                placeholder="请选择出生日期"-->
+<!--                size="small"-->
+<!--                style="width: 200px"-->
+<!--                type="date"-->
+<!--                value-format="yyyy-MM-dd"/>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="身份证号" prop="IDcard">-->
+<!--              <el-input v-model="people_form.IDcard" size="small" style="width:200px"/>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="入职时间" prop="TimeOfEntry">-->
+<!--              <el-date-picker-->
+<!--                v-model="people_form.TimeOfEntry"-->
+<!--                placeholder="请选择入职时间"-->
+<!--                size="small"-->
+<!--                style="width: 200px"-->
+<!--                type="date"-->
+<!--                value-format="yyyy-MM-dd"/>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="联系方式" prop="ContactInformation">-->
+<!--              <el-input v-model="people_form.ContactInformation" size="small" style="width:200px"/>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="学历" prop="Education">-->
+<!--              <el-select-->
+<!--                v-model="people_form.Education"-->
+<!--                clearable-->
+<!--                placeholder="请选择学历"-->
+<!--                size="small"-->
+<!--                style="width: 200px">-->
+<!--                <el-option-->
+<!--                  v-for="item in EducationDate"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="家庭住址" prop="Address">-->
+<!--              <el-input v-model="people_form.Address" size="small" style="width:200px"/>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="民族" prop="Nation">-->
+<!--              <el-input v-model="people_form.Nation" size="small" style="width:200px"/>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <!--<el-col :span="12">-->
           <!--  <el-form-item label="职称" prop="Post">-->
           <!--    <el-select-->
@@ -435,16 +432,17 @@
       center
       style="height: 800px"
       title="离职名单"
-      width="80%">
+      width="40%">
       <el-table
         :data="LeavingList"
         border
-        height="500"
+        height="420"
         highlight-current-row
         size="mini"
         stripe
         style="width: 100%"
         tooltip-effect="dark">
+        <el-table-column align="center" type="index" label="序号" />
         <el-table-column align="center" label="部门名称" width="100">
           <template slot-scope="scope">
             {{ scope.row.节点名称 }}
@@ -460,60 +458,60 @@
             {{ scope.row.密码 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="姓名" width="100">
+        <el-table-column align="center" label="姓名" >
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="性别" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.性别 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="身份证号" width="165">
-          <template slot-scope="scope">
-            {{ scope.row.身份证号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="学历" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.学历名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="入职时间" width="100">
-          <template slot-scope="scope">
-            {{
-              scope.row.入公司时间 !== '' && scope.row.入公司时间 !== null ? scope.row.入公司时间 = scope.row.入公司时间.split(' ')[0] : scope.row.入公司时间
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="出生日期" width="100">
-          <template slot-scope="scope">
-            {{
-              scope.row.出生日期 !== '' && scope.row.出生日期 !== null ? scope.row.出生日期 = scope.row.出生日期.split(' ')[0] : scope.row.出生日期
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="联系方式" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.联系电话 }}
-          </template>
-        </el-table-column>
+<!--        <el-table-column align="center" label="性别" width="100">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.性别 }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column align="center" label="身份证号" width="165">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.身份证号 }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column align="center" label="学历" width="100">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.学历名称 }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column align="center" label="入职时间" width="100">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{-->
+<!--              scope.row.入公司时间 !== '' && scope.row.入公司时间 !== null ? scope.row.入公司时间 = scope.row.入公司时间.split(' ')[0] : scope.row.入公司时间-->
+<!--            }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column align="center" label="出生日期" width="100">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{-->
+<!--              scope.row.出生日期 !== '' && scope.row.出生日期 !== null ? scope.row.出生日期 = scope.row.出生日期.split(' ')[0] : scope.row.出生日期-->
+<!--            }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column align="center" label="联系方式" width="110">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.联系电话 }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <!--        <el-table-column align="center" label="岗位工种" width="100">-->
         <!--          <template slot-scope="scope">-->
         <!--            {{ scope.row.岗位名称 }}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column align="center" label="民族" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.民族 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="家庭住址">
-          <template slot-scope="scope">
-            {{ scope.row.家庭住址 }}
-          </template>
-        </el-table-column>
+<!--        <el-table-column align="center" label="民族" width="100">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.民族 }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column align="center" label="家庭住址">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.家庭住址 }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column align="center" label="操作" width="100">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue b/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue
index c30acd6..c75af20 100644
--- a/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue
+++ b/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue
@@ -41,16 +41,20 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="工控机IP" width="110px" align="center">
+
+        <el-table-column label="工位MES功能" width="110px" align="center">
           <template slot-scope="scope">
-            <template>
-              {{ scope.row.工控机IP }}
-            </template>
+            <el-tag v-if="scope.row.是否启用MES" size="mini" type="success">启用</el-tag>
+            <el-tag v-else size="mini" type="warning">禁用</el-tag>
+<!--            <el-checkbox v-model="scope.row.是否启用MES" @change="updateUsedMes(scope.row)" />-->
           </template>
         </el-table-column>
-        <el-table-column label="工位MES界面" width="110px" align="center">
+        <el-table-column label="MES_DLL" width="110px" align="center">
           <template slot-scope="scope">
-            <el-checkbox v-model="scope.row.是否启用MES" @change="updateUsedMes(scope.row)" />
+            <template>
+              <span v-if="scope.row.是否启用MES">{{ scope.row.MesDll }}</span>
+              <span v-else ></span>
+            </template>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="150" align="center">
@@ -68,23 +72,26 @@
     </el-card>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" :title="title" center style="min-height: 200px;" width="400px">
       <el-form ref="formData" :model="formData" :rules="rules" label-position="right" label-width="120px">
-        <el-form-item label="MES工序号" prop="fileName">
-          <el-input v-model="formData.fileName" readonly class="myReadOnly-input" size="small" placeholder="指南工位号"/>
-        </el-form-item>
-        <el-form-item label="MES资源号" prop="nameIndustrialComputer">
-          <el-input v-model="formData.nameIndustrialComputer" readonly class="myReadOnly-input" size="small" placeholder="指南工位号"/>
-        </el-form-item>
-        <el-form-item label="PLCS工位号" prop="stationNumber">
+<!--        <el-form-item label="MES工序号" prop="fileName">-->
+<!--          <el-input v-model="formData.fileName" readonly class="myReadOnly-input" size="small" placeholder="指南工位号"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="MES资源号" prop="nameIndustrialComputer">-->
+<!--          <el-input v-model="formData.nameIndustrialComputer" readonly class="myReadOnly-input" size="small" placeholder="指南工位号"/>-->
+<!--        </el-form-item>-->
+        <el-form-item label="工位号" prop="stationNumber">
           <el-input v-model="formData.stationNumber" readonly class="myReadOnly-input" size="small" placeholder="工位号"/>
         </el-form-item>
-        <el-form-item label="工控机IP" prop="ipIndustrialComputer">
-          <el-input v-model="formData.ipIndustrialComputer" readonly class="myReadOnly-input" size="small" placeholder="工控机IP"/>
-        </el-form-item>
+
         <el-form-item label="工位名称" prop="stationName">
           <el-input v-model="formData.stationName" clearable size="small" placeholder="工位名称"/>
         </el-form-item>
-        <el-form-item label="工位MES界面" prop="enableMES">
-          <el-checkbox v-model="formData.enableMES" />
+        <el-form-item label="工位MES功能" prop="enableMES">
+<!--          <el-checkbox v-model="formData.enableMES" />-->
+          <el-tag v-if="formData.enableMES" size="mini" type="success">启用</el-tag>
+          <el-tag v-else size="mini" type="warning">禁用</el-tag>
+        </el-form-item>
+        <el-form-item v-if="formData.enableMES" label="MES_DLL" prop="MesDll">
+          <el-input v-model="formData.MesDll" readonly class="myReadOnly-input" size="small" placeholder="MES_DLL"/>
         </el-form-item>
       </el-form>
       <div slot="footer">
diff --git a/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue b/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue
index 6384304..3211109 100644
--- a/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue
+++ b/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue
@@ -3,7 +3,7 @@
     <el-card class="topCard">
       <div class="topDiv">
         <span style="margin-left: 10px">工位号：</span>
-        <el-select v-model="stationNumberValue" placeholder="工位号" clearable size="small" style="width: 200px">
+        <el-select v-model="stationNumberValue" clearable placeholder="请选择工位号" size="small" style="width: 250px" @change="searchOrder">
           <el-option
             v-for="item in stationNumber"
             :key="item.value"
@@ -11,8 +11,8 @@
             :value="item.value"
             size="mini"/>
         </el-select>
-        <span style="margin-left: 10px">产品图号：</span>
-        <el-select v-model="engineTypeValue" placeholder="请选择产品图号" size="small" style="width: 250px" @change="searchOrder()">
+        <span style="margin-left: 10px">产品型号：</span>
+        <el-select v-model="engineTypeValue" placeholder="请选择产品型号" size="small" style="width: 150px" @change="searchOrder">
           <el-option
             v-for="item in engineType"
             :key="item.value"
@@ -20,60 +20,113 @@
             :value="item.value"
             size="mini"/>
         </el-select>
+<!--        <span style="margin-left: 10px">版本号：</span>-->
+<!--        <el-select v-model="version" placeholder="请选择版本号" size="small" style="width: 150px" @change="searchOrder">-->
+<!--          <el-option-->
+<!--            v-for="item in versionList"-->
+<!--            :key="item.value"-->
+<!--            :label="item.label"-->
+<!--            :value="item.value"-->
+<!--            size="mini"/>-->
+<!--        </el-select>-->
+        <!--        <span style="margin-left: 10px">物料号：</span>-->
+        <!--        <el-input v-model="materialCode" style="width:170px;" clearable placeholder="物料号" size="small"/>-->
+        <!--        <span style="margin-left: 10px">是否验证：</span>-->
+        <!--        <el-select v-model="isVerification" placeholder="是否验证" size="small" clearable style="width: 140px" @change="searchOrder()">-->
+        <!--          <el-option-->
+        <!--            v-for="item in verification"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"-->
+        <!--            size="mini"/>-->
+        <!--        </el-select>-->
         <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchOrder()">查询物料</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-plus" @click="creatOrder('form')">创建物料</el-button>
+        <el-button type="primary" size="small" icon="el-icon-circle-plus" @click="creatOrder('form')">创建物料</el-button>
         <!--        <el-button type="success" size="small" plain icon="el-icon-document-copy" @click="copyOrder('form4')">复制物料</el-button>-->
         <!--        <el-button type="info" plain size="small" icon="el-icon-upload2" @click="importOrder('form')">物料导入</el-button>-->
-        <!--        <el-button type="info" plain size="small" icon="el-icon-download" @click="exportExcel()">物料导出</el-button>-->
+        <el-button type="warning" plain size="small" icon="el-icon-download" @click="exportExcel()">物料导出</el-button>
       </div>
       <el-table
         v-loading="loading"
         ref="multipleTable"
         :data="tableData"
         :header-cell-style="{background:'#eef1f6',color:'#606266'}"
-        height="600px"
+        :cell-class-name="tableRowClassName"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
         class="main"
         tooltip-effect="dark"
-        style="width: 80%"
+        height="640px"
+        style="width: 100%"
         border
-        size="mini">
+        size="mini"
+        @selection-change="handleSelectionChange">
         <el-table-column type="index" width="60" label="序号" align="center"/>
         <!--        <el-table-column align="center" label="物料号">-->
         <!--          <template slot-scope="scope">-->
         <!--            {{ scope.row.物料号 }}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column align="center" label="工位号">
+        <el-table-column align="center" label="工位号" width="100px">
           <template slot-scope="scope">
             {{ scope.row.工位号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="产品图号">
-          <template slot-scope="scope">
-            {{ scope.row.发动机型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料号">
+<!--        <el-table-column align="center" label="版本号" width="100px">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.版本号 }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column align="center" label="物料号" width="150px">
           <template slot-scope="scope">
             {{ scope.row.物料号 }}
           </template>
         </el-table-column>
+        <!--        <el-table-column align="center" label="零件图号">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.零件图号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column align="center" label="零件名称" min-width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <!--        <el-table-column align="center" label="零件数量">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            {{ scope.row.零件数量 }}-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-        <el-table-column align="center" label="是否验证">
+        <el-table-column align="center" label="物料数量" width="100px">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否验证) === 1" size="mini" type="success">是</el-tag>
-            <el-tag v-if="Number(scope.row.是否验证) === 0" size="mini" type="warning">否</el-tag>
+            {{ scope.row.零件数量 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="是否验证" width="100px">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.是否验证) === 1" size="mini" type="success">是</el-tag>
+            <span v-else>&nbsp;</span>
+          </template>
+        </el-table-column>
+<!--        <el-table-column align="center" label="是否批次" width="100px">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag v-if="Number(scope.row.是否批次) === 1" size="mini" type="success">是</el-tag>-->
+<!--            <span v-else>&nbsp;</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column align="center" label="匹配规则" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="匹配长度" width="100px">
+          <template slot-scope="scope">
+            <span v-if="Number(scope.row.是否验证) === 1">{{ scope.row.条码长度 }}</span>
+            <span v-else>&nbsp;</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column align="center" label="匹配排序" width="100px">
+          <template slot-scope="scope">
+            <span v-if="Number(scope.row.是否验证) === 1">{{ scope.row.零件排序 }}</span>
+            <span v-else>&nbsp;</span>
+          </template>
+        </el-table-column> -->
         <!--        <el-table-column align="center" label="是否主物料">-->
         <!--          <template slot-scope="scope">-->
         <!--            <span v-if="Number(scope.row.是否主物料) === 1">是</span>-->
@@ -97,163 +150,336 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog :visible.sync="dialogFormVisible" title="创建物料" center style="min-height: 200px;" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px">
-        <el-form-item label="工位号" prop="stationNumberValue" style="display: inline-block">
-          <el-select v-model="form.stationNumberValue" size="small" placeholder="请选择工位号">
-            <el-option
-              v-for="item in stationNumber"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="产品型号" prop="engineTypeValue" style="display: inline-block">
-          <el-select v-model="form.engineTypeValue" size="small" placeholder="请选择产品型号">
-            <el-option
-              v-for="item in engineType"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <!--        <el-form-item label="物料号" prop="orderNumber" style="display: inline-block">-->
-        <!--          <el-input-->
-        <!--            v-model="form.orderNumber"-->
-        <!--            clearable-->
-        <!--            size="small"-->
-        <!--            placeholder="请输入物料号"/>-->
-        <!--        </el-form-item>-->
-        <el-form-item label="零件图号" prop="partDrawing" style="display: inline-block">
-          <el-input
-            v-model="form.partDrawing"
-            clearable
-            size="small"
-            placeholder="请输入零件图号"/>
-        </el-form-item>
-        <el-form-item label="零件名称" prop="partName" style="display: inline-block">
-          <el-input
-            v-model="form.partName"
-            clearable
-            size="small"
-            placeholder="零件名称"/>
-        </el-form-item>
-        <!--        <el-form-item label="数量" prop="number" style="display: inline-block">-->
-        <!--          <el-input-->
-        <!--            v-model="form.number"-->
-        <!--            clearable-->
-        <!--            size="small"-->
-        <!--            placeholder="请输入数量"/>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="生产厂家" prop="manufactor" style="display: inline-block">-->
-        <!--          <el-input-->
-        <!--            v-model="form.manufactor"-->
-        <!--            clearable-->
-        <!--            size="small"-->
-        <!--            placeholder="请输入生产厂家"/>-->
-        <!--        </el-form-item>-->
-        <!--<el-form-item label="是否验证" prop="verificationValue" style="display: inline-block">-->
-        <!--  <el-select v-model="form.verificationValue" size="small" placeholder="请选择产品型号">-->
-        <!--    <el-option-->
-        <!--      v-for="item in verification"-->
-        <!--      :key="item.value"-->
-        <!--      :label="item.label"-->
-        <!--      :value="item.value"/>-->
-        <!--  </el-select>-->
-        <!--</el-form-item>-->;
-      <!--        <el-form-item label="是否主物料" prop="mainMaterialValue" style="display: inline-block">-->
-      <!--          <el-select v-model="form.mainMaterialValue" size="small" placeholder="请选择产品型号">-->
-      <!--            <el-option-->
-      <!--              v-for="item in mainMaterial"-->
-      <!--              :key="item.value"-->
-      <!--              :label="item.label"-->
-      <!--              :value="item.value"/>-->
-      <!--          </el-select>-->
-      <!--        </el-form-item>-->
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="创建物料" center style="min-height: 200px;" width="800px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工位号" prop="stationNumberValue" style="display: inline-block">
+              <el-select v-model="form.stationNumberValue" size="small" placeholder="请选择工位号">
+                <el-option
+                  v-for="item in stationNumber"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品型号" prop="engineTypeValue" style="display: inline-block">
+              <el-select v-model="form.engineTypeValue" size="small" placeholder="请选择产品型号">
+                <el-option
+                  v-for="item in engineType1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="物料号" prop="orderNumber" style="display: inline-block">
+              <el-input
+                v-model="form.orderNumber"
+                clearable
+                size="small"
+                placeholder="请输入物料号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料名称" prop="partName" style="display: inline-block">
+              <el-input
+                v-model="form.partName"
+                clearable
+                size="small"
+                placeholder="物料名称"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="数量" prop="number" style="display: inline-block">
+              <el-input-number
+                v-model="form.number"
+                :min="1"
+                :step="1"
+                size="small"
+                placeholder="请输入数量"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否验证" prop="verificationValue" style="display: inline-block">
+              <el-select v-model="form.verificationValue" size="small" placeholder="请选择产品型号" @change="changeIsVerification">
+                <el-option
+                  v-for="item in verification"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+
+          </el-col>
+        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="物料版本" prop="version" style="display: inline-block">-->
+<!--              <el-select v-model="form.version" size="small" placeholder="请选择物料版本">-->
+<!--                <el-option-->
+<!--                  v-for="item in versionList"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="是否批次" prop="batchValue" style="display: inline-block">-->
+<!--              <el-select v-model="form.batchValue" size="small" placeholder="请选择是否批次">-->
+<!--                <el-option-->
+<!--                  v-for="item in verification"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+        <el-row v-if="form.verificationValue === 1" style="margin: 10px 0">
+          <el-divider>验证规则设定</el-divider>
+        </el-row>
+        <el-row v-if="form.verificationValue === 1">
+          <el-col :span="10">
+            <el-form-item label="规则" prop="verificationCode" style="display: inline-block">
+              <el-input
+                v-model="form.verificationCode"
+                clearable
+                size="small"
+                placeholder="请输入匹配规则"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="长度" prop="verificationLength" style="display: inline-block">
+              <el-input-number
+                v-model="form.verificationLength"
+                :min="1"
+                :step="1"
+                size="small"
+                placeholder="请输入匹配长度"/>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="7">
+            <el-form-item label="排序" prop="verificationOrder" style="display: inline-block">
+              <el-input-number
+                v-model="form.verificationOrder"
+                :min="0"
+                :step="1"
+                size="small"
+                placeholder="请输入匹配排序"/>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="callOff('form')">取消</el-button>
         <el-button type="primary" size="small" @click="submitAdd('form')">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible1" title="编辑物料" center style="min-height: 200px" width="400px">
-      <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px">
-        <el-form-item label="工位号" prop="stationNumberValue" style="display: inline-block">
-          <el-input
-            v-model="form1.stationNumberValue"
-            readonly
-            size="small"
-            placeholder="工位号"/>
-        </el-form-item>
-        <el-form-item label="零件图号" prop="partDrawing" style="display: inline-block">
-          <el-input
-            v-model="form1.partDrawing"
-            readonly
-            size="small"
-            placeholder="请输入零件图号"/>
-        </el-form-item>
-        <!--        <el-form-item label="物料号" prop="orderNumber" style="display: inline-block">-->
-        <!--          <el-input-->
-        <!--            v-model="form1.orderNumber"-->
-        <!--            clearable-->
-        <!--            size="small"-->
-        <!--            placeholder="请输入物料号"/>-->
-        <!--        </el-form-item>-->
-        <el-form-item label="零件名称" prop="partName" style="display: inline-block">
-          <el-input
-            v-model="form1.partName"
-            clearable
-            size="small"
-            placeholder="零件名称"/>
-        </el-form-item>
-        <!--        <el-form-item label="数量" prop="number" style="display: inline-block">-->
-        <!--          <el-input-->
-        <!--            v-model="form1.number"-->
-        <!--            clearable-->
-        <!--            size="small"-->
-        <!--            placeholder="请输入数量"/>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="生产厂家" prop="manufactor" style="display: inline-block">-->
-        <!--          <el-input-->
-        <!--            v-model="form1.manufactor"-->
-        <!--            clearable-->
-        <!--            size="small"-->
-        <!--            placeholder="请输入生产厂家"/>-->
-        <!--        </el-form-item>-->
-        <el-form-item label="是否验证" prop="verificationValue" style="display: inline-block">
-          <el-select v-model="form1.verificationValue" size="small" placeholder="请选择产品型号">
-            <el-option
-              v-for="item in verification"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <!--        <el-form-item label="是否主物料" prop="mainMaterialValue" style="display: inline-block">-->
-        <!--          <el-select v-model="form1.mainMaterialValue" size="small" placeholder="请选择产品型号">-->
-        <!--            <el-option-->
-        <!--              v-for="item in mainMaterial"-->
-        <!--              :key="item.value"-->
-        <!--              :label="item.label"-->
-        <!--              :value="item.value"/>-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="编辑物料" center style="min-height: 200px;" width="800px">
+      <el-form ref="form" :model="form1" :rules="rules1" label-position="right" label-width="80px">
+        <!--        <el-row>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="工位号" prop="stationNumberValue" style="display: inline-block">-->
+        <!--              <el-input-->
+        <!--                v-model="form1.stationNumberValue"-->
+        <!--                readonly-->
+        <!--                size="small"-->
+        <!--                placeholder="工位号"/>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="产品型号" prop="engineTypeValue" style="display: inline-block">-->
+        <!--              <el-input-->
+        <!--                v-model="form1.engineTypeValue"-->
+        <!--                readonly-->
+        <!--                size="small"-->
+        <!--                placeholder="工位号"/>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="物料号" prop="orderNumber" style="display: inline-block">
+              <el-input
+                v-model="form1.orderNumber"
+                readonly
+                size="small"
+                placeholder="请输入物料号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="版本号" prop="version" style="display: inline-block">
+              <el-input
+                v-model="form1.version"
+                readonly
+                size="small"
+                placeholder="请选择版本号"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="物料名称" prop="partName" style="display: inline-block">
+              <el-input
+                v-model="form1.partName"
+                clearable
+                size="small"
+                placeholder="物料名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="数量" prop="number" style="display: inline-block">
+              <el-input-number
+                v-model="form1.number"
+                :min="1"
+                :step="1"
+                size="small"
+                placeholder="请输入数量"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否验证" prop="verificationValue" style="display: inline-block">
+              <el-select v-model="form1.verificationValue" size="small" placeholder="请选择产品型号">
+                <el-option
+                  v-for="item in verification"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+<!--            <el-form-item label="是否批次" prop="batchValue" style="display: inline-block">-->
+<!--              <el-select v-model="form1.batchValue" size="small" placeholder="请选择是否批次">-->
+<!--                <el-option-->
+<!--                  v-for="item in verification"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+          </el-col>
+        </el-row>
+        <el-row v-if="form1.verificationValue === 1" style="margin: 10px 0">
+          <el-divider>验证规则设定</el-divider>
+        </el-row>
+        <el-row v-if="form1.verificationValue === 1">
+          <el-col :span="10">
+            <el-form-item label="规则" prop="verificationCode" style="display: inline-block">
+              <el-input
+                v-model="form1.verificationCode"
+                clearable
+                size="small"
+                placeholder="请输入匹配规则"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="长度" prop="verificationLength" style="display: inline-block">
+              <el-input-number
+                v-model="form1.verificationLength"
+                :min="1"
+                :step="1"
+                size="small"
+                placeholder="请输入匹配长度"/>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="7">
+            <el-form-item label="排序" prop="verificationOrder" style="display: inline-block">
+              <el-input-number
+                v-model="form1.verificationOrder"
+                :min="0"
+                :step="1"
+                size="small"
+                placeholder="请输入匹配排序"/>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="callOff1()">取消</el-button>
-        <el-button type="primary" size="small" @click="submitAdd1()">确定</el-button>
+        <el-button size="small" @click="callOff1('form')">取消</el-button>
+        <el-button type="primary" size="small" @click="submitAdd1('form')">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible3" title="物料导入" center style="min-height: 200px" width="900px">
+    <el-dialog :visible.sync="dialogFormVisible3" title="物料导入" center style="min-height: 200px" width="1000px">
       <div class="app-container">
-        <upload-excel-component style="margin-left: 15%" @on-selected-file="selected"/>
-        <div style="margin-left: 395px">
-          <span v-show="worksheet.length > 1" style="cursor: pointer;width: 50px;" @click="removeAll"><i class="el-icon-close"/></span>
-          <el-upload :on-remove="handleRemove" :file-list="itemFile" style="width: 220px" action=""/>
+        <upload-excel-component :on-success="handleSuccess" :before-upload="beforeUpload" />
+        <div style="margin-top: 5px">
+          <el-table
+            v-loading="loading"
+            ref="multipleTable"
+            :data="tableDataListAll"
+            :header-cell-style="{ background: '#F5F5F5', fontSize: '16px' }"
+            element-loading-text="数据加载中"
+            element-loading-spinner="el-icon-loading"
+            element-loading-background="rgba(0, 0, 0, 0.2)"
+            height="300px"
+            style="width: 100%"
+            border
+          >
+            <el-table-column type="index" width="60" label="序号" align="center"/>
+            <el-table-column align="center" label="工位号" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.工位号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="产品型号" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.产品型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="物料号" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.物料号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="零件名称" min-width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="物料数量" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="是否验证" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.是否验证 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="匹配规则" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.匹配规则 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="匹配长度" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.条码长度 }}
+              </template>
+            </el-table-column>
+            <!-- <el-table-column align="center" label="匹配排序" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.匹配排序 }}
+              </template>
+            </el-table-column> -->
+          </el-table>
         </div>
-        <div v-if="worksheet.length !== 0" style="margin: 3px 0 0 395px">
-          <el-button icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</el-button>
+        <div slot="footer" class="dialog-footer">
+          <el-button size="small" @click="materialAddAllCancel()">取消</el-button>
+          <el-button type="primary" icon="el-icon-upload" size="small" @click="materialAddAllSubmit()">确认导入</el-button>
         </div>
+
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogFormVisible4" title="数据复制" center style="min-height: 200px" width="400px">
@@ -280,7 +506,6 @@
 <script>
 import UploadExcelComponent from './UploadExcel.vue'
 import { sleep } from '../../../utils/tool'
-
 export default {
   name: 'UploadExcel',
   components: { UploadExcelComponent },
@@ -288,6 +513,7 @@ export default {
     return {
       stationNumber: [],
       stationNumberValue: '',
+      materialCode: '',
       stationName: '',
       worksheet: [],
       itemFile: [],
@@ -303,7 +529,11 @@ export default {
       orderNumber: [],
       orderNumberValue: '',
       engineTypeValue: '',
+      version: '',
+      versionList: [],
       engineType: [],
+      engineType1: [],
+      isVerification: '',
       OKWarehouseValue: '',
       OKWarehouse: [],
       NGWarehouseValue: '',
@@ -334,38 +564,56 @@ export default {
         partDrawing: '',
         number: '',
         manufactor: '',
-        verificationValue: 0,
-        mainMaterialValue: 0
+        verificationValue: 1,
+        version: '',
+        verificationCode: '',
+        verificationLength: 0,
+        verificationOrder: 0,
+        mainMaterialValue: 0,
+        batchValue: 0
       },
       rules: { // 创建订单验证
-        partName: [{ required: true, message: '请输入零件名称', trigger: 'blur' }],
+        partName: [{ required: true, message: '请输入物料名称', trigger: 'blur' }],
         stationNumberValue: [{ required: true, message: '请选择工位号', trigger: 'change' }],
-        // orderNumber: [{ required: true, message: '请输入物料号', trigger: 'blur' }],
+        orderNumber: [{ required: true, message: '请输入物料号', trigger: 'blur' }],
         engineTypeValue: [{ required: true, message: '请选择机型', trigger: 'blur' }],
-        partDrawing: [{ required: true, message: '请输入零件图号', trigger: 'blur' }],
-        // number: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+        // partDrawing: [{ required: true, message: '请输入零件图号', trigger: 'blur' }],
+        number: [{ required: true, message: '请输入数量', trigger: 'blur' }],
         // manufactor: [{ required: true, message: '请输入生产厂家', trigger: 'blur' }],
-        verificationValue: [{ required: true, message: '请选择是否验证', trigger: 'change' }]
+        verificationValue: [{ required: true, message: '请选择是否验证', trigger: 'change' }],
+        version: [{ required: true, message: '请选择物料版本', trigger: 'change' }],
+        verificationLength: [{ required: true, message: '请输入验证长度', trigger: 'blur' }],
+        verificationOrder: [{ required: true, message: '请输入验证顺序', trigger: 'blur' }],
+        verificationCode: [{ required: true, message: '请输入验证规则', trigger: 'blur' }]
         // mainMaterialValue: [{ required: true, message: '请选择是否主物料', trigger: 'change' }]
       },
       form1: { // 修改订单
         partName: '',
         stationNumberValue: '',
+        engineTypeValue: '',
         orderNumber: '',
         partDrawing: '',
         number: '',
         manufactor: '',
-        verificationValue: 0,
+        version: '',
+        verificationValue: 1,
+        verificationCode: '',
+        verificationLength: 0,
+        verificationOrder: 0,
         mainMaterialValue: 0,
+        batchValue: 0,
         ID: ''
       },
       rules1: { // 修改订单验证
         partName: [{ required: true, message: '请输入零件名称', trigger: 'blur' }],
         // orderNumber: [{ required: true, message: '请输入物料号', trigger: 'blur' }],
         // partDrawing: [{ required: true, message: '请输入零件图号', trigger: 'blur' }],
-        // number: [{ required: true, message: '请输入数量', trigger: 'blur' }],
+        number: [{ required: true, message: '请输入数量', trigger: 'blur' }],
         // manufactor: [{ required: true, message: '请输入生产厂家', trigger: 'blur' }],
-        verificationValue: [{ required: true, message: '请选择是否验证', trigger: 'change' }]
+        verificationValue: [{ required: true, message: '请选择是否验证', trigger: 'change' }],
+        verificationLength: [{ required: true, message: '请输入验证长度', trigger: 'blur' }],
+        verificationOrder: [{ required: true, message: '请输入验证顺序', trigger: 'blur' }],
+        verificationCode: [{ required: true, message: '请输入验证规则', trigger: 'blur' }]
         // stationNumberValue: [{ required: true, message: '请选择工位号', trigger: 'change' }]
         // mainMaterialValue: [{ required: true, message: '请选择是否主物料', trigger: 'change' }]
       },
@@ -384,6 +632,7 @@ export default {
       },
       // planTime: [new Date(new Date().getTime() - 3600 * 1000 * 24 * 3000), new Date(new Date().getTime())],
       planTime: [],
+      tableDataListAll: [],
       tableData: [],
       importData: [],
       dialogFormVisible: false, // 创建订单
@@ -403,6 +652,10 @@ export default {
   created() {
     this.getStationNumber()
     this.getEndStation()
+    this.getVersion()
+    setTimeout(() => {
+      this.searchOrder()
+    }, 1000)
   },
   methods: {
     removeAll() {
@@ -410,7 +663,6 @@ export default {
       this.itemFile = []
     },
     async selected(data) { // 选择需要导入的文件
-      console.log(data, 1111)
       this.worksheet = data.worksheet // 获取每个多选文件的表格坐标及值
       this.itemFile = data.itemFile
     },
@@ -441,17 +693,35 @@ export default {
       var param = []
       var Data = this.CreateData('11', 'MES_基本变量_机型代码_查询', param)
       this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) this.engineTypeValue = response.data[0].发动机机型标志
         for (let i = 0; i < response.data.length; i++) {
-          if (response.data.length) this.engineTypeValue = response.data[0].发动机机型标志
           this.engineType.push({
-            label: response.data[i].发动机型号 + '-' + response.data[i].标识字符,
+            label: response.data[i].发动机型号,
+            value: response.data[i].发动机机型标志
+          })
+          this.engineType1.push({
+            label: response.data[i].发动机型号,
             value: response.data[i].发动机机型标志
           })
         }
-      }).then(() => {
         this.searchOrder()
       })
     },
+    // 获取版本号
+    getVersion() {
+      this.versionList = []
+      var param = []
+      var Data = this.CreateData('11', '电子看板_装配零件_版本_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length > 0) this.version = response.data[0].版本号
+        for (let i = 0; i < response.data.length; i++) {
+          this.versionList.push({
+            label: response.data[i].是否启用 === 1 ? `${response.data[i].版本号}【启用】` : response.data[i].版本号,
+            value: response.data[i].版本号
+          })
+        }
+      })
+    },
     // 初始化获取订单号
     getStationNumber() {
       this.stationNumber = []
@@ -468,17 +738,28 @@ export default {
     },
     // 查询订单
     searchOrder() {
-      this.tableData = []
       var param = []
+      const isVerification = this.isVerification === '' ? 9999 : this.isVerification
       param[0] = ['工位号', this.stationNumberValue]
       param[1] = ['产品型号代码', this.engineTypeValue]
+      param[2] = ['是否验证', isVerification]
+      param[3] = ['物料号', this.materialCode]
+      param[4] = ['版本号', this.version]
       var Data = this.CreateData('11', '电子看板_装配零件_查询', param)
       this.ExecDatabase(Data).then(response => {
+        this.tableData = []
         if (response.data.length !== 0) {
           this.tableData = response.data
         }
       })
     },
+    changeIsVerification(value) {
+      if (value === 1) {
+        this.form.verificationCode = this.form.orderNumber
+      } else {
+        this.form.verificationCode = '****'
+      }
+    },
     // 创建订单
     creatOrder(formName) {
       if (this.$refs[formName] !== undefined) {
@@ -492,7 +773,11 @@ export default {
       this.form.number = ''
       this.form.manufactor = ''
       this.form.verificationValue = 0
+      this.form.verificationCode = '****'
+      this.form.verificationLength = 1
+      this.form.verificationOrder = 0
       this.form.mainMaterialValue = 0
+      this.form.batchValue = 0
       this.dialogFormVisible = true
     },
     // 提交新增订单
@@ -501,24 +786,29 @@ export default {
         if (valid) {
           var param = []
           param[0] = ['工位号', this.form.stationNumberValue]
-          param[1] = ['发动机型号', this.form.engineTypeValue]
-          param[2] = ['物料号', this.form.partDrawing]
+          param[1] = ['产品型号代码', this.form.engineTypeValue]
+          param[2] = ['物料号', this.form.orderNumber]
           param[3] = ['零件名称', this.form.partName]
           param[4] = ['零件图号', this.form.partDrawing]
           param[5] = ['生产厂家', this.form.manufactor]
           param[6] = ['是否验证', this.form.verificationValue]
           param[7] = ['是否主物料', this.form.mainMaterialValue]
           param[8] = ['零件数量', this.form.number]
-          var Data = this.CreateData('11', '电子看板_装配零件_SPC_增加', param)
+          param[9] = ['验证规则', this.form.verificationCode]
+          param[10] = ['验证长度', this.form.verificationLength]
+          param[11] = ['验证顺序', this.form.verificationOrder]
+          param[12] = ['版本号', this.form.version]
+          param[13] = ['批次追溯', this.form.batchValue]
+          var Data = this.CreateData('12', '电子看板_装配零件_SPC_增加', param)
           this.ExecDatabase(Data).then(response => {
             if (response.data[0]['result'] === '1') {
               this.$message({
-                message: response.data[0]['msg'],
+                message: '物料增加成功！',
                 type: 'success'
               })
               this.searchOrder()
             } else {
-              this.$message.error(response.data[0]['msg'])
+              this.$message.error('物料增加失败！')
             }
           })
         } else {
@@ -548,7 +838,7 @@ export default {
       this.dialogFormVisible4 = false
     },
     async submitAdd4() {
-      let stationNumberValue, orderNumber, partName, partDrawing, manufactor, verificationValue, mainMaterialValue, number
+      let stationNumberValue, orderNumber, partName, partDrawing, manufactor, verificationValue, mainMaterialValue, number, batchValue
       for (let i = 0; i < this.tableData.length; i++) {
         stationNumberValue = this.tableData[i].工位号
         orderNumber = this.tableData[i].物料号
@@ -558,7 +848,8 @@ export default {
         verificationValue = this.tableData[i].是否验证
         mainMaterialValue = this.tableData[i].是否主物料
         number = this.tableData[i].零件数量
-        await this.submitAdd5(stationNumberValue, orderNumber, partName, partDrawing, manufactor, verificationValue, mainMaterialValue, number)
+        batchValue = this.tableData[i].是否批次
+        await this.submitAdd5(stationNumberValue, orderNumber, partName, partDrawing, manufactor, verificationValue, mainMaterialValue, number, batchValue)
       }
       this.$message({
         message: '增加成功',
@@ -568,7 +859,7 @@ export default {
       this.engineTypeValue = this.form4.engineTypeValue
       this.searchOrder()
     },
-    async submitAdd5(stationNumberValue, orderNumber, partName, partDrawing, manufactor, verificationValue, mainMaterialValue, number) {
+    async submitAdd5(stationNumberValue, orderNumber, partName, partDrawing, manufactor, verificationValue, mainMaterialValue, number, batchValue) {
       var param = []
       param[0] = ['工位号', stationNumberValue]
       param[1] = ['发动机型号', this.form4.engineTypeValue]
@@ -579,14 +870,13 @@ export default {
       param[6] = ['是否验证', verificationValue]
       param[7] = ['是否主物料', mainMaterialValue]
       param[8] = ['零件数量', number]
+      param[9] = ['批次追溯', batchValue]
       var Data = this.CreateData('12', '电子看板_装配零件_SPC_增加', param)
       return new Promise((resolve, reject) => {
         this.ExecDatabase(Data).then(response => {
           if (response.data[0].result === '1') {
-            console.log('1')
             resolve(1)
           } else {
-            console.log('0')
             reject(2)
           }
         })
@@ -604,7 +894,7 @@ export default {
         type: 'warning'
       }).then(() => {
         var param = []
-        param[0] = ['ID', row.id]
+        param[0] = ['ID', row.ID]
         var Data = this.CreateData('12', '电子看板_装配零件_SPC_删除', param)
         this.ExecDatabase(Data).then(response => {
           if (response.data[0].result === '1') {
@@ -626,26 +916,44 @@ export default {
       if (this.$refs['form1'] !== undefined) {
         this.$refs['form1'].resetFields()
       }
+      console.log(row)
       this.form1.partName = row.零件名称
       this.form1.stationNumberValue = row.工位号
-      // this.form1.orderNumber = row.物料号
-      this.form1.partDrawing = row.物料号
-      // this.form1.number = row.零件数量
+      this.form1.engineTypeValue = row.工位号
+      this.form1.orderNumber = row.物料号
+      // this.form1.partDrawing = row.零件图号
+      this.form1.number = row.零件数量
       // this.form1.manufactor = row.生产厂家
       this.form1.verificationValue = Number(row.是否验证)
+      this.form1.verificationCode = row.零件图号
+      this.form1.verificationLength = row.条码长度
+      this.form1.verificationOrder = row.零件排序
+      this.form1.version = row.版本号
       // this.form1.mainMaterialValue = Number(row.是否主物料)
+      this.form1.batchValue = Number(row.是否批次)
       this.form1.ID = row.ID
       this.dialogFormVisible1 = true
     },
     // 提交修改订单
-    submitAdd1() {
-      this.$refs['form1'].validate((valid) => {
+    submitAdd1(formName) {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           var param = []
           param[0] = ['ID', this.form1.ID]
-          param[1] = ['零件名称', this.form1.partName]
-          param[2] = ['是否验证', this.form1.verificationValue]
-          var Data = this.CreateData('12', '电子看板_装配零件_修改', param)
+          param[1] = ['物料号', this.form1.orderNumber]
+          param[2] = ['零件名称', this.form1.partName]
+          param[3] = ['零件图号', this.form1.partDrawing]
+          param[4] = ['生产厂家', this.form1.manufactor]
+          param[5] = ['是否验证', this.form1.verificationValue]
+          param[6] = ['是否主物料', this.form1.mainMaterialValue]
+          param[7] = ['零件数量', this.form1.number]
+          param[8] = ['工位号', this.form1.stationNumberValue]
+          param[9] = ['发动机型号', this.engineTypeValue]
+          param[10] = ['验证规则', this.form1.verificationCode]
+          param[11] = ['验证长度', this.form1.verificationLength]
+          param[12] = ['验证顺序', this.form1.verificationOrder]
+          param[13] = ['批次追溯', this.form1.batchValue]
+          var Data = this.CreateData('12', '电子看板_装配零件_SPC_修改', param)
           this.ExecDatabase(Data).then(response => {
             if (response.data[0].result === '1') {
               this.$message({
@@ -664,9 +972,9 @@ export default {
       })
     },
     // 取消修改订单
-    callOff1() {
+    callOff1(formName) {
+      this.$refs[formName].resetFields()
       this.dialogFormVisible1 = false
-      this.$refs['form1'].resetFields()
     },
     // 多选
     handleSelectionChange(val) {
@@ -708,7 +1016,6 @@ export default {
       var param = []
       var Data = this.CreateData('11', '生产计划导入_确认导入前临时表_查询', param, this.pageSize, this.pageList)
       this.ExecDatabase(Data).then(response => {
-        console.log(response.data)
         this.tableData = response.data.rows
         this.total = response.data.total
         this.loading = false
@@ -716,7 +1023,6 @@ export default {
     },
     // 表格颜色变化
     tableRowClassName({ row, rowIndex }) {
-      // console.log(row, rowIndex)
       if (rowIndex % 2 === 0) {
         return 'black'
       } else {
@@ -767,8 +1073,8 @@ export default {
             isPreservation = this.worksheet[j][`K${attr}`] ? this.worksheet[j][`K${attr}`].v : ''
             orderNumber = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : ''
             if (!stationNumberValue && !engineTypeNumber &&
-                !partDrawing && !partName && !number && !partBatchNumber &&
-                !manufactor && !engineTypeValue && !verificationValue && !mainMaterialValue && !isPreservation && !orderNumber) {
+              !partDrawing && !partName && !number && !partBatchNumber &&
+              !manufactor && !engineTypeValue && !verificationValue && !mainMaterialValue && !isPreservation && !orderNumber) {
               break
             } else if (!orderNumber) { // 名称不能为空
               this.$notify.error(`物料号不能为空`)
@@ -838,6 +1144,7 @@ export default {
         param[9] = ['是否主物料', mainMaterialValue]
         param[10] = ['是否保存', isPreservation]
         param[11] = ['物料号', orderNumber]
+        param[12] = ['是否批次', 0] // 导入时默认设置为否
         var Data = this.CreateData('12', '物料数据_导入Excel', param)
         const response = await this.ExecDatabase(Data)
         const res = response.data
@@ -855,7 +1162,7 @@ export default {
     exportExcel() {
       if (this.tableData.length !== 0) {
         var param = []
-        param[0] = ['发动机型号', this.engineTypeValue]
+        param[0] = ['产品型号代码', this.engineTypeValue]
         param[1] = ['工位号', this.stationNumberValue]
         var Data = this.CreateData('2001', '电子看板_装配零件_总物料表_导出新', param)
         this.exportExcel_NPOI(Data)
@@ -863,6 +1170,51 @@ export default {
         this.$message.warning('暂无数据')
       }
     },
+    beforeUpload(file) {
+      return true
+    },
+    handleSuccess({ results, header }) {
+      const tableName = `基础数据_物料bom_导入临时表`
+      console.log(tableName)
+      var Data = this.CreateData('7', tableName, results, header)
+      this.ExecDatabase(Data).then(response => {
+        this.selectDate2()
+      })
+    },
+    selectDate2() {
+      this.tableDataListAll = []
+      var param = []
+      var Data = this.CreateData('11', '电子看板_装配零件_物料bom_导入临时表_查询', param)
+      this.ExecDatabase(Data).then(response => {
+        if (response.data.length !== 0) {
+          this.tableDataListAll = response.data
+        }
+      })
+    },
+    materialAddAllSubmit() {
+      if (this.tableDataListAll.length === 0) {
+        this.$message.error('内容为空')
+      } else {
+        var param = []
+        var Data = this.CreateData('12', '电子看板_装配零件_物料BOM_导入临时表_确认导入', param)
+        this.ExecDatabase(Data).then(response => {
+          if (response.data.length > 0) {
+            if (response.data[0]['result'] === '1') {
+              this.$message.success('导入成功！')
+              this.dialogFormVisible3 = false
+              this.searchOrder()
+            } else {
+              this.$message.error('导入失败！')
+            }
+          } else {
+            this.$message.error('导入失败！')
+          }
+        })
+      }
+    },
+    materialAddAllCancel() {
+      this.dialogFormVisible3 = false
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1
@@ -878,44 +1230,44 @@ export default {
 </script>
 
 <style scoped>
-  .topCard{
-    margin: 5px;
-  }
-  .topDiv{
-    margin-bottom: 10px;
-  }
-  .el-select{
-    width:200px
-  }
-  .el-input{
-    width:200px
-  }
-  .text {
-    font-size: 14px;
-  }
+.topCard{
+  margin: 5px;
+}
+.topDiv{
+  margin-bottom: 10px;
+}
+.el-select{
+  width:200px
+}
+.el-input{
+  width:200px
+}
+.text {
+  font-size: 14px;
+}
 
-  .item {
-    padding: 18px 0;
-  }
+.item {
+  padding: 18px 0;
+}
 
-  .box-card {
-    position: absolute;
-    right: 6px;
-    top: 80px;
-    width: 300px;
-  }
-  .el-table .warning-row {
-    background: oldlace;
-  }
+.box-card {
+  position: absolute;
+  right: 6px;
+  top: 80px;
+  width: 300px;
+}
+.el-table .warning-row {
+  background: oldlace;
+}
 
-  .el-table .success-row {
-    background: #f0f9eb;
-  }
+.el-table .success-row {
+  background: #f0f9eb;
+}
 
-  ::v-deep.el-input.is-disabled .el-input__inner{
-    color: #606266!important;
-  }
-  ::v-deep.el-input.is-disabled .el-input__inner{
-    background-color: white!important;
-  }
+::v-deep.el-input.is-disabled .el-input__inner{
+  color: #606266!important;
+}
+::v-deep.el-input.is-disabled .el-input__inner{
+  background-color: white!important;
+}
 </style>
diff --git a/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue b/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
index 6d3b113..42700ec 100644
--- a/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
+++ b/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
@@ -24,8 +24,8 @@
           </el-select>
           <span style="margin-left: 10px">订单号：</span>
           <el-input v-model="orderNumberValue" placeholder="订单号" clearable size="small" style="width: 150px; "/>
-          <span style="margin-left: 10px">产品图号：</span>
-          <el-select v-model="engineTypeValue" placeholder="请选择产品图号" filterable clearable size="small" style="width: 250px">
+          <span style="margin-left: 10px">产品型号：</span>
+          <el-select v-model="engineTypeValue" placeholder="请选择产品型号" filterable clearable size="small" style="width: 150px">
             <el-option
               v-for="item in engineType"
               :key="item.value"
@@ -35,17 +35,17 @@
           </el-select>
           <span style="margin-left: 10px">生产时间：</span>
           <el-date-picker
-            :clearable = "false"
             v-model="dateTime"
-            size="small"
-            type="daterange"
+            :clearable="false"
             align="center"
-            style="width: 250px;"
-            value-format="yyyy-MM-dd"
+            end-placeholder="结束日期"
             format="yyyy-MM-dd"
             range-separator="～"
+            size="small"
             start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
+            style="width: 240px;"
+            type="daterange"
+            value-format="yyyy-MM-dd"/>
           <!--<span style="margin-left: 10px">批次条码：</span>-->
           <!--<el-input v-model="traceabilityCode" placeholder="请输入批次条码" clearable size="small" style="width: 200px; margin-left: 13px"/>-->
           <!--<span style="margin-left: 10px">精确追溯码：</span>-->
@@ -150,7 +150,7 @@
               {{ scope.row.工位号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="产品图号">
+          <el-table-column align="center" label="产品型号">
             <template slot-scope="scope">
               {{ scope.row.发动机型号 }}
             </template>
@@ -287,7 +287,7 @@ export default {
         }
       ], // 是否合格
       isQualifiedValue: 2, // 是否合格
-      dateTime: '', // 时间
+      dateTime: [], // 时间
       loading: false, // 时间
       tableData: [], // 时间
       date: new Date(),
@@ -299,7 +299,7 @@ export default {
     }
   },
   created() {
-    this.dateTime = [getNowShotTime(), getNowShotTime]
+    this.dateTime = [getNowShotTime(), getNowShotTime()]
     this.getStationNumber()
     this.getEngineType()
   },
diff --git a/src/views/QualityAssurance/InquiryTransitInformation/index.vue b/src/views/QualityAssurance/InquiryTransitInformation/index.vue
index bc32b1f..02f9386 100644
--- a/src/views/QualityAssurance/InquiryTransitInformation/index.vue
+++ b/src/views/QualityAssurance/InquiryTransitInformation/index.vue
@@ -55,8 +55,8 @@
           <!--          </el-select>-->
           <span style="margin-left: 10px">订单号：</span>
           <el-input v-model="orderNumberValue" placeholder="订单号" clearable size="small" style="width: 150px; margin-left: 5px"/>
-          <span style="margin-left: 10px">产品图号：</span>
-          <el-select v-model="engineTypeValue" placeholder="请选择产品图号" filterable clearable size="small" style="width: 250px">
+          <span style="margin-left: 10px">产品型号：</span>
+          <el-select v-model="engineTypeValue" placeholder="请选择产品型号" filterable clearable size="small" style="width: 150px">
             <el-option
               v-for="item in engineType"
               :key="item.value"
@@ -130,7 +130,7 @@
               {{ scope.row.工位号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="产品图号">
+          <el-table-column align="center" label="产品型号">
             <template slot-scope="scope">
               {{ scope.row.机型 }}
             </template>
@@ -209,6 +209,8 @@
 </template>
 
 <script>
+import { getNowShotTime } from '../../../utils/tool'
+
 export default {
   data() {
     return {
@@ -247,7 +249,7 @@ export default {
         }
       ], // 是否合格
       isQualifiedValue: 1, // 是否合格
-      dateTime: '', // 时间
+      dateTime: [], // 时间
       loading: false, // 时间
       tableData: [], // 时间
       date: new Date(),
@@ -259,13 +261,7 @@ export default {
     }
   },
   created() {
-    var year, month, day, audiTime
-    this.date = new Date() // 修改数据date
-    year = new Date().getFullYear()
-    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
-    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
-    audiTime = year + '-' + month + '-' + day
-    this.dateTime = [audiTime, audiTime]
+    this.dateTime = [getNowShotTime(), getNowShotTime()]
     this.getStationNumber()
     this.getEngineType()
     this.getStationNumberN()
diff --git a/src/views/QualityAssurance/MaterialDataQuery/index.vue b/src/views/QualityAssurance/MaterialDataQuery/index.vue
index 73d868a..8f24c24 100644
--- a/src/views/QualityAssurance/MaterialDataQuery/index.vue
+++ b/src/views/QualityAssurance/MaterialDataQuery/index.vue
@@ -20,12 +20,12 @@
           </el-select>
           <span style="margin-left: 10px;letter-spacing: 3px">订单号：</span>
           <el-input v-model="orderNumberValue" placeholder="订单号" clearable size="small" style="width: 250px;"/>
-          <span style="margin-left: 10px;">产品图号：</span>
+          <span style="margin-left: 10px;">产品型号：</span>
           <el-select
             v-model="engineTypeValue"
             clearable
             filterable
-            placeholder="请选择产品图号"
+            placeholder="请选择产品型号"
             size="small"
             style="width: 250px">
             <el-option
@@ -144,7 +144,7 @@
               {{ scope.row.工位号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="产品图号" width="120px">
+          <el-table-column align="center" label="产品型号" width="120px">
             <template slot-scope="scope">
               {{ scope.row.发动机型号 }}
             </template>
@@ -214,6 +214,8 @@
 </template>
 
 <script>
+import { getNowShotTime } from '../../../utils/tool'
+
 export default {
   data() {
     return {
@@ -248,7 +250,7 @@ export default {
         }
       ], // 是否合格
       isQualifiedValue: 1, // 是否合格
-      dateTime: '', // 时间
+      dateTime: [], // 时间
       loading: false, // 时间
       tableData: [], // 时间
       date: new Date(),
@@ -260,14 +262,7 @@ export default {
     }
   },
   created() {
-    var year, month, day, audiTime
-    this.date = new Date() // 修改数据date
-    year = new Date().getFullYear()
-    month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
-    day = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
-    audiTime = year + '-' + month + '-' + day
-    console.log(audiTime, 'audiTime')
-    this.dateTime = [audiTime, audiTime]
+    this.dateTime = [getNowShotTime(), getNowShotTime()]
     this.getStationNumber()
     this.getEngineType()
   },
@@ -296,7 +291,7 @@ export default {
       this.ExecDatabase(Data).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.stationNumber.push({
-            label: response.data[i].工位号,
+            label: `【${response.data[i].工位号}】${response.data[i].工位名称}`,
             value: response.data[i].工位号
           })
         }
diff --git a/src/views/RecipeManagement/RecipeManagement/index.vue b/src/views/RecipeManagement/RecipeManagement/index.vue
index 73cce34..b73608e 100644
--- a/src/views/RecipeManagement/RecipeManagement/index.vue
+++ b/src/views/RecipeManagement/RecipeManagement/index.vue
@@ -2,8 +2,8 @@
   <div class="app-container">
     <el-card class="topCard">
       <div class="topDiv">
-        <span style="margin-left: 10px">产品图号：</span>
-        <el-input v-model="equipmentType" style="width:150px;" clearable placeholder="产品图号" size="small"/>
+        <span style="margin-left: 10px">产品型号：</span>
+        <el-input v-model="equipmentType" style="width:150px;" clearable placeholder="产品型号" size="small"/>
         <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchOrder()">查询</el-button>
         <!--        <el-button type="distribution" size="small" icon="el-icon-circle-plus" @click="creatOrder('form')">增加</el-button>-->
       </div>
@@ -21,12 +21,12 @@
         style="width: 60%;"
         border
         size="mini">
-        <el-table-column align="center" label="图号代码" width="100px">
+        <el-table-column align="center" label="产品型号代码" width="100px">
           <template slot-scope="scope">
             {{ scope.row.发动机机型标志 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="产品图号">
+        <el-table-column align="center" label="产品型号">
           <template slot-scope="scope">
             {{ scope.row.发动机型号 }}
           </template>
@@ -36,7 +36,7 @@
         <!--            {{ scope.row.配方号 }}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column align="center" label="结构">
+        <el-table-column align="center" label="大机型">
           <template slot-scope="scope">
             {{ scope.row.标识字符 }}
           </template>
diff --git a/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue b/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue
index 1d09431..d1cc3b4 100644
--- a/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue
+++ b/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue
@@ -2,396 +2,548 @@
   <div class="app-container">
     <el-card class="topCard">
       <div class="topDiv">
-        <div>
-          <span style="margin-left: 10px">订单号：</span>
-          <el-input v-model="orderNumberValue" clearable placeholder="请输入订单号" size="small" style="width: 150px" />
-          <span style="margin-left: 10px">产品图号：</span>
-          <el-select v-model="engineTypeValue" clearable placeholder="请选择产品图号" size="small" style="width: 150px">
-            <el-option v-for="item in engineType" :key="item.value" :label="item.label" :value="item.value" size="mini"/>
-          </el-select>
-          <span style="margin-left: 10px">生产日期：</span>
-          <el-date-picker
-            v-model="planTime"
-            :clearable="false"
-            size="small"
-            type="daterange"
-            align="center"
-            style="width: 250px;"
-            value-format="yyyy-MM-dd"
-            format="yyyy-MM-dd"
-            range-separator="～"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          />
-          <el-button
-            icon="el-icon-search"
-            plain
-            size="small"
-            style="margin-left: 10px"
-            type="primary"
-            @click="pageSize = 30; pageCurrent = 1; searchOrder()"
-          >查询订单
-          </el-button>
-          <el-button
-            icon="el-icon-circle-plus"
-            size="small"
-            type="distribution"
-            @click="creatOrder('form')"
-          >创建订单
-          </el-button>
-          <el-button
-            icon="el-icon-s-release"
-            size="small"
-            type="distribution"
-            style="float: right"
-            @click="viewModifyOrder()"
-          >异常处理记录
-          </el-button>
-          <!--        <el-button type="info" plain size="small" icon="el-icon-upload2" @click="importOrder('form')">订单导入</el-button>-->
-          <!--        <el-button type="info" plain size="small" icon="el-icon-download" @click="exportExcel()">订单导出</el-button>-->
-        </div>
-        <el-table
-          ref="multipleTable"
-          v-loading="loading"
-          :cell-class-name="tableRowClassName"
-          :data="tableData"
-          :expand-row-keys="expandsDetail"
-          :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
-          :row-key="getRowKeys"
-          border
-          class="main"
-          element-loading-background="rgba(0, 0, 0, 0.2)"
-          element-loading-spinner="el-icon-loading"
-          element-loading-text="数据加载中"
-          height="600px"
-          size="mini"
-          style="width: 100%;max-height: 600px"
-          tooltip-effect="dark"
-          @expand-change="selectPlan"
-          @selection-change="handleSelectionChange"
+        <span style="margin-left: 10px">订单号：</span>
+        <el-input v-model="orderNumberValue" clearable placeholder="输入订单号进行过滤" size="small"  style="width: 200px"/>
+        <span style="margin-left: 10px">产品型号：</span>
+        <el-select
+          v-model="engineTypeValue"
+          placeholder="请选择产品型号"
+          clearable
+          size="small"
+          style="width: 150px"
         >
-          <el-table-column align="center" label="排序" width="60">
-            <template slot-scope="scope">
-              {{ scope.row.排序 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="订单号" width="110">
-            <template slot-scope="scope">
-              {{ scope.row.订单号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="项目名称" width="120">
-            <template slot-scope="scope">
-              {{ scope.row.项目名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="间隔号" width="100">
-            <template slot-scope="scope">
-              {{ scope.row.间隔号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="装配类型">
-            <template slot-scope="scope">
-              {{ scope.row.标识字符 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP010" width="70">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP010 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP010 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP020" width="70">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP020 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP020 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP020-1" width="90">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP0201 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP0201 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP030" width="70">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP030 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP030 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP030-1" width="90">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP0301 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP0301 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP040" width="70">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP040 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP040 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP040-1" width="90">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP0401 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP0401 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP040-2" width="90">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP0402 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP0402 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP050" width="70">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP050 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP050 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="OP060" width="70">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.OP060 === 2" type="success" size="mini">已完成</el-tag>
-              <el-tag v-else-if="scope.row.OP060 === 1" type="warning" size="mini">装配中</el-tag>
-              <el-tag v-else type="info" size="mini">未开始</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="操作" width="200">
-            <template slot-scope="scope">
-              <!--              <el-button-->
-              <!--                v-if="scope.row.订单状态 == 1"-->
-              <!--                icon="el-icon-position"-->
-              <!--                size="mini"-->
-              <!--                type="text"-->
-              <!--                @click="planIssue(scope.row)">开始生产-->
-              <!--              </el-button>-->
-              <el-button
-                v-if="scope.row.订单状态 === 2"
-                icon="el-icon-document-delete"
-                size="mini"
-                style="color: #ff7f29"
-                type="text"
-                @click="forceOffLine(scope.row)"
-              >异常处理
-              </el-button>
-              <!--              <el-button-->
-              <!--                v-else-if="scope.row.订单状态 == 3"-->
-              <!--                :disabled="true"-->
-              <!--                icon="el-icon-document-delete"-->
-              <!--                size="mini"-->
-              <!--                style="color: #c2c7d0"-->
-              <!--                type="text"-->
-              <!--              >生产完成-->
-              <!--              </el-button>-->
-              <!--              <el-button-->
-              <!--                v-if="scope.row.订单状态==4"-->
-              <!--                icon="el-icon-document-delete"-->
-              <!--                size="mini"-->
-              <!--                style="color: #67c23a"-->
-              <!--                type="text"-->
-              <!--                @click="continueIssue(scope.row)">继续生产-->
-              <!--              </el-button>-->
-              <!--<el-button-->
-              <!--  :disabled="parseInt(scope.row.订单状态) == 3 || scope.row.是否下发 == 1"-->
-              <!--  icon="el-icon-edit"-->
-              <!--  size="mini"-->
-              <!--  type="text"-->
-              <!--  @click="handleEdit(scope.row)">修改-->
-              <!--</el-button>-->
-              <el-button
-                v-if="scope.row.订单状态 === 1"
-                icon="el-icon-delete"
-                size="mini"
-                style="color: red"
-                type="text"
-                @click="deleteOrder(scope.row)"
-              >删除
-              </el-button>
-              <el-button
-                v-if="scope.row.订单状态 === 1"
-                size="mini"
-                type="text"
-                icon="el-icon-top"
-                @click="topOrder(scope.row)"
-              >上移
-              </el-button>
-              <el-button
-                v-if="scope.row.订单状态 === 1"
-                size="mini"
-                type="text"
-                icon="el-icon-bottom"
-                @click="downOrder(scope.row)"
-              >下移
-              </el-button>
-              <!--<el-button-->
-              <!--  :disabled=" scope.row.是否下发 == 0"-->
-              <!--  icon="el-icon-document-copy"-->
-              <!--  type="text"-->
-              <!--  @click="updateMainWorkCount(scope.row)">-->
-              <!--  修改剩余数量-->
-              <!--</el-button>-->
-              <!--<el-button-->
-              <!--  :disabled="scope.row.订单状态 != 3"-->
-              <!--  icon="el-icon-document-copy"-->
-              <!--  type="text"-->
-              <!--  @click="uploadCheckDataExcel(scope.row)">-->
-              <!--  导出检查项-->
-              <!--</el-button>-->
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="block" style="margin-top: 10px;">
-          <el-pagination
-            v-if="!loading"
-            :current-page="pageCurrent"
-            :page-size="pageSize"
-            :page-sizes="[30, 50, 100]"
-            :total="total"
-            layout="total, sizes, prev, pager, next, jumper"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
+          <el-option
+            v-for="item in engineType"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            size="mini"
           />
-        </div>
+        </el-select>
+        <span style="margin-left: 10px">开始日期：</span>
+        <el-date-picker
+          v-model="startPlanTime"
+          type="date"
+          size="small"
+          value-format="yyyy-MM-dd"
+          placeholder="选择开始日期"
+        />
+        <span style="margin-left: 10px">结束日期：</span>
+        <el-date-picker
+          v-model="endPlanTime"
+          type="date"
+          size="small"
+          value-format="yyyy-MM-dd"
+          placeholder="选择结束日期"
+        />
+        <el-button
+          type="primary"
+          plain
+          size="small"
+          icon="el-icon-search"
+          style="margin-left: 10px"
+          @click="
+            pageSize = 30;
+            pageCurrent = 1;
+            searchOrder();
+          "
+        >查询订单</el-button>
+        <el-button
+          type="warning"
+          size="small"
+          icon="el-icon-circle-plus"
+          @click="creatOrder('form')"
+        >创建订单</el-button>
+        <!--        <el-button type="info" plain size="small" icon="el-icon-upload2" @click="importOrder('form')">订单导入</el-button>-->
+        <!--        <el-button type="info" plain size="small" icon="el-icon-download" @click="exportExcel()">订单导出</el-button>-->
+      </div>
+      <el-table
+        ref="multipleTable"
+        v-loading="loading"
+        :data="tableData"
+        :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+        :cell-class-name="tableRowClassName"
+        :expand-row-keys="expandsDetail"
+        :row-key="getRowKeys"
+        element-loading-text="数据加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.2)"
+        class="main"
+        tooltip-effect="dark"
+        style="width: 100%; max-height: 700px"
+        border
+        height="800px"
+        size="mini"
+        @expand-change="selectPlan"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="index" label="排序" />
+        <el-table-column align="center" type="expand" label="" fixed width="35">
+          <template slot-scope="scope">
+            <div style="display: flex">
+              <!-- 详细数据盒子 -->
+              <div style="margin: 5px 10px; width: 1000px; z-index: 99">
+                <el-table
+                  :data="tableDataPrintDetail"
+                  :header-cell-style="{
+                    background: '#e5e7f8',
+                    color: '#606266',
+                  }"
+                  element-loading-text="数据加载中"
+                  element-loading-spinner="el-icon-loading"
+                  element-loading-background="rgba(0, 0, 0, 0.2)"
+                  class="main"
+                  tooltip-effect="dark"
+                  style="width: 100%; z-index: 99"
+                  max-height="400px"
+                  border
+                  size="mini"
+                >
+                  <el-table-column align="center" type="index" label="序号" />
+                  <el-table-column align="center" label="曲轴箱总成号" width="250">
+                    <template slot-scope="scope">
+                      {{ scope.row.发动机号 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column align="center" label="上线时间" width="150">
+                    <template slot-scope="scope">
+                      {{ scope.row.上线时间 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column align="center" label="下线时间" width="150">
+                    <template slot-scope="scope">
+                      {{ scope.row.下线时间 }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="订单号">
+          <template slot-scope="scope">
+            {{ scope.row.订单号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="产品型号">
+          <template slot-scope="scope">
+            {{ scope.row.产品型号 }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column align="center" label="总成号">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.零件号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column align="center" label="计划数量">
+          <template slot-scope="scope">
+            {{ scope.row.计划数量 }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column align="center" label="完成数量">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.完成数量 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="状态">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 0" effect="plain" style="width: 70px" type="info">已结束</el-tag>-->
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 1" effect="plain" style="width: 70px" type="success">生产中</el-tag>-->
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 2" effect="plain" style="width: 70px" type="text">未上线</el-tag>-->
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 3" effect="plain" style="width: 70px" type="warning">未完成</el-tag>-->
+        <!--            <el-tag v-if="parseInt(scope.row.订单状态) === 4" effect="plain" style="width: 70px" type="danger">已超额</el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column align="center" label="计划开始日期">
+          <template slot-scope="scope">
+            {{ scope.row.计划开始时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="计划完成日期">
+          <template slot-scope="scope">
+            {{ scope.row.计划完成时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="生产状态">
+          <template slot-scope="scope">
+            <el-tag
+              v-if="Number(scope.row.订单状态) === 1"
+              size="mini"
+              type="info"
+            >未开始</el-tag>
+            <el-tag
+              v-if="Number(scope.row.订单状态) === 2"
+              size="mini"
+              type="warning"
+            >生产中</el-tag>
+            <el-tag
+              v-if="Number(scope.row.订单状态) === 3"
+              size="mini"
+              type="success"
+            >已完成</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" min-width="150">
+          <template slot-scope="scope">
+            <el-button
+              v-if="parseInt(scope.row.订单状态) === 2"
+              size="mini"
+              type="text"
+              icon="el-icon-check"
+              @click="competeOrder(scope.row)"
+            >订单完工</el-button>
+            <el-button
+              v-if="parseInt(scope.row.订单状态) === 1"
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.row)"
+            >修改</el-button>
+            <el-button
+              v-if="parseInt(scope.row.订单状态) === 1"
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              style="color: red"
+              @click="deleteOrder(scope.row)"
+            >删除</el-button>
+            <el-button
+              v-if="parseInt(scope.row.是否下发) === 0"
+              size="mini"
+              type="text"
+              icon="el-icon-download"
+              @click="ordersIssuedEditor(scope.row)"
+            >下发</el-button>
+            <el-button
+              v-if="parseInt(scope.row.是否下发) === 1 && parseInt(scope.row.订单状态) === 1"
+              size="mini"
+              type="text"
+              icon="el-icon-upload2"
+              @click="ordersIssuedEditor1(scope.row)"
+            >撤回</el-button>
+            <el-button
+              v-if="parseInt(scope.row.是否下发) === 0 && parseInt(scope.row.订单状态) === 1"
+              size="mini"
+              type="text"
+              icon="el-icon-top"
+              @click="topOrder(scope.row)">上移</el-button>
+            <el-button
+              v-if="parseInt(scope.row.是否下发) === 0 && parseInt(scope.row.订单状态) === 1"
+              size="mini"
+              type="text"
+              icon="el-icon-bottom"
+              @click="downOrder(scope.row)">下移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[30, 50, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
       </div>
     </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" center style="min-height: 200px;" title="创建生产订单" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px">
-        <el-form-item label="工程号" prop="workCode" style="display: inline-block">
-          <el-input v-model="form.workCode" clearable placeholder="请输入工程号" size="small"/>
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      title="创建生产订单"
+      center
+      style="min-height: 200px"
+      width="400px"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-position="right"
+        label-width="110px"
+      >
+        <el-form-item label="订单号" prop="orderNumber" style="display: inline-block">
+          <el-input v-model="form.orderNumber" clearable size="small" placeholder="请输入订单号" />
         </el-form-item>
-        <el-form-item label="订单号" prop="orderCode" style="display: inline-block">
-          <el-input v-model="form.orderCode" clearable placeholder="请输入订单号" size="small"/>
-        </el-form-item>
-        <el-form-item label="产品型号" prop="engineType" style="display: inline-block">
-          <el-select v-model="form.engineType" placeholder="请选择产品型号" size="small" style="width: 200px">
-            <el-option v-for="item in engineType" :key="item.value" :label="item.label" :value="item.value" size="mini"/>
+        <el-form-item
+          label="产品型号"
+          prop="engineTypeValue"
+          style="display: inline-block"
+        >
+          <el-select
+            v-model="form.engineTypeValue"
+            size="small"
+            filterable
+            placeholder="请选择产品型号"
+          >
+            <el-option
+              v-for="item in engineType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item label="数量" prop="number" style="display: inline-block">
+        <!--        <el-form-item label="总成号" prop="partCode" style="display: inline-block">-->
+        <!--          <el-select v-model="form.partCode" size="small" filterable placeholder="请选择总成号">-->
+        <!--            <el-option v-for="item in partCodeList" :key="item.value" :label="item.label" :value="item.value" />-->
+        <!--          </el-select>-->
+        <!--        </el-form-item>-->
+        <el-form-item
+          label="计划数量"
+          prop="planQuantity"
+          style="display: inline-block"
+        >
           <el-input-number
-            v-model="form.number"
+            v-model="form.planQuantity"
             :min="1"
             :step="1"
-            placeholder="请输入数量"
             size="small"
-            style="width: 200px;"
+            style="width: 200px"
+            placeholder="请输入计划数量"
           />
         </el-form-item>
-        <el-form-item label="计划开始" prop="startPlanTime" style="display: inline-block">
+        <el-form-item
+          label="计划开始时间"
+          prop="startPlanTime"
+          style="display: inline-block"
+        >
           <el-date-picker
             v-model="form.startPlanTime"
-            placeholder="选择计划开始时间"
             size="small"
             type="date"
-            style="width: 200px"
             value-format="yyyy-MM-dd"
+            placeholder="选择开始时间"
           />
         </el-form-item>
-        <el-form-item label="计划结束" prop="endPlanTime" style="display: inline-block">
+        <el-form-item
+          label="计划结束时间"
+          prop="endPlanTime"
+          style="display: inline-block"
+        >
           <el-date-picker
             v-model="form.endPlanTime"
-            placeholder="选择计划结束时间"
             size="small"
             type="date"
-            style="width: 200px"
             value-format="yyyy-MM-dd"
+            placeholder="选择结束时间"
           />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="callOff('form')">取消</el-button>
-        <el-button size="small" type="primary" @click="submitAdd('form')">确定</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          @click="submitAdd('form')"
+        >确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible1" center style="min-height: 200px" title="编辑生产订单" width="400px">
-      <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px">
-        <el-form-item label="订单号" prop="orderNumber" style="display: inline-block">
-          <el-input v-model="form1.orderNumber" placeholder="请输入订单号" readonly size="small"/>
+    <el-dialog
+      :visible.sync="dialogFormVisible1"
+      title="编辑生产订单"
+      center
+      style="min-height: 200px"
+      width="400px"
+    >
+      <el-form
+        ref="form1"
+        :model="form1"
+        :rules="rules1"
+        label-position="right"
+        label-width="110px"
+      >
+        <el-form-item
+          label="订单号"
+          prop="orderNumber"
+          style="display: inline-block"
+        >
+          <el-input
+            v-model="form1.orderNumber"
+            readonly
+            size="small"
+            placeholder="请输入订单号"
+          />
         </el-form-item>
-        <el-form-item label="产品型号" prop="engineTypeValue" style="display: inline-block">
-          <el-input v-model="form1.engineTypeValue" placeholder="产品型号" readonly size="small"/>
+        <el-form-item
+          label="产品型号"
+          prop="engineTypeValue"
+          style="display: inline-block"
+        >
+          <el-input
+            v-model="form1.engineTypeValue"
+            readonly
+            size="small"
+            placeholder="产品型号"
+          />
         </el-form-item>
         <!--<el-form-item label="总成号" prop="partCode" style="display: inline-block">-->
         <!--  <el-input v-model="form1.partCode" readonly size="small" placeholder="总成号" />-->
         <!--</el-form-item>-->
-        <el-form-item label="计划数量" prop="planQuantity" style="display: inline-block">
+        <el-form-item
+          label="计划数量"
+          prop="planQuantity"
+          style="display: inline-block"
+        >
           <el-input-number
             v-model="form1.planQuantity"
             :min="1"
             :step="1"
-            placeholder="请输入计划数量"
             size="small"
-            style="width: 200px;"
+            style="width: 200px"
+            placeholder="请输入计划数量"
           />
         </el-form-item>
-        <el-form-item label="计划开始" prop="startPlanTime" style="display: inline-block">
+<!--        <el-form-item-->
+<!--          label="桥壳上线数"-->
+<!--          prop="planQuantity"-->
+<!--          style="display: inline-block"-->
+<!--        >-->
+<!--          <el-input-number-->
+<!--            v-model="form1.qiaoKeOverNumber"-->
+<!--            :min="0"-->
+<!--            :step="1"-->
+<!--            size="small"-->
+<!--            style="width: 200px"-->
+<!--            placeholder="请输入计划数量"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item-->
+<!--          label="轮毂上线数"-->
+<!--          prop="planQuantity"-->
+<!--          style="display: inline-block"-->
+<!--        >-->
+<!--          <el-input-number-->
+<!--            v-model="form1.lunGuOverNumber"-->
+<!--            :min="0"-->
+<!--            :step="1"-->
+<!--            size="small"-->
+<!--            style="width: 200px"-->
+<!--            placeholder="请输入计划数量"-->
+<!--          />-->
+<!--        </el-form-item>-->
+        <el-form-item
+          label="计划开始时间"
+          prop="startPlanTime"
+          style="display: inline-block"
+        >
           <el-date-picker
             v-model="form1.startPlanTime"
-            placeholder="选择开始时间"
             size="small"
             type="date"
             value-format="yyyy-MM-dd"
+            placeholder="选择开始时间"
           />
         </el-form-item>
-        <el-form-item label="计划结束" prop="endPlanTime" style="display: inline-block">
+        <el-form-item
+          label="计划结束时间"
+          prop="endPlanTime"
+          style="display: inline-block"
+        >
           <el-date-picker
             v-model="form1.endPlanTime"
-            placeholder="选择结束时间"
             size="small"
             type="date"
             value-format="yyyy-MM-dd"
+            placeholder="选择结束时间"
           />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="callOff1()">取消</el-button>
-        <el-button size="small" type="primary" @click="submitAdd1()">确定</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          @click="submitAdd1()"
+        >确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible3" center style="min-height: 200px" title="订单导入" width="900px">
+    <el-dialog
+      :visible.sync="dialogFormVisible3"
+      title="订单导入"
+      center
+      style="min-height: 200px"
+      width="900px"
+    >
       <div class="app-container">
-        <upload-excel-component style="margin-left: 15%" @on-selected-file="selected"/>
+        <upload-excel-component
+          style="margin-left: 15%"
+          @on-selected-file="selected"
+        />
         <div style="margin-left: 395px">
-          <span v-show="worksheet.length > 1" style="cursor: pointer;width: 50px;" @click="removeAll"><i
+          <span
+            v-show="worksheet.length > 1"
+            style="cursor: pointer; width: 50px"
+            @click="removeAll"
+          ><i
             class="el-icon-close"
           /></span>
-          <el-upload :file-list="itemFile" :on-remove="handleRemove" action="" style="width: 220px"/>
+          <el-upload
+            :on-remove="handleRemove"
+            :file-list="itemFile"
+            style="width: 220px"
+            action=""
+          />
         </div>
         <div v-if="worksheet.length !== 0" style="margin: 3px 0 0 395px">
-          <el-button icon="el-icon-upload2" size="small" type="primary" @click="basicPartsToSQL">导入到数据库
-          </el-button>
+          <el-button
+            icon="el-icon-upload2"
+            type="primary"
+            size="small"
+            @click="basicPartsToSQL"
+          >导入到数据库</el-button>
         </div>
       </div>
     </el-dialog>
     <el-dialog
       :visible.sync="dialogFormVisible4"
-      center
-      style="min-height: 200px;"
       title="打印变速器条码"
+      center
+      style="min-height: 200px"
       width="400px"
     >
-      <el-form ref="printForm" :model="printForm" :rules="printRules" label-position="right" label-width="110px">
-        <el-form-item label="产品型号" prop="产品型号" style="display: inline-block">
-          <el-input v-model="printForm.产品型号" placeholder="请输入产品型号" readonly size="small"/>
+      <el-form
+        ref="printForm"
+        :model="printForm"
+        :rules="printRules"
+        label-position="right"
+        label-width="110px"
+      >
+        <el-form-item
+          label="产品型号"
+          prop="产品型号"
+          style="display: inline-block"
+        >
+          <el-input
+            v-model="printForm.产品型号"
+            readonly
+            size="small"
+            placeholder="请输入产品型号"
+          />
         </el-form-item>
-        <el-form-item label="总成号" prop="零件号" style="display: inline-block">
-          <el-input v-model="printForm.零件号" placeholder="请输入总成号" readonly size="small"/>
+        <el-form-item
+          label="总成号"
+          prop="零件号"
+          style="display: inline-block"
+        >
+          <el-input
+            v-model="printForm.零件号"
+            readonly
+            size="small"
+            placeholder="请输入总成号"
+          />
         </el-form-item>
-        <el-form-item label="序列号" prop="起始号码" style="display: inline-block">
+        <el-form-item
+          label="序列号"
+          prop="起始号码"
+          style="display: inline-block"
+        >
           <el-input
             v-model="printForm.起始号码"
             :disabled="printCountPlanIsShow"
-            placeholder="请输入八位序列号"
             size="small"
+            placeholder="请输入八位序列号"
             @blur="startKeyChange(printForm.起始号码)"
           />
           <!--          <el-input-number-->
@@ -402,193 +554,59 @@
           <!--            style="width: 200px;"-->
           <!--            placeholder="请输入计划数量" />-->
         </el-form-item>
-        <el-form-item label="打印日期" prop="打印日期" style="display: inline-block">
+        <el-form-item
+          label="打印日期"
+          prop="打印日期"
+          style="display: inline-block"
+        >
           <el-date-picker
             v-model="printForm.打印日期"
             :disabled="printCountPlanIsShow"
-            placeholder="选择打印日期"
             size="small"
             type="date"
             value-format="yyyy-MM-dd"
+            placeholder="选择打印日期"
             @change="getPrintDate"
           />
         </el-form-item>
-        <el-form-item label="打印数量" prop="打印数量" style="display: inline-block">
+        <el-form-item
+          label="打印数量"
+          prop="打印数量"
+          style="display: inline-block"
+        >
           <el-input-number
             v-model="printForm.打印数量"
             :disabled="printCountPlanIsShow"
             :min="1"
             :step="1"
-            placeholder="请输入打印数量"
             size="small"
-            style="width: 200px;"
+            style="width: 200px"
+            placeholder="请输入打印数量"
           />
         </el-form-item>
-        <div v-if="printCountPlanIsShow" style="text-align: center;color: #3c9445;font-size: 20px">
+        <div
+          v-if="printCountPlanIsShow"
+          style="text-align: center; color: #3c9445; font-size: 20px"
+        >
           打印进度：{{ printCountPlan }} / {{ printForm.打印数量 }}
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="callOffPrint()">取消</el-button>
-        <el-button :disabled="isAllowAddClike" size="small" type="primary" @click="submitAddPrint('printForm')">确定
-        </el-button>
+        <el-button
+          :disabled="isAllowAddClike"
+          type="primary"
+          size="small"
+          @click="submitAddPrint('printForm')"
+        >确定</el-button>
       </div>
     </el-dialog>
-    <!--// 强制下线弹出框-->
-    <el-dialog
-      :append-to-body="true"
-      :visible.sync="isForceOffLine"
-      center
-      title="异常处理"
-      width="450px"
-    >
-      <div style="text-align: center">
-        <el-form
-          ref="faultStartFormRef"
-          :model="forceOffLineForm"
-          :rules="forceOffLineForm_rules3"
-          label-position="right"
-          label-width="100px"
-        >
-          <el-form-item label="订单号" prop="orderCode" style="display: inline-block;">
-            <el-input
-              v-model="forceOffLineForm.orderCode"
-              placeholder="订单号"
-              readonly
-              style="width:220px;"
-            />
-          </el-form-item>
-          <el-form-item label="工位号" prop="opName" style="display: inline-block;">
-            <el-select
-              v-model="forceOffLineForm.opName"
-              placeholder="请选择工位号"
-              style="width:220px;"
-              size="small"
-            >
-              <el-option
-                v-for="item in stationNumber"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-                size="mini"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="处理类型" prop="type" style="display: inline-block;">
-            <el-select
-              v-model="forceOffLineForm.type"
-              placeholder="请选择处理类型"
-              style="width:220px;"
-              size="small"
-            >
-              <el-option
-                v-for="item in forceOffTypeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-                size="mini"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="授权账号" prop="account" style="display: inline-block;">
-            <el-input
-              v-model="forceOffLineForm.account"
-              placeholder="授权人"
-              clearable
-              style="width:220px;"
-            />
-          </el-form-item>
-          <el-form-item label="授权密码" prop="password" style="display: inline-block;">
-            <el-input
-              v-model="forceOffLineForm.password"
-              placeholder="订单号"
-              clearable
-              type="password"
-              style="width:220px;"
-            />
-          </el-form-item>
-          <el-form-item label="异常原因" prop="offLineTest" style="display: inline-block;">
-            <el-input
-              v-model="forceOffLineForm.offLineTest"
-              :rows="2"
-              placeholder="请输入异常原因"
-              style="height: 42px;width: 220px"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-form>
-        <!--底部按钮-->
-        <div slot="footer" class="dialog-footer">
-          <el-button size="small" type="primary" @click="forceOffLineSubmit()">确定</el-button>
-          <el-button size="small" @click="isForceOffLine = false">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
-    <el-dialog
-      v-el-drag-dialog
-      :visible.sync="dialogFormVisibleModifyOrder"
-      center
-      title="强制下线记录"
-      width="63%"
-    >
-      <el-table
-        :data="tableDataVisibleModifyOrder"
-        :header-cell-style="{background: '#383E4B',color: 'white'}"
-        highlight-current-row
-        border
-        stripe
-        size="small"
-        height="550px"
-        style="width: 1171px"
-      >
-        <el-table-column min-width="100px" label="工位号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.工位号 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="90px" label="操作者" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.操作者 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="间隔号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.间隔号 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="单元号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.单元号 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="装配类型" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.间隔号 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="下线原因" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.原因 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="下线类型" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.下线类型 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="200px" label="操作时间" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.操作时间 }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import UploadExcelComponent from './UploadExcel.vue'
-import { getNowShotTime, sleep } from '../../../utils/tool' // import { Mqtt } from '../../../utils/mqtt.js'
+import { sleep } from '../../../utils/tool'
 // import { Mqtt } from '../../../utils/mqtt.js'
 export default {
   name: 'UploadExcel',
@@ -609,7 +627,6 @@ export default {
         username: 'MES_Manager',
         password: '123456'
       },
-      tableDataFirst: [],
       subscription: {
         topic: '',
         qos: 0
@@ -634,15 +651,14 @@ export default {
       OrderNumber_check: 0,
       engineTypeValue: '',
       engineType: [],
-      stationNumber: [],
-      stationNumberValue: '',
       partCodeList: [],
       OKWarehouseValue: '',
       OKWarehouse: [],
       NGWarehouseValue: '',
       NGWarehouse: [],
       engineType_check: 0,
-      printForm: { // 创建订单
+      printForm: {
+        // 创建订单
         订单号: '',
         零件号: '',
         产品型号: '',
@@ -651,107 +667,139 @@ export default {
         打印日期: '',
         打印数量: 1
       },
-      printRules: { // 打印条码验证
+      printRules: {
+        // 打印条码验证
         零件号: [{ required: true, message: '请输入总成号', trigger: 'blur' }],
         订单号: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        产品型号: [{ required: true, message: '请输入产品型号', trigger: 'blur' }],
-        起始号码: [{ required: true, min: 8, message: '长度最少为八位', trigger: 'blur' }],
-        打印日期: [{ required: true, message: '请选择打印日期', trigger: 'blur' }],
-        打印数量: [{ required: true, message: '请输入打印数量', trigger: 'blur' }]
+        产品型号: [
+          { required: true, message: '请输入产品型号', trigger: 'blur' }
+        ],
+        起始号码: [
+          {
+            required: true,
+            min: 8,
+            message: '长度最少为八位',
+            trigger: 'blur'
+          }
+        ],
+        打印日期: [
+          { required: true, message: '请选择打印日期', trigger: 'blur' }
+        ],
+        打印数量: [
+          { required: true, message: '请输入打印数量', trigger: 'blur' }
+        ]
       },
-      form: { // 创建订单
-        workCode: '', // 工程号
-        orderCode: '', // 订单号
-        engineType: '', // 物料号
-        engineTypeDescribe: '', // 物料描述
-        number: 1, // 数量
-        startPlanTime: '', // 开始时间
-        endPlanTime: '' // 结束时间
+      form: {
+        // 创建订单
+        planQuantity: '',
+        orderNumber: '',
+        engineTypeValue: '',
+        partCode: '123',
+        startPlanTime: '',
+        endPlanTime: '',
+        quantityCompletion: ''
       },
-      rules: { // 创建订单验证
-        workCode: [{ required: true, message: '请输入工程号', trigger: 'blur' }],
-        orderCode: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        engineType: [{ required: true, message: '请输入物料号', trigger: 'blur' }],
-        engineTypeDescribe: [{ required: true, message: '请输入物料描述', trigger: 'blur' }],
-        number: [{ required: true, message: '请输入生产数量', trigger: 'blur' }],
-        startPlanTime: [{ required: true, message: '请输入计划开始时间', trigger: 'blur' }],
-        endPlanTime: [{ required: true, message: '请输入计划结束时间', trigger: 'blur' }]
+      rules: {
+        // 创建订单验证
+        planQuantity: [
+          { required: true, message: '请输入计划数量', trigger: 'blur' }
+        ],
+        orderNumber: [
+          { required: true, message: '请输入订单号', trigger: 'blur' }
+        ],
+        engineTypeValue: [
+          { required: true, message: '请选择机型', trigger: 'blur' }
+        ],
+        partCode: [
+          { required: true, message: '请选择总成号', trigger: 'blur' }
+        ],
+        startPlanTime: [
+          { required: true, message: '请选择计划开始时间', trigger: 'blur' }
+        ],
+        endPlanTime: [
+          { required: true, message: '请选择计划结束时间', trigger: 'blur' }
+        ],
+        quantityCompletion: [
+          { required: true, message: '请输入计划完成数量', trigger: 'blur' }
+        ]
       },
-      form1: { // 修改订单
-        workCode: '', // 制造编号
-        projectName: '', // 项目名称
-        splitCode: '', // 间隔号
-        unidCode: '', // 单元号
-        engineType: '', // 本体类型
-        engineTypeModel: '', // 附件类型
-        startPlanTime: '', // 开始时间
-        endPlanTime: '' // 结束时间
+      form1: {
+        // 修改订单
+        planQuantity: '',
+        orderNumber: '',
+        engineTypeValue: '',
+        startPlanTime: '',
+        endPlanTime: '',
+        partCode: '',
+        quantityCompletion: 0,
+        MID: '',
+        rank: '',
+        qiaoKeOverNumber: 0,
+        lunGuOverNumber: 0
       },
-      rules1: { // 修改订单验证
-        planQuantity: [{ required: true, message: '请输入计划数量', trigger: 'blur' }],
-        orderNumber: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        engineTypeValue: [{ required: true, message: '请选择机型', trigger: 'blur' }],
-        partCode: [{ required: true, message: '请选择总成号', trigger: 'blur' }],
-        startPlanTime: [{ required: true, message: '请选择计划开始时间', trigger: 'blur' }],
-        endPlanTime: [{ required: true, message: '请选择计划结束时间', trigger: 'blur' }],
-        quantityCompletion: [{ required: true, message: '请输入计划完成数量', trigger: 'blur' }]
+      rules1: {
+        // 修改订单验证
+        planQuantity: [
+          { required: true, message: '请输入计划数量', trigger: 'blur' }
+        ],
+        partCode: [
+          { required: true, message: '请选择总成号', trigger: 'blur' }
+        ],
+        startPlanTime: [
+          { required: true, message: '请选择计划开始时间', trigger: 'blur' }
+        ],
+        endPlanTime: [
+          { required: true, message: '请选择计划结束时间', trigger: 'blur' }
+        ],
+        quantityCompletion: [
+          { required: true, message: '请输入计划完成数量', trigger: 'blur' }
+        ]
       },
-      form2: { // 订单下发
+      form2: {
+        // 订单下发
         planQuantity: '',
         orderNumber: '',
         engineTypeValue: '',
         MID: '',
         IssuedQuantity: 1
       },
-      rules2: { // 订单下发验证
-        planQuantity: [{ required: true, message: '请输入计划数量', trigger: 'blur' }],
-        orderNumber: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        engineTypeValue: [{ required: true, message: '请选择机型', trigger: 'blur' }],
-        IssuedQuantity: [{ required: true, message: '请输入订单下发数量', trigger: 'blur' }]
+      rules2: {
+        // 订单下发验证
+        planQuantity: [
+          { required: true, message: '请输入计划数量', trigger: 'blur' }
+        ],
+        orderNumber: [
+          { required: true, message: '请输入订单号', trigger: 'blur' }
+        ],
+        engineTypeValue: [
+          { required: true, message: '请选择机型', trigger: 'blur' }
+        ],
+        IssuedQuantity: [
+          { required: true, message: '请输入订单下发数量', trigger: 'blur' }
+        ]
       },
-      form3: { // 订单下发
+      form3: {
+        // 订单下发
         planQuantity: '',
         orderNumber: '',
         engineTypeValue: '',
         MID: '',
         IssuedQuantity: 1
       },
-      rules3: { // 订单下发验证
-        planQuantity: [{ required: true, message: '请输入计划数量', trigger: 'blur' }],
-        orderNumber: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        engineTypeValue: [{ required: true, message: '请选择机型', trigger: 'blur' }],
-        IssuedQuantity: [{ required: true, message: '请输入订单下发数量', trigger: 'blur' }]
-      },
-      isForceOffLine: false,
-      forceOffLineForm: {
-        opName: '',
-        workCode: '',
-        currentAccount_name: '',
-        account: '',
-        account_name: '',
-        password: '',
-        orderCode: '',
-        unitCode: '',
-        engineID: '',
-        type: '',
-        offLineTest: '' // 下线原因
-      },
-      forceOffTypeList: [
-        {
-          label: '重新开始',
-          value: '1'
-        },
-        {
-          label: '装配完成',
-          value: '3'
-        }
-      ],
-      forceOffLineForm_rules3: { // 订单下发验证
-        opName: [{ required: true, message: '请选择处理工位', trigger: 'change' }],
-        type: [{ required: true, message: '请选择处理类型', trigger: 'change' }],
-        offLineTest: [{ required: true, message: '请输入异常原因', trigger: 'blur' }],
-        account: [{ required: true, message: '请输入授权账号', trigger: 'blur' }],
-        password: [{ required: true, message: '请输入授权密码', trigger: 'blur' }]
+      rules3: {
+        // 订单下发验证
+        planQuantity: [
+          { required: true, message: '请输入计划数量', trigger: 'blur' }
+        ],
+        orderNumber: [
+          { required: true, message: '请输入订单号', trigger: 'blur' }
+        ],
+        engineTypeValue: [
+          { required: true, message: '请选择机型', trigger: 'blur' }
+        ],
+        IssuedQuantity: [
+          { required: true, message: '请输入订单下发数量', trigger: 'blur' }
+        ]
       },
       // planTime: [new Date(new Date().getTime() - 3600 * 1000 * 24 * 3000), new Date(new Date().getTime())],
       planTime: [],
@@ -776,36 +824,50 @@ export default {
       pageList: 30, // 每页显示条数
       pageSize: 30, // 每页显示条数
       pageCurrent: 1, // 后台获取页
-      loading: false,
-      tableDataVisibleModifyOrder: [],
-      dialogFormVisibleModifyOrder: false,
-      numberModifyOrder: ''
+      loading: false
     }
   },
   created() {
-    this.planTime = [getNowShotTime(), getNowShotTime()]
-    this.getStationNumber()
+    this.getOrderNumber()
     this.getEndStation()
-  },
-  mounted() {
+    this.getPartCodeList()
     this.searchOrder()
   },
+  mounted() {
+    // if (window.g.mqttClient) {
+    //   window.g.mqttClient.destroyConnection()
+    // }
+    // this.mqttConnection.username = 'MES_Manager_Plan'
+    // window.g.mqttClient = new Mqtt(this.mqttConnection)
+    // window.g.mqttClient.createConnection()
+    // window.g.mqttClient.client.on('connect', () => {
+    //   console.log('MQTT Connection succeeded!')
+    // })
+    // // 使用过程中的报错 断开连接 服务端出问题
+    // window.g.mqttClient.client.on('error', error => {
+    //   console.log('Connection failed', error)
+    // })
+    // window.g.mqttClient.client.on('message', (topic, message) => {
+    //   console.log('Received message:', topic, message.toString())
+    // })
+  },
   beforeDestroy() {
-
+    // if (window.g.mqttClient.client.connected) {
+    //   const destroyConnection = window.g.mqttClient.destroyConnection()
+    //   if (destroyConnection) {
+    //     this.$message({
+    //       message: 'MQTT断开成功！',
+    //       type: 'success'
+    //     })
+    //   } else {
+    //     this.$message({
+    //       message: 'MQTT断开失败！',
+    //       type: 'error'
+    //     })
+    //   }
+    // }
   },
   methods: {
-    viewModifyOrder() {
-      this.dialogFormVisibleModifyOrder = true
-      this.viewModifyOrderClick()
-    },
-    viewModifyOrderClick() {
-      var param1 = []
-      var Data1 = this.CreateData('11', 'MES_强制下线记录_查询', param1)
-      this.ExecDatabase(Data1).then(response => {
-        // this.numberModifyOrder = response.data.length
-        this.tableDataVisibleModifyOrder = response.data
-      })
-    },
     printShow(row) {
       this.printForm.订单号 = row.订单号
       this.printForm.产品型号 = row.产品型号
@@ -819,12 +881,14 @@ export default {
       this.worksheet = []
       this.itemFile = []
     },
-    async selected(data) { // 选择需要导入的文件
+    async selected(data) {
+      // 选择需要导入的文件
       console.log(data, 1111)
       this.worksheet = data.worksheet // 获取每个多选文件的表格坐标及值
       this.itemFile = data.itemFile
     },
-    handleRemove(file) { // 移除文件
+    handleRemove(file) {
+      // 移除文件
       for (let i = 0; i < this.itemFile.length; i++) {
         if (this.itemFile[i].name === file.name) {
           this.worksheet.splice(i, 1)
@@ -850,26 +914,11 @@ export default {
       this.engineType = []
       var param = []
       var Data = this.CreateData('11', 'MES_基本变量_机型代码_查询', param)
-      this.ExecDatabase(Data).then(response => {
+      this.ExecDatabase(Data).then((response) => {
         for (let i = 0; i < response.data.length; i++) {
           this.engineType.push({
-            label: response.data[i].发动机型号 + '-' + response.data[i].标识字符,
-            value: response.data[i].发动机机型标志
-          })
-        }
-      })
-    },
-    // 获取工位号
-    getStationNumber() {
-      this.stationNumber = []
-      var param = []
-      var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data.length) this.stationNumberValue = response.data[0].工位号
-        for (let i = 0; i < response.data.length; i++) {
-          this.stationNumber.push({
-            label: `【${response.data[i].工位号}】${response.data[i].工位名称}`,
-            value: response.data[i].工位号
+            label: response.data[i].发动机型号,
+            value: response.data[i].发动机型号
           })
         }
       })
@@ -889,79 +938,13 @@ export default {
 
       return `${year}-${month}-${strDate}`
     },
-    renderHeader(h) {
-      return (
-        <div>
-          <span>操作</span>
-          <el-button
-            type='primary'
-            style='padding:2px 5px;margin-left: 10px'
-            size='mini'
-            onClick={() => this.addDetailsRow()}
-          >
-            +
-          </el-button>
-        </div>
-      )
-    },
-    // 提交订单明细
-    addDetailsRow() {
-      if (!this.btn_makeOrder) {
-        this.$message.warning('请先创建生产订单！')
-        return
-      }
-      var param = []
-      param[0] = ['订单号', this.form.orderNumber]
-      param[1] = ['产品型号', '']
-      param[2] = ['计划数量', 1]
-      param[3] = ['加工方式代码', 1]
-      var Data = this.CreateData(
-        '12',
-        'SY_MES_计划BOM_发动机预制订单_明细_创建',
-        param
-      )
-      this.ExecDatabase(Data).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message({
-            message: '修改成功',
-            type: 'success'
-          })
-          this.searchOrderFirstDetails(this.form.orderNumber)
-        } else {
-          this.$message.error('新增失败！')
-        }
-      })
-    },
-    searchOrderFirstDetails(orderNumber) {
-      this.tableDataFirst = []
-      var param = []
-      param[0] = ['订单号', orderNumber]
-      var Data = this.CreateData(
-        '11',
-        'SY_MES_计划BOM_发动机预制订单_明细查询',
-        param
-      )
-      this.ExecDatabase(Data).then(response => {
-        for (const responseElement of response.data) {
-          responseElement['edit'] = false
-          responseElement['加工方式代码_yuan'] =
-            responseElement['加工方式代码']
-          responseElement['加工方式代码_yuan'] =
-            responseElement['加工方式代码']
-          responseElement['产品型号_yuan'] = responseElement['产品型号']
-          responseElement['计划数量_yuan'] = responseElement['计划数量']
-        }
-        this.tableDataFirst = response.data
-      })
-    },
     // 初始化获取产品型号
     getPartCodeList() {
       this.partCodeList = []
-      this.form.engineTypeModel = ''
       var param = []
-      param[0] = ['基本机型', this.form.engineType]
+      param[0] = ['基本机型', this.form.engineTypeValue]
       var Data = this.CreateData('11', '北汽福田订单创建零件号_查询', param)
-      this.ExecDatabase(Data).then(response => {
+      this.ExecDatabase(Data).then((response) => {
         if (response.data.length === 0) {
           this.$message({
             type: 'error',
@@ -975,6 +958,7 @@ export default {
               value: response.data[i].零件号
             })
           }
+          this.form.partCodeValue = this.partCodeList[0].value
         }
       })
     },
@@ -985,7 +969,7 @@ export default {
       param[0] = ['开始时间', this.planTime[0]]
       param[1] = ['结束时间', this.planTime[1]]
       var Data = this.CreateData('11', '订单计划_订单号_查询', param)
-      this.ExecDatabase(Data).then(response => {
+      this.ExecDatabase(Data).then((response) => {
         for (let i = 0; i < response.data.length; i++) {
           this.orderNumber.push({
             label: response.data[i].订单号,
@@ -994,203 +978,38 @@ export default {
         }
       })
     },
-    buttonIsDisabled(row) {
-      let isDisabled = false
-      if (row.订单状态 !== 1) isDisabled = true
-      return isDisabled
-    },
-    // 下移订单
-    downOrder(row) {
-      if (row.MID) {
-        var param = []
-        param[0] = ['id', row.MID]
-        console.log(param)
-        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单下移', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'success',
-              duration: 3000
-            })
-            this.searchOrder()
-          } else {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'error',
-              duration: 3000
-            })
-          }
-        })
-      } else {
-        this.$message.error('请选择订单！')
-      }
-    },
-    // 上移订单
-    topOrder(row) {
-      if (row.MID) {
-        var param = []
-        param[0] = ['id', row.MID]
-        console.log(param)
-        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单上移', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'success',
-              duration: 3000
-            })
-            this.searchOrder()
-          } else {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'error',
-              duration: 3000
-            })
-          }
-        })
-      } else {
-        this.$message.error('请选择订单！')
-      }
-    },
-    // 修改小线剩余上料数
-    updateWorkOver(row) {
-      this.$confirm(`是否强制该工件完工下线 <i style="color: red">  工件编号：` + row.工件编号 + `</i> `, '提示', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        var param = []
-        param[0] = ['工件编号', row.工件编号]
-        var Data = this.CreateData('12', '生产计划_派工订单_工件追溯_强制完成', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('强制下线成功！')
-            this.selectPlan(row, this.expandsDetail)
-          } else {
-            this.$message.error('强制下线失败！')
-          }
-        })
-      })
-    },
-    // 导出检查项
-    uploadCheckDataExcel(row) {
-      if (this.tableData.length !== 0) {
-        var param = []
-        param[0] = ['订单号', row.订单号]
-        var Data = this.CreateData('2001', '电子看板_工序内容_记录表_订单号导出', param)
-        this.exportExcel_NPOI(Data)
-      } else {
-        this.$message.warning('暂无数据')
-      }
-    },
-    // 修改线首订单剩余上料数
-    updateMainWorkCount(row) {
-      // 弹窗输入数量弹窗 只能输入数字 不能负数
-      this.$prompt('请输入修改后的线首订单剩余上料数量', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputPattern: /^\d+$/,
-        inputErrorMessage: '只能输入数字',
-        inputValue: (row.计划数量 - row.总装上线)
-      }).then(({ value }) => {
-        if (value > row.计划数量) {
-          this.$notify.error({
-            title: '提示',
-            message: '剩余数不可大于计划数量！',
-            position: 'top-right',
-            offset: 10
-          })
-          return
-        }
-        const param = []
-        param[0] = ['订单号', row.订单号]
-        param[1] = ['待上线数量', value]
-        const Data = this.CreateData('12', '合力_总装线PLC_更新待上线数量', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === '1') {
-            this.$notify.success({
-              title: '提示',
-              message: '修改成功！',
-              position: 'bottom-right',
-              offset: 170
-            })
-          } else {
-            this.$message.error('修改失败')
-          }
-          this.searchOrder()
-          // this.getTable1()
-          // this.getTable2()
-        })
-      })
-    },
-    // 强制下线
-    forceOffLine(row) {
-      this.forceOffLineForm.engineID = row.工件编号
-      this.forceOffLineForm.unitCode = row.单元号
-      this.forceOffLineForm.workCode = row.制造编号
-      this.forceOffLineForm.orderCode = row.订单号
-      this.forceOffLineForm.type = ''
-      this.forceOffLineForm.opName = ''
-      this.forceOffLineForm.offLineTest = ''
-      this.forceOffLineForm.password = ''
-      this.forceOffLineForm.account = ''
-      this.isForceOffLine = true
-    },
-    // 强制下线记录
-    forceOffLineSubmit() {
-      var param = []
-      param[0] = ['工位号', this.forceOffLineForm.opName]
-      param[1] = ['操作者', this.forceOffLineForm.currentAccount_name]
-      param[2] = ['原因', this.forceOffLineForm.offLineTest]
-      param[3] = ['订单号', this.forceOffLineForm.orderCode]
-      param[4] = ['下线类型', this.forceOffLineForm.type]
-      param[5] = ['授权人账号', this.forceOffLineForm.account]
-      param[6] = ['授权人', this.forceOffLineForm.account_name]
-      var Data = this.CreateData('12', 'MES_强制下线记录_增加', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data[0].result === '1') {
-          this.searchOrder()
-          this.$message({
-            message: '处理成功',
-            type: 'success'
-          })
-          this.isForceOffLine = false
-        } else {
-          this.$message({
-            message: '处理失败',
-            type: 'error'
-          })
-        }
-      })
-    },
     // 控制展开列
     selectPlan(row, expandedRows) {
       if (expandedRows.length) {
+        this.expands = []
+        this.expandsDetail = []
         if (row) {
+          this.tableDataPrint = []
           var param = []
           param[0] = ['工单号', row.订单号]
-          var Data = this.CreateData('11', '生产计划_派工订单_打印_查询', param)
-          this.ExecDatabase(Data).then(response => {
-            this.expands = []
+          var Data = this.CreateData(
+            '11',
+            '生产计划_派工订单_打印_查询',
+            param
+          )
+          this.ExecDatabase(Data).then((response) => {
             console.log(response.data)
             if (response.data.length !== 0) {
               this.tableDataPrint = response.data
-            } else {
-              this.tableDataPrint = []
             }
             this.expands.push(row.订单号)
           })
 
-          var Data2 = this.CreateData('11', '生产计划_派工订单_打印详细_查询', param)
-          this.ExecDatabase(Data2).then(response => {
-            this.expandsDetail = []
+          this.tableDataPrintDetail = []
+          var Data2 = this.CreateData(
+            '11',
+            '生产计划_派工订单_打印详细_查询',
+            param
+          )
+          this.ExecDatabase(Data2).then((response) => {
             console.log(response.data)
             if (response.data.length !== 0) {
               this.tableDataPrintDetail = response.data
-            } else {
-              this.tableDataPrintDetail = []
             }
             this.expandsDetail.push(row.订单号)
           })
@@ -1206,29 +1025,47 @@ export default {
     },
     // 查询订单
     searchOrder() {
-      this.startPlanTime ? this.startPlanTime_check = 1 : this.startPlanTime_check = 0
-      this.endPlanTime ? this.endPlanTime_check = 1 : this.endPlanTime_check = 0
-      this.orderNumberValue ? this.OrderNumber_check = 1 : this.OrderNumber_check = 0
-      this.engineTypeValue ? this.engineType_check = 1 : this.engineType_check = 0
+      this.expands = []
+      this.tableData = []
+      this.startPlanTime
+        ? (this.startPlanTime_check = 1)
+        : (this.startPlanTime_check = 0)
+      this.endPlanTime
+        ? (this.endPlanTime_check = 1)
+        : (this.endPlanTime_check = 0)
+      this.orderNumberValue
+        ? (this.OrderNumber_check = 1)
+        : (this.OrderNumber_check = 0)
+      this.engineTypeValue
+        ? (this.engineType_check = 1)
+        : (this.engineType_check = 0)
+      if (this.startPlanTime === null) {
+        this.startPlanTime = ''
+      }
+      if (this.endPlanTime === null) {
+        this.endPlanTime = ''
+      }
       var param = []
-      param[0] = ['计划开始时间_check', 1]
-      param[1] = ['计划开始时间', this.planTime[0]]
-      param[2] = ['计划完成时间_check', 1]
-      param[3] = ['计划完成时间', this.planTime[1]]
+      param[0] = ['计划开始时间_check', this.startPlanTime_check]
+      param[1] = ['计划开始时间', this.startPlanTime]
+      param[2] = ['计划完成时间_check', this.endPlanTime_check]
+      param[3] = ['计划完成时间', this.endPlanTime]
       param[4] = ['订单号_check', this.OrderNumber_check]
       param[5] = ['订单号', this.orderNumberValue]
       param[6] = ['产品型号_check', this.engineType_check]
-      param[7] = ['产品型号代码', this.engineTypeValue]
+      param[7] = ['产品型号', this.engineTypeValue]
       param[8] = ['PageCurrent', this.pageCurrent]
       param[9] = ['PageSize', this.pageSize]
       param[10] = ['PageCount', '1111', 'int', '1']
       param[11] = ['ItemCount', '1111', 'int', '1']
-      var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_查询分页', param)
-      this.ExecDatabase(Data).then(response => {
+      var Data = this.CreateData(
+        '11',
+        'MES_计划BOM_发动机订单计划_查询分页',
+        param
+      )
+      this.ExecDatabase(Data).then((response) => {
         if (response.data.result.length !== 0) {
           this.tableData = response.data.result
-        } else {
-          this.tableData = []
         }
         this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
@@ -1236,13 +1073,13 @@ export default {
     },
     // 创建订单
     creatOrder(formName) {
-      // if (this.$refs[formName] !== undefined) {
-      //   this.$refs[formName].resetFields()
-      // }
-      // this.form.planQuantity = ''
-      // this.form.orderNumber = ''
-      // this.form.startPlanTime = ''
-      // this.form.endPlanTime = ''
+      if (this.$refs[formName] !== undefined) {
+        this.$refs[formName].resetFields()
+      }
+      this.form.planQuantity = ''
+      this.form.orderNumber = ''
+      this.form.startPlanTime = ''
+      this.form.endPlanTime = ''
       this.dialogFormVisible = true
     },
     // 提交新增订单
@@ -1250,16 +1087,18 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           var param = []
-          param[0] = ['工程号', this.form.workCode]
-          param[1] = ['订单号', this.form.orderCode]
-          param[2] = ['物料号', this.form.engineType]
-          param[3] = ['物料描述', this.form.engineTypeDescribe]
-          param[4] = ['数量', this.form.number]
-          param[5] = ['开始时间', this.form.startPlanTime]
-          param[6] = ['结束时间', this.form.endPlanTime]
-          var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单手动增加', param)
-          this.ExecDatabase(Data).then(response => {
-            if (response.data[0].result === 1) {
+          param[0] = ['订单号', this.form.orderNumber]
+          param[1] = ['产品型号', this.form.engineTypeValue]
+          param[2] = ['开始时间', this.form.startPlanTime]
+          param[3] = ['结束时间', this.form.endPlanTime]
+          param[4] = ['数量', this.form.planQuantity]
+          var Data = this.CreateData(
+            '12',
+            'MES_计划BOM_发动机订单计划_订单手动增加',
+            param
+          )
+          this.ExecDatabase(Data).then((response) => {
+            if (response.data[0].result === '1') {
               this.$message({
                 message: '订单创建成功',
                 type: 'success'
@@ -1267,13 +1106,13 @@ export default {
               this.pageCurrent = 1
               this.pageSize = 30
               this.searchOrder()
-              this.dialogFormVisible = false
-            } else if (response.data[0].result === 2) {
-              this.$message.error('制造编号与单元号重复，创建失败！')
+            } else if (response.data[0].result.结果 === '2') {
+              this.$message.error('订单重复，创建失败！')
             } else {
               this.$message.error('订单创建失败！')
             }
           })
+          this.dialogFormVisible = false
         } else {
           return false
         }
@@ -1290,7 +1129,7 @@ export default {
         param[3] = ['打印数量', this.printForm.打印数量]
         param[4] = ['打印日期', this.printForm.打印日期]
         var Data = this.CreateData('12', '生产计划_派工订单_打印_增加', param)
-        this.ExecDatabase(Data).then(response => {
+        this.ExecDatabase(Data).then((response) => {
           if (response.data[0].result === '1') {
             this.$message({
               message: '开始打印变速器条码',
@@ -1303,19 +1142,47 @@ export default {
             const printPartCode = this.printForm.零件号
             const printTemplate = window.g.printTemplate
             const printStartNum = parseInt(this.printForm.起始号码)
-            const printDate = typeof (this.printForm.打印日期) === 'string' ? new Date(this.printForm.打印日期) : this.printForm.打印日期
+            const printDate =
+              typeof this.printForm.打印日期 === 'string'
+                ? new Date(this.printForm.打印日期)
+                : this.printForm.打印日期
             const printCount = this.printForm.打印数量
-            const printDateFinal = printDate.getFullYear() + '' + ((printDate.getMonth() + 1) >= 10 ? (printDate.getMonth() + 1) : '0' + (printDate.getMonth() + 1)) + '' + (printDate.getDate() >= 10 ? printDate.getDate() : '0' + printDate.getDate())
+            const printDateFinal =
+              printDate.getFullYear() +
+              '' +
+              (printDate.getMonth() + 1 >= 10
+                ? printDate.getMonth() + 1
+                : '0' + (printDate.getMonth() + 1)) +
+              '' +
+              (printDate.getDate() >= 10
+                ? printDate.getDate()
+                : '0' + printDate.getDate())
             for (let i = 0; i < printCount; i++) {
-              (function(t) { // 注意这里是形参
+              (function(t) {
+                // 注意这里是形参
                 setTimeout(function() {
-                  const printCountFinal = (printStartNum + t).toString().padStart(8, '0')
-                  const printFinal = printPartCode.replaceAll(' ', '') + '*' + printDateFinal + '*' + printCountFinal
+                  const printCountFinal = (printStartNum + t)
+                    .toString()
+                    .padStart(8, '0')
+                  const printFinal =
+                    printPartCode.replaceAll(' ', '') +
+                    '*' +
+                    printDateFinal +
+                    '*' +
+                    printCountFinal
                   scope.publication.topic = window.g.mqttPublishTopic
                   scope.publication.payload = `J07MA000~1~${printTemplate}|BarCode^Code0^${printFinal}|TEXT^TEXT0^${printFinal}`
-                  const result = window.g.mqttClient.doPublish(scope.publication)
+                  const result = window.g.mqttClient.doPublish(
+                    scope.publication
+                  )
                   console.log(result, printFinal)
-                  scope.submitAddPrintList(scope.printForm.订单号, scope.printForm.产品型号, scope.printForm.产品型号代码, scope.printForm.零件号, printFinal)
+                  scope.submitAddPrintList(
+                    scope.printForm.订单号,
+                    scope.printForm.产品型号,
+                    scope.printForm.产品型号代码,
+                    scope.printForm.零件号,
+                    printFinal
+                  )
                 }, 100 * t)
               })(i)
             }
@@ -1330,8 +1197,12 @@ export default {
       var param = []
       param[0] = ['起始号', this.printForm.起始号码]
       param[1] = ['机型', this.printForm.产品型号]
-      var Data = this.CreateData('11', '生产计划_派工订单_打印记录_是否重复_查询', param)
-      this.ExecDatabase(Data).then(response => {
+      var Data = this.CreateData(
+        '11',
+        '生产计划_派工订单_打印记录_是否重复_查询',
+        param
+      )
+      this.ExecDatabase(Data).then((response) => {
         if (response.data[0].result === 2) {
           this.$message.error(response.data[0].msg)
           this.isAllowAddClike = true
@@ -1341,15 +1212,25 @@ export default {
       })
     },
     // 提交新增订单
-    submitAddPrintList(orderCode, engineType, engineTypeValue, partCode, engineId) {
+    submitAddPrintList(
+      orderCode,
+      engineType,
+      engineTypeValue,
+      partCode,
+      engineId
+    ) {
       var param = []
       param[0] = ['订单号', orderCode]
       param[1] = ['零件号', partCode]
       param[2] = ['变速箱总成号', engineId]
       param[3] = ['机型代码', engineTypeValue]
       param[4] = ['机型', engineType]
-      var Data = this.CreateData('12', '生产计划_派工订单_打印记录_增加', param)
-      this.ExecDatabase(Data).then(response => {
+      var Data = this.CreateData(
+        '12',
+        '生产计划_派工订单_打印记录_增加',
+        param
+      )
+      this.ExecDatabase(Data).then((response) => {
         if (response.data[0].result === '1') {
           // this.$message({
           //   message: '订记录成功',
@@ -1379,7 +1260,7 @@ export default {
       const param = []
       param[0] = ['工单号', this.printForm.订单号]
       const Data = this.CreateData('11', '生产计划_派工订单_打印_查询', param)
-      this.ExecDatabase(Data).then(response => {
+      this.ExecDatabase(Data).then((response) => {
         if (response.data.length !== 0) {
           this.tableDataPrint = response.data
         }
@@ -1388,7 +1269,7 @@ export default {
     // 取消新增订单
     callOff(formName) {
       this.dialogFormVisible = false
-      // this.$refs[formName].resetFields()
+      this.$refs[formName].resetFields()
     },
     // 导入订单
     importOrder() {
@@ -1400,27 +1281,31 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        var param = []
-        param[0] = ['MID', row.MID]
-        var Data = this.CreateData('11', '订单计划_删除', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'success'
-            })
-            this.searchOrder()
-          } else {
-            this.$message.error(response.data[0].msg)
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
       })
+        .then(() => {
+          var param = []
+          param[0] = ['MID', row.MID]
+          var Data = this.CreateData('12', '订单计划_删除', param)
+          this.ExecDatabase(Data).then((response) => {
+            if (response.data[0].result === '1') {
+              this.$message({
+                message: '订单删除成功',
+                type: 'success'
+              })
+              this.pageCurrent = 1
+              this.pageSize = 30
+              this.searchOrder()
+            } else {
+              this.$message.error('订单删除失败！')
+            }
+          })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
     },
     // 修改订单
     handleEdit(row) {
@@ -1441,113 +1326,18 @@ export default {
       this.form1.lunGuOverNumber = row.测试上线
       this.dialogFormVisible1 = true
     },
-    // 开始生产
-    planIssue(row) {
-      // 弹窗提示框是否下发订单 确认后修改订单是否下发字段
-      this.$confirm(`确定下发订单吗？下发后进入生产队列开始生产，生产后不可取消下发与修改订单信息 <i style="color: red">  机型：` + row.产品型号 + '，订单号：' + row.订单号 + `</i> `, '提示', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 无滞留信息
-        var param = []
-        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_滞留判断', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
-            // 无滞留信息
-            this.updateOrderStatus(row.MID, 1)
-          } else if (response.data[0].result === 2) {
-            this.$confirm('<i style="color: red">' + response.data[0].msg + '</i>', '提示', {
-              dangerouslyUseHTMLString: true,
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              // 强制切换
-              this.updateOrderStatus(row.MID, 1)
-            })
-          } else {
-            this.$message.error('订单下发失败')
-          }
-        })
-      })
-    },
-    // 继续生产
-    continueIssue(row) {
-      // 弹窗提示框是否下发订单 确认后修改订单是否下发字段
-      this.$confirm(`是否继续该订单的生产,重下发后订单排序将排至最新 <i style="color: red">  制造编号：` + row.制造编号 + '，DS/ES编号：' + row.间隔号 + `</i> `, '提示', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 直接改，不判断滞留
-        this.updateOrderStatus(row.MID, 3)
-        // var param = []
-        // var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_滞留判断', param)
-        // this.ExecDatabase(Data).then(response => {
-        //   if (response.data[0].result === 1) {
-        //     // 无滞留信息
-        //     this.updateOrderStatus(row.MID, 3)
-        //   } else if (response.data[0].result === 2) {
-        //     this.$confirm('<i style="color: red">' + response.data[0].msg + '</i>', '提示', {
-        //       dangerouslyUseHTMLString: true,
-        //       confirmButtonText: '确定',
-        //       cancelButtonText: '取消',
-        //       type: 'warning'
-        //     }).then(() => {
-        //       // 强制切换
-        //       this.updateOrderStatus(row.MID, 3)
-        //     })
-        //   } else {
-        //     this.$message.error('订单下发失败')
-        //   }
-        // })
-      })
-    },
-    // 修改订单状态
-    updateOrderStatus(MID, type) {
-      var param = []
-      param[0] = ['MID', MID]
-      param[1] = ['type', type]
-      var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_状态修改', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data[0].result === 1) {
-          this.$message.success('订单状态操作成功！')
-          this.pageCurrent = 1
-          this.pageSize = 30
-          this.searchOrder()
-        } else {
-          this.$message.error(response.data[0].msg)
-        }
-      })
-    },
-    // 暂停生产
-    planIsStop(row) {
-      // 弹窗提示框是否下发订单 确认后修改订单是否下发字段
-      this.$confirm(`确定暂停此订单吗`, '提示', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 强制切换
-        this.updateOrderStatus(row.MID, 2)
-      })
-    },
     // 提交修改订单
     submitAdd1() {
       this.$refs['form1'].validate((valid) => {
         if (valid) {
           var param = []
-          param[0] = ['计划开始时间', this.form1.startPlanTime]
-          param[1] = ['计划完成时间', this.form1.endPlanTime]
-          param[2] = ['计划数量', this.form1.planQuantity]
+          param[0] = ['开始时间', this.form1.startPlanTime]
+          param[1] = ['结束时间', this.form1.endPlanTime]
+          param[2] = ['数量', this.form1.planQuantity]
           param[3] = ['MID', this.form1.MID]
-          var Data = this.CreateData('11', '订单计划_修改', param)
-          this.ExecDatabase(Data).then(response => {
-            if (response.data[0].result === 1) {
+          var Data = this.CreateData('12', 'MES_计划BOM_发动机订单计划_订单修改', param)
+          this.ExecDatabase(Data).then((response) => {
+            if (response.data[0].result === '1') {
               this.$message({
                 message: '订单修改成功',
                 type: 'success'
@@ -1579,16 +1369,24 @@ export default {
     },
     // 订单下发编辑
     ordersIssuedEditor(row) {
-      this.$confirm(`确定下达订单<p style="color: deepskyblue;display: inline-block"> ${row.订单号}</p> 吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        dangerouslyUseHTMLString: true
-      }).then(() => {
+      this.$confirm(
+        `确定下达订单<p style="color: deepskyblue;display: inline-block"> ${row.订单号}</p> 吗？`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          dangerouslyUseHTMLString: true
+        }
+      ).then(() => {
         var param = []
         param[0] = ['MID', row.MID]
-        var Data = this.CreateData('12', 'MES_计划BOM_发动机订单计划_订单下发', param)
-        this.ExecDatabase(Data).then(response => {
+        var Data = this.CreateData(
+          '12',
+          'MES_计划BOM_发动机订单计划_订单下发',
+          param
+        )
+        this.ExecDatabase(Data).then((response) => {
           if (response.data[0].result === '1') {
             this.$message({
               message: '订单下发成功！',
@@ -1603,37 +1401,79 @@ export default {
         })
       })
     },
-    // 取消下发
+    // 取消下发编辑
     ordersIssuedEditor1(row) {
-      this.$confirm(`确定取消订单<p style="color: deepskyblue;display: inline-block"> ${row.订单号}</p> 吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        dangerouslyUseHTMLString: true
-      }).then(() => {
+      this.$confirm(
+        `确定取消订单<p style="color: deepskyblue;display: inline-block"> ${row.订单号}</p> 吗？`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          dangerouslyUseHTMLString: true
+        }
+      ).then(() => {
         var param = []
         param[0] = ['MID', row.MID]
-        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单下发取消', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
+        var Data = this.CreateData(
+          '12',
+          'MES_计划BOM_发动机订单计划_订单下发取消',
+          param
+        )
+        this.ExecDatabase(Data).then((response) => {
+          if (response.data[0].result === '1') {
             this.$message({
-              message: response.data[0].msg,
+              message: '订单撤回成功！',
               type: 'success'
             })
             this.pageCurrent = 1
             this.pageSize = 30
             this.searchOrder()
           } else {
-            this.$message.error(response.data[0].msg)
+            this.$message.error('订单撤回失败！')
           }
         })
       })
     },
+    handleAdd() {
+      if (this.tableData.length === 0) {
+        this.$message.error('内容为空')
+      } else {
+        var param = []
+        var Data = this.CreateData('11', '确认导入物料字典_新增', param)
+        this.ExecDatabase(Data).then((response) => {
+          if (response.data.length > 0) {
+            this.notes = ''
+            for (var i = 0; i < response.data.length; i++) {
+              this.notes = response.data[i].导入结果 + '、 ' + this.notes
+            }
+            this.$message({
+              message: '物料字典信息更新成功',
+              type: 'warning'
+            })
+            this.isShow = true
+            this.tableData = []
+          } else {
+            this.tableData = []
+            this.$message({
+              message: '物料字典信息更新成功',
+              type: 'success'
+            })
+          }
+        })
+      }
+    },
     // 查询
     searchTable() {
       var param = []
-      var Data = this.CreateData('11', '生产计划导入_确认导入前临时表_查询', param, this.pageSize, this.pageList)
-      this.ExecDatabase(Data).then(response => {
+      var Data = this.CreateData(
+        '11',
+        '生产计划导入_确认导入前临时表_查询',
+        param,
+        this.pageSize,
+        this.pageList
+      )
+      this.ExecDatabase(Data).then((response) => {
         console.log(response.data)
         this.tableData = response.data.rows
         this.total = response.data.total
@@ -1654,45 +1494,81 @@ export default {
         this.loading = true
         this.err = 0
         for (let j = this.worksheet.length - 1; j >= 0; j--) {
-          let sort,
-            orderNumber,
-            productModel,
-            numberPlan,
-            startDate,
-            endDate
+          let sort, orderNumber, productModel, numberPlan, startDate, endDate
           var param = []
           param[0] = ['订单号', this.worksheet[j].B2.v]
           console.log('订单号', this.worksheet[j].B2.v)
-          var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单导入校验', param)
+          var Data = this.CreateData(
+            '11',
+            'MES_计划BOM_发动机订单计划_订单导入校验',
+            param
+          )
           const response = await this.ExecDatabase(Data)
           const res = response.data
           if (res[0].Column1 !== 0) {
-            this.$notify.error(`${this.worksheet[j].C2.v}已经存在，请确认文件是否正确`)
+            this.$notify.error(
+              `${this.worksheet[j].C2.v}已经存在，请确认文件是否正确`
+            )
             this.loading = false
             this.disabled = false
             return
           } else {
             for (let i = 0; i < 999; i++) {
               const attr = i + 2
-              sort = this.worksheet[j][`A${attr}`] ? this.worksheet[j][`A${attr}`].v : ''
-              orderNumber = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
-              productModel = this.worksheet[j][`C${attr}`] ? this.worksheet[j][`C${attr}`].v : ''
-              numberPlan = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
-              startDate = this.worksheet[j][`E${attr}`] ? this.worksheet[j][`E${attr}`].v : ''
-              endDate = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
-              console.log(sort, orderNumber, productModel, numberPlan, startDate, endDate)
-              if (!sort && !orderNumber && !productModel && !numberPlan && !startDate && !endDate) {
+              sort = this.worksheet[j][`A${attr}`]
+                ? this.worksheet[j][`A${attr}`].v
+                : ''
+              orderNumber = this.worksheet[j][`B${attr}`]
+                ? this.worksheet[j][`B${attr}`].v
+                : ''
+              productModel = this.worksheet[j][`C${attr}`]
+                ? this.worksheet[j][`C${attr}`].v
+                : ''
+              numberPlan = this.worksheet[j][`D${attr}`]
+                ? this.worksheet[j][`D${attr}`].v
+                : ''
+              startDate = this.worksheet[j][`E${attr}`]
+                ? this.worksheet[j][`E${attr}`].v
+                : ''
+              endDate = this.worksheet[j][`F${attr}`]
+                ? this.worksheet[j][`F${attr}`].v
+                : ''
+              console.log(
+                sort,
+                orderNumber,
+                productModel,
+                numberPlan,
+                startDate,
+                endDate
+              )
+              if (
+                !sort &&
+                !orderNumber &&
+                !productModel &&
+                !numberPlan &&
+                !startDate &&
+                !endDate
+              ) {
                 break
-              } else if (!orderNumber) { // 名称不能为空
+              } else if (!orderNumber) {
+                // 名称不能为空
                 this.$notify.error(`订单号不能为空`)
                 break
-              } else if (Number(numberPlan) <= 0) { // 数量不能为0
+              } else if (Number(numberPlan) <= 0) {
+                // 数量不能为0
                 this.$notify.error(`计划数量不能为空`)
                 break
               } else {
                 if (orderNumber) {
                   await sleep(50)
-                  await this.insertToSQL(sort, orderNumber, productModel, numberPlan, startDate, endDate)
+                  await this.insertToSQL(
+                    sort,
+                    orderNumber,
+                    productModel,
+                    numberPlan,
+                    startDate,
+                    endDate
+                  )
                 } else {
                   this.loading = false
                   this.disabled = false
@@ -1704,7 +1580,11 @@ export default {
           }
           this.itemFile.splice(j, 1)
           this.worksheet.splice(j, 1)
-          this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`)
+          this.err === 0
+            ? this.$message.success(`导入完成`)
+            : this.$message.error(
+              `导入失败零件个数为${this.err}，请检查文件是否正确`
+            )
         }
         this.loading = false
         this.searchOrder()
@@ -1715,7 +1595,14 @@ export default {
         console.log(`导入数据错误${e}`)
       }
     },
-    async insertToSQL(sort, orderNumber, productModel, numberPlan, startDate, endDate) {
+    async insertToSQL(
+      sort,
+      orderNumber,
+      productModel,
+      numberPlan,
+      startDate,
+      endDate
+    ) {
       console.log(startDate, endDate, 'startDate, endDate')
       try {
         var param = []
@@ -1726,7 +1613,11 @@ export default {
         param[4] = ['计划开始时间', startDate]
         param[5] = ['计划完成时间', endDate]
         param[6] = ['导入类型', '1', 'int', '1']
-        var Data = this.CreateData('12', 'MES_计划BOM_发动机订单计划_订单导入', param)
+        var Data = this.CreateData(
+          '12',
+          'MES_计划BOM_发动机订单计划_订单导入',
+          param
+        )
         const response = await this.ExecDatabase(Data)
         const res = response.data
         if (Object.prototype.hasOwnProperty.call(res, 'output') === false) {
@@ -1749,10 +1640,18 @@ export default {
     },
     exportExcel() {
       if (this.tableData.length !== 0) {
-        this.startPlanTime ? this.startPlanTime_check = 1 : this.startPlanTime_check = 0
-        this.endPlanTime ? this.endPlanTime_check = 1 : this.endPlanTime_check = 0
-        this.orderNumberValue ? this.OrderNumber_check = 1 : this.OrderNumber_check = 0
-        this.engineTypeValue ? this.engineType_check = 1 : this.engineType_check = 0
+        this.startPlanTime
+          ? (this.startPlanTime_check = 1)
+          : (this.startPlanTime_check = 0)
+        this.endPlanTime
+          ? (this.endPlanTime_check = 1)
+          : (this.endPlanTime_check = 0)
+        this.orderNumberValue
+          ? (this.OrderNumber_check = 1)
+          : (this.OrderNumber_check = 0)
+        this.engineTypeValue
+          ? (this.engineType_check = 1)
+          : (this.engineType_check = 0)
         if (this.startPlanTime === null) {
           this.startPlanTime = ''
         }
@@ -1768,12 +1667,97 @@ export default {
         param[5] = ['订单号', this.orderNumberValue]
         param[6] = ['产品型号_check', this.engineType_check]
         param[7] = ['产品型号', this.engineTypeValue]
-        var Data = this.CreateData('2001', 'MES_计划BOM_发动机订单计划_订单导出', param)
+        var Data = this.CreateData(
+          '2001',
+          'MES_计划BOM_发动机订单计划_订单导出',
+          param
+        )
         this.exportExcel_NPOI(Data)
       } else {
         this.$message.warning('暂无数据')
       }
     },
+    // 上移订单
+    topOrder(row) {
+      if (row.MID) {
+        var param = []
+        param[0] = ['id', row.MID]
+        console.log(param)
+        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单上移', param)
+        this.ExecDatabase(Data).then(response => {
+          if (response.data[0].result === 1) {
+            this.$message({
+              message: response.data[0].msg,
+              type: 'success'
+            })
+            this.searchOrder()
+          } else {
+            this.$message.error(response.data[0].msg)
+          }
+        })
+      } else {
+        this.$message.error('请选择订单！')
+      }
+    },
+    // 下移订单
+    downOrder(row) {
+      if (row.MID) {
+        var param = []
+        param[0] = ['id', row.MID]
+        console.log(param)
+        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单下移', param)
+        this.ExecDatabase(Data).then(response => {
+          if (response.data[0].result === 1) {
+            this.$message({
+              message: response.data[0].msg,
+              type: 'success'
+            })
+            this.searchOrder()
+          } else {
+            this.$message.error(response.data[0].msg)
+          }
+        })
+      } else {
+        this.$message.error('请选择订单！')
+      }
+    },
+    // 订单完成
+    competeOrder(row) {
+      this.$confirm(
+        `确定要提前完工订单：<p style="color: deepskyblue;display: inline-block"> ${row.订单号}</p> 吗？`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          dangerouslyUseHTMLString: true
+        })
+        .then(() => {
+          var param = []
+          param[0] = ['MID', row.MID]
+          param[1] = ['type', 3]
+          var Data = this.CreateData('12', 'MES_计划BOM_发动机订单计划_状态修改', param)
+          this.ExecDatabase(Data).then((response) => {
+            if (response.data[0].result === '1') {
+              this.$message({
+                message: '订单删除成功',
+                type: 'success'
+              })
+              this.pageCurrent = 1
+              this.pageSize = 30
+              this.searchOrder()
+            } else {
+              this.$message.error('订单删除失败！')
+            }
+          })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1
@@ -1800,11 +1784,11 @@ export default {
 }
 
 .el-select {
-  width: 200px
+  width: 200px;
 }
 
 .el-input {
-  width: 200px
+  width: 200px;
 }
 
 .text {
@@ -1830,4 +1814,3 @@ export default {
   background: #f0f9eb;
 }
 </style>
-
diff --git a/src/views/WorkOrderManagement/ReleaseOfProductionPlan/indexBak.vue b/src/views/WorkOrderManagement/ReleaseOfProductionPlan/indexBak.vue
deleted file mode 100644
index 7346dd5..0000000
--- a/src/views/WorkOrderManagement/ReleaseOfProductionPlan/indexBak.vue
+++ /dev/null
@@ -1,1861 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card class="topCard">
-      <div class="topDiv">
-        <div>
-          <span style="margin-left: 10px">订单号：</span>
-          <el-select v-model="orderNumberValue" clearable placeholder="请选择订单" size="small" style="width: 150px">
-            <el-option v-for="item in orderNumber" :key="item.value" :label="item.label" :value="item.value" size="mini"/>
-          </el-select>
-          <span style="margin-left: 10px">产品型号：</span>
-          <el-select v-model="engineTypeValue" clearable placeholder="请选择产品型号" size="small" style="width: 150px">
-            <el-option v-for="item in engineType" :key="item.value" :label="item.label" :value="item.value" size="mini"/>
-          </el-select>
-          <span style="margin-left: 10px">开始日期：</span>
-          <el-date-picker
-            v-model="startPlanTime"
-            placeholder="选择开始日期"
-            size="small"
-            type="date"
-            value-format="yyyy-MM-dd"
-          />
-          <span style="margin-left: 10px">结束日期：</span>
-          <el-date-picker
-            v-model="endPlanTime"
-            placeholder="选择结束日期"
-            size="small"
-            type="date"
-            value-format="yyyy-MM-dd"
-          />
-          <el-button
-            icon="el-icon-search"
-            plain
-            size="small"
-            style="margin-left: 10px"
-            type="primary"
-            @click="pageSize = 30; pageCurrent = 1; searchOrder()"
-          >查询订单
-          </el-button>
-          <el-button
-            icon="el-icon-circle-plus"
-            size="small"
-            type="distribution"
-            @click="creatOrder('form')"
-          >创建订单
-          </el-button>
-          <el-button
-            icon="el-icon-s-release"
-            size="small"
-            type="distribution"
-            style="float: right"
-            @click="viewModifyOrder()"
-          >强制下线记录
-          </el-button>
-          <!--        <el-button type="info" plain size="small" icon="el-icon-upload2" @click="importOrder('form')">订单导入</el-button>-->
-          <!--        <el-button type="info" plain size="small" icon="el-icon-download" @click="exportExcel()">订单导出</el-button>-->
-        </div>
-        <el-table
-          ref="multipleTable"
-          v-loading="loading"
-          :cell-class-name="tableRowClassName"
-          :data="tableData"
-          :expand-row-keys="expandsDetail"
-          :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
-          :row-key="getRowKeys"
-          border
-          class="main"
-          element-loading-background="rgba(0, 0, 0, 0.2)"
-          element-loading-spinner="el-icon-loading"
-          element-loading-text="数据加载中"
-          height="600px"
-          size="mini"
-          style="width: 100%;max-height: 600px"
-          tooltip-effect="dark"
-          @expand-change="selectPlan"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column align="center" label="排序" width="60">
-            <template slot-scope="scope">
-              {{ scope.row.排序 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" fixed label="" type="expand" width="35">
-            <template slot-scope="">
-              <div style="display: flex">
-                <!-- 详细数据盒子 -->
-                <div style="margin: 5px 10px;width: 1400px;z-index: 99;">
-                  <el-table
-                    :data="tableDataPrintDetail"
-                    :header-cell-style="{ background: '#e5e7f8', color: '#606266' }"
-                    border
-                    class="main"
-                    element-loading-background="rgba(0, 0, 0, 0.2)"
-                    element-loading-spinner="el-icon-loading"
-                    element-loading-text="数据加载中"
-                    max-height="400px"
-                    size="mini"
-                    style="width: 70%;z-index: 99;"
-                    tooltip-effect="dark"
-                  >
-                    <el-table-column align="center" label="订单号" width="100">
-                      <template slot-scope="scope">
-                        {{ scope.row.订单号 }}
-                      </template>
-                    </el-table-column>
-                    <el-table-column align="center" label="产品编号" width="150">
-                      <template slot-scope="scope">
-                        {{ scope.row.工件编号 }}
-                      </template>
-                    </el-table-column>
-                    <el-table-column align="center" label="是否上线">
-                      <template slot-scope="scope">
-                        <el-tag v-if="Number(scope.row.是否上线) == 0" size="mini" type="info">未上线</el-tag>
-                        <el-tag v-if="Number(scope.row.是否上线) == 1" size="mini" type="success">已上线</el-tag>
-                      </template>
-                    </el-table-column>
-                    <el-table-column align="center" label="上线时间" width="150">
-                      <template slot-scope="scope">
-                        {{ scope.row.上线时间 }}
-                      </template>
-                    </el-table-column>
-                    <el-table-column align="center" label="是否下线">
-                      <template slot-scope="scope">
-                        <el-tag v-if="Number(scope.row.是否下线) == 0" size="mini" type="info">未下线</el-tag>
-                        <el-tag v-if="Number(scope.row.是否下线) == 1" size="mini" type="success">已下线</el-tag>
-                      </template>
-                    </el-table-column>
-                    <el-table-column align="center" label="下线时间" width="150">
-                      <template slot-scope="scope">
-                        {{ scope.row.下线时间 }}
-                      </template>
-                    </el-table-column>
-                    <!--<el-table-column align="center" label="OP10">-->
-                    <!--  <template slot-scope="scope">-->
-                    <!--    &lt;!&ndash;// 1未开始 2:生产中 3:已完成 4:订单挂起 写彩色标签标识&ndash;&gt;-->
-                    <!--    <el-tag v-if="Number(scope.row.OP10) == 0" size="mini" type="info">未开始</el-tag>-->
-                    <!--    <el-tag v-if="Number(scope.row.OP10) == 1" size="mini" type="success">已完成</el-tag>-->
-                    <!--  </template>-->
-                    <!--</el-table-column>-->
-                    <!--<el-table-column align="center" label="A10">-->
-                    <!--  <template slot-scope="scope">-->
-                    <!--    &lt;!&ndash;// 1未开始 2:生产中 3:已完成 4:订单挂起 写彩色标签标识&ndash;&gt;-->
-                    <!--    <el-tag v-if="Number(scope.row.A10) == 0" size="mini" type="info">未开始</el-tag>-->
-                    <!--    <el-tag v-if="Number(scope.row.A10) == 1" size="mini" type="success">已完成</el-tag>-->
-                    <!--  </template>-->
-                    <!--</el-table-column>-->
-                    <!--<el-table-column align="center" label="A20">-->
-                    <!--  <template slot-scope="scope">-->
-                    <!--    &lt;!&ndash;// 1未开始 2:生产中 3:已完成 4:订单挂起 写彩色标签标识&ndash;&gt;-->
-                    <!--    <el-tag v-if="Number(scope.row.A20) == 0" size="mini" type="info">未开始</el-tag>-->
-                    <!--    <el-tag v-if="Number(scope.row.A20) == 1" size="mini" type="success">已完成</el-tag>-->
-                    <!--  </template>-->
-                    <!--</el-table-column>-->
-                    <!--<el-table-column align="center" label="A30">-->
-                    <!--  <template slot-scope="scope">-->
-                    <!--    &lt;!&ndash;// 1未开始 2:生产中 3:已完成 4:订单挂起 写彩色标签标识&ndash;&gt;-->
-                    <!--    <el-tag v-if="Number(scope.row.A30) == 0" size="mini" type="info">未开始</el-tag>-->
-                    <!--    <el-tag v-if="Number(scope.row.A30) == 1" size="mini" type="success">已完成</el-tag>-->
-                    <!--  </template>-->
-                    <!--</el-table-column>-->
-                    <!--<el-table-column align="center" label="A40">-->
-                    <!--  <template slot-scope="scope">-->
-                    <!--    &lt;!&ndash;// 1未开始 2:生产中 3:已完成 4:订单挂起 写彩色标签标识&ndash;&gt;-->
-                    <!--    <el-tag v-if="Number(scope.row.A40) == 0" size="mini" type="info">未开始</el-tag>-->
-                    <!--    <el-tag v-if="Number(scope.row.A40) == 1" size="mini" type="success">已完成</el-tag>-->
-                    <!--  </template>-->
-                    <!--</el-table-column>-->
-                    <!--<el-table-column align="center" label="A50">-->
-                    <!--  <template slot-scope="scope">-->
-                    <!--    &lt;!&ndash;// 1未开始 2:生产中 3:已完成 4:订单挂起 写彩色标签标识&ndash;&gt;-->
-                    <!--    <el-tag v-if="Number(scope.row.A50) == 0" size="mini" type="info">未开始</el-tag>-->
-                    <!--    <el-tag v-if="Number(scope.row.A50) == 1" size="mini" type="success">已完成</el-tag>-->
-                    <!--  </template>-->
-                    <!--</el-table-column>-->
-                    <!--<el-table-column align="center" label="A60">-->
-                    <!--  <template slot-scope="scope">-->
-                    <!--    &lt;!&ndash;// 1未开始 2:生产中 3:已完成 4:订单挂起 写彩色标签标识&ndash;&gt;-->
-                    <!--    <el-tag v-if="Number(scope.row.A60) == 0" size="mini" type="info">未开始</el-tag>-->
-                    <!--    <el-tag v-if="Number(scope.row.A60) == 1" size="mini" type="success">已完成</el-tag>-->
-                    <!--  </template>-->
-                    <!--</el-table-column>-->
-                    <el-table-column align="center" label="操作" width="120">
-                      <template slot-scope="scope">
-                        <el-button :disabled="scope.row.是否下线 == 1" type="text" @click="forceOffLine(scope.row)">
-                          强制下线
-                        </el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="工程号">
-            <template slot-scope="scope">
-              {{ scope.row.制造编号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="订单号">
-            <template slot-scope="scope">
-              {{ scope.row.订单号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="产品型号">
-            <template slot-scope="scope">
-              {{ scope.row.产品型号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="计划数量">
-            <template slot-scope="scope">
-              {{ scope.row.计划数量 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="计划开始日期">
-            <template slot-scope="scope">
-              {{ scope.row.计划开始时间 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="计划完成日期">
-            <template slot-scope="scope">
-              {{ scope.row.计划完成时间 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="生产状态">
-            <template slot-scope="scope">
-              <el-tag v-if="Number(scope.row.订单状态) == 1" size="mini" type="info">未开始</el-tag>
-              <el-tag v-if="Number(scope.row.订单状态) == 2" size="mini" type="warning">生产中</el-tag>
-              <el-tag v-if="Number(scope.row.订单状态) == 3" size="mini" type="success">已完成</el-tag>
-              <el-tag v-if="Number(scope.row.订单状态) == 4" size="mini" type="danger">订单挂起</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="操作" min-width="250">
-            <template slot-scope="scope">
-              <el-button
-                v-if="scope.row.订单状态 == 1"
-                icon="el-icon-position"
-                size="mini"
-                type="text"
-                @click="planIssue(scope.row)"
-              >开始生产
-              </el-button>
-              <el-button
-                v-else-if="scope.row.订单状态 == 2"
-                icon="el-icon-document-delete"
-                size="mini"
-                style="color: #ff7f29"
-                type="text"
-                @click="planIsStop(scope.row)"
-              >挂起订单
-              </el-button>
-              <el-button
-                v-else-if="scope.row.订单状态 == 3"
-                :disabled="true"
-                icon="el-icon-document-delete"
-                size="mini"
-                style="color: #c2c7d0"
-                type="text"
-              >生产完成
-              </el-button>
-              <el-button
-                v-if="scope.row.订单状态==4"
-                icon="el-icon-document-delete"
-                size="mini"
-                style="color: #67c23a"
-                type="text"
-                @click="continueIssue(scope.row)"
-              >继续生产
-              </el-button>
-              <!--<el-button-->
-              <!--  :disabled="parseInt(scope.row.订单状态) == 3 || scope.row.是否下发 == 1"-->
-              <!--  icon="el-icon-edit"-->
-              <!--  size="mini"-->
-              <!--  type="text"-->
-              <!--  @click="handleEdit(scope.row)">修改-->
-              <!--</el-button>-->
-              <el-button
-                :disabled="parseInt(scope.row.订单状态) != 1"
-                icon="el-icon-delete"
-                size="mini"
-                style="color: red"
-                type="text"
-                @click="deleteOrder(scope.row)"
-              >删除
-              </el-button>
-              <!--<el-button-->
-              <!--  :disabled="buttonIsDisabled(scope.row)"-->
-              <!--  size="mini"-->
-              <!--  type="text"-->
-              <!--  icon="el-icon-top"-->
-              <!--  @click="downOrder(scope.row)">上移-->
-              <!--</el-button>-->
-              <!--<el-button-->
-              <!--  :disabled="buttonIsDisabled(scope.row)"-->
-              <!--  size="mini"-->
-              <!--  type="text"-->
-              <!--  icon="el-icon-bottom"-->
-              <!--  @click="topOrder(scope.row)">下移-->
-              <!--</el-button>-->
-              <!--<el-button-->
-              <!--  :disabled=" scope.row.是否下发 == 0"-->
-              <!--  icon="el-icon-document-copy"-->
-              <!--  type="text"-->
-              <!--  @click="updateMainWorkCount(scope.row)">-->
-              <!--  修改剩余数量-->
-              <!--</el-button>-->
-              <!--<el-button-->
-              <!--  :disabled="scope.row.订单状态 != 3"-->
-              <!--  icon="el-icon-document-copy"-->
-              <!--  type="text"-->
-              <!--  @click="uploadCheckDataExcel(scope.row)">-->
-              <!--  导出检查项-->
-              <!--</el-button>-->
-            </template>
-          </el-table-column>
-
-        </el-table>
-        <div class="block" style="margin-top: 10px;">
-          <el-pagination
-            v-if="!loading"
-            :current-page="pageCurrent"
-            :page-size="pageSize"
-            :page-sizes="[30, 50, 100]"
-            :total="total"
-            layout="total, sizes, prev, pager, next, jumper"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </div>
-    </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" center style="min-height: 200px;" title="创建生产订单" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px">
-        <el-form-item label="工程号" prop="workCode" style="display: inline-block">
-          <el-input v-model="form.workCode" clearable placeholder="请输入工程号" size="small"/>
-        </el-form-item>
-        <el-form-item label="订单号" prop="orderCode" style="display: inline-block">
-          <el-input v-model="form.orderCode" clearable placeholder="请输入订单号" size="small"/>
-        </el-form-item>
-        <el-form-item label="产品型号" prop="engineType" style="display: inline-block">
-          <el-select v-model="form.engineType" placeholder="请选择产品型号" size="small" style="width: 200px">
-            <el-option v-for="item in engineType" :key="item.value" :label="item.label" :value="item.value" size="mini"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数量" prop="number" style="display: inline-block">
-          <el-input-number
-            v-model="form.number"
-            :min="1"
-            :step="1"
-            placeholder="请输入数量"
-            size="small"
-            style="width: 200px;"
-          />
-        </el-form-item>
-        <el-form-item label="计划开始" prop="startPlanTime" style="display: inline-block">
-          <el-date-picker
-            v-model="form.startPlanTime"
-            placeholder="选择计划开始时间"
-            size="small"
-            type="date"
-            style="width: 200px"
-            value-format="yyyy-MM-dd"
-          />
-        </el-form-item>
-        <el-form-item label="计划结束" prop="endPlanTime" style="display: inline-block">
-          <el-date-picker
-            v-model="form.endPlanTime"
-            placeholder="选择计划结束时间"
-            size="small"
-            type="date"
-            style="width: 200px"
-            value-format="yyyy-MM-dd"
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="callOff('form')">取消</el-button>
-        <el-button size="small" type="primary" @click="submitAdd('form')">确定</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible1" center style="min-height: 200px" title="编辑生产订单" width="400px">
-      <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px">
-        <el-form-item label="订单号" prop="orderNumber" style="display: inline-block">
-          <el-input v-model="form1.orderNumber" placeholder="请输入订单号" readonly size="small"/>
-        </el-form-item>
-        <el-form-item label="产品型号" prop="engineTypeValue" style="display: inline-block">
-          <el-input v-model="form1.engineTypeValue" placeholder="产品型号" readonly size="small"/>
-        </el-form-item>
-        <!--<el-form-item label="总成号" prop="partCode" style="display: inline-block">-->
-        <!--  <el-input v-model="form1.partCode" readonly size="small" placeholder="总成号" />-->
-        <!--</el-form-item>-->
-        <el-form-item label="计划数量" prop="planQuantity" style="display: inline-block">
-          <el-input-number
-            v-model="form1.planQuantity"
-            :min="1"
-            :step="1"
-            placeholder="请输入计划数量"
-            size="small"
-            style="width: 200px;"
-          />
-        </el-form-item>
-        <el-form-item label="计划开始" prop="startPlanTime" style="display: inline-block">
-          <el-date-picker
-            v-model="form1.startPlanTime"
-            placeholder="选择开始时间"
-            size="small"
-            type="date"
-            value-format="yyyy-MM-dd"
-          />
-        </el-form-item>
-        <el-form-item label="计划结束" prop="endPlanTime" style="display: inline-block">
-          <el-date-picker
-            v-model="form1.endPlanTime"
-            placeholder="选择结束时间"
-            size="small"
-            type="date"
-            value-format="yyyy-MM-dd"
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="callOff1()">取消</el-button>
-        <el-button size="small" type="primary" @click="submitAdd1()">确定</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible3" center style="min-height: 200px" title="订单导入" width="900px">
-      <div class="app-container">
-        <upload-excel-component style="margin-left: 15%" @on-selected-file="selected"/>
-        <div style="margin-left: 395px">
-          <span v-show="worksheet.length > 1" style="cursor: pointer;width: 50px;" @click="removeAll"><i
-            class="el-icon-close"
-          /></span>
-          <el-upload :file-list="itemFile" :on-remove="handleRemove" action="" style="width: 220px"/>
-        </div>
-        <div v-if="worksheet.length !== 0" style="margin: 3px 0 0 395px">
-          <el-button icon="el-icon-upload2" size="small" type="primary" @click="basicPartsToSQL">导入到数据库
-          </el-button>
-        </div>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :visible.sync="dialogFormVisible4"
-      center
-      style="min-height: 200px;"
-      title="打印变速器条码"
-      width="400px"
-    >
-      <el-form ref="printForm" :model="printForm" :rules="printRules" label-position="right" label-width="110px">
-        <el-form-item label="产品型号" prop="产品型号" style="display: inline-block">
-          <el-input v-model="printForm.产品型号" placeholder="请输入产品型号" readonly size="small"/>
-        </el-form-item>
-        <el-form-item label="总成号" prop="零件号" style="display: inline-block">
-          <el-input v-model="printForm.零件号" placeholder="请输入总成号" readonly size="small"/>
-        </el-form-item>
-        <el-form-item label="序列号" prop="起始号码" style="display: inline-block">
-          <el-input
-            v-model="printForm.起始号码"
-            :disabled="printCountPlanIsShow"
-            placeholder="请输入八位序列号"
-            size="small"
-            @blur="startKeyChange(printForm.起始号码)"
-          />
-          <!--          <el-input-number-->
-          <!--            v-model="printForm.起始号码"-->
-          <!--            :min="1"-->
-          <!--            :step="1"-->
-          <!--            size="small"-->
-          <!--            style="width: 200px;"-->
-          <!--            placeholder="请输入计划数量" />-->
-        </el-form-item>
-        <el-form-item label="打印日期" prop="打印日期" style="display: inline-block">
-          <el-date-picker
-            v-model="printForm.打印日期"
-            :disabled="printCountPlanIsShow"
-            placeholder="选择打印日期"
-            size="small"
-            type="date"
-            value-format="yyyy-MM-dd"
-            @change="getPrintDate"
-          />
-        </el-form-item>
-        <el-form-item label="打印数量" prop="打印数量" style="display: inline-block">
-          <el-input-number
-            v-model="printForm.打印数量"
-            :disabled="printCountPlanIsShow"
-            :min="1"
-            :step="1"
-            placeholder="请输入打印数量"
-            size="small"
-            style="width: 200px;"
-          />
-        </el-form-item>
-        <div v-if="printCountPlanIsShow" style="text-align: center;color: #3c9445;font-size: 20px">
-          打印进度：{{ printCountPlan }} / {{ printForm.打印数量 }}
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="callOffPrint()">取消</el-button>
-        <el-button :disabled="isAllowAddClike" size="small" type="primary" @click="submitAddPrint('printForm')">确定
-        </el-button>
-      </div>
-    </el-dialog>
-    <!--// 强制下线弹出框-->
-    <el-dialog
-      :append-to-body="true"
-      :visible.sync="isForceOffLine"
-      center
-      style="text-align: center"
-      title="强制下线记录"
-      width="450px"
-    >
-      <div style="text-align: center">
-        <el-form
-          ref="faultStartFormRef"
-          :model="forceOffLineForm"
-          label-position="right"
-          label-width="130px"
-          style="width: 100%;margin: auto"
-        >
-          <el-form-item label="制造编号" prop="engineTypeValue" style="display: inline-block;width: 100%">
-            <el-input
-              v-model="forceOffLineForm.workCode"
-              :rows="1"
-              placeholder="制造编号"
-              style="height: 42px;width: 220px"
-              readonly
-              type="textarea"
-            />
-          </el-form-item>
-          <el-form-item label="单元号" prop="engineTypeValue" style="display: inline-block;width: 100%">
-            <el-input
-              v-model="forceOffLineForm.unitCode"
-              :rows="1"
-              readonly
-              placeholder="单元号"
-              style="height: 42px;width: 220px"
-              type="textarea"
-            />
-          </el-form-item>
-          <el-form-item label="下线类型" prop="engineTypeValue" style="display: inline-block;width: 100%">
-            <el-select
-              v-model="forceOffLineForm.type"
-              placeholder="请选择下线类型"
-              style="width:220px;"
-              size="small"
-            >
-              <el-option
-                v-for="item in forceOffTypeList"
-                :key="item"
-                :label="item"
-                :value="item"
-                size="mini"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="强制下线原因" prop="engineTypeValue" style="display: inline-block;width: 100%">
-            <el-input
-              v-model="forceOffLineForm.offLineTest"
-              :rows="2"
-              placeholder="请输入下线原因"
-              style="height: 42px;width: 220px"
-              type="textarea"
-            />
-          </el-form-item>
-          <!--底部按钮-->
-          <div style="text-align: center; margin-top: 20px">
-            <el-button class="el-icon-check" type="primary" @click="forceOffLineSubmit()">确定</el-button>
-            <el-button class="el-icon-close" style="margin-left: 50px" @click="isForceOffLine = false">关闭</el-button>
-          </div>
-        </el-form>
-      </div>
-    </el-dialog>
-    <el-dialog
-      v-el-drag-dialog
-      :visible.sync="dialogFormVisibleModifyOrder"
-      center
-      title="强制下线记录"
-      width="63%"
-    >
-      <el-table
-        :data="tableDataVisibleModifyOrder"
-        :header-cell-style="{background: '#383E4B',color: 'white'}"
-        highlight-current-row
-        border
-        stripe
-        size="small"
-        height="550px"
-        style="width: 1171px"
-      >
-        <el-table-column min-width="100px" label="工位号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.工位号 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="90px" label="操作者" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.操作者 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="间隔号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.间隔号 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="单元号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.单元号 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="装配类型" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.间隔号 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="下线原因" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.原因 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="100px" label="下线类型" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.下线类型 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="200px" label="操作时间" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.操作时间 }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import UploadExcelComponent from './UploadExcel.vue'
-import { sleep } from '../../../utils/tool' // import { Mqtt } from '../../../utils/mqtt.js'
-// import { Mqtt } from '../../../utils/mqtt.js'
-export default {
-  name: 'UploadExcel',
-  components: { UploadExcelComponent },
-  data() {
-    return {
-      expands: [],
-      expandsDetail: [],
-      mqttClient: null,
-      mqttConnection: {
-        host: window.g.mqttIP,
-        port: window.g.mqttPortNumber,
-        endpoint: '/mqtt',
-        clean: true, // 保留会话
-        connectTimeout: 4000, // 超时时间
-        reconnectPeriod: 4000, // 重连时间间隔
-        clientId: '', // 同一个ID 无法二次连接
-        username: 'MES_Manager',
-        password: '123456'
-      },
-      tableDataFirst: [],
-      subscription: {
-        topic: '',
-        qos: 0
-      },
-      publication: {
-        topic: '',
-        qos: 0,
-        payload: ''
-      },
-      worksheet: [],
-      itemFile: [],
-      unSpecification: [],
-      method1: '', // 机床1加工方式
-      method2: '', // 机床2加工方式
-      method1Explain: '', // 机床1加工方式说明
-      method2Explain: '', // 机床2加工方式说明
-      stockQuantity: '', // 库存数量
-      stockNum: '', // 库位号
-      explain: false,
-      orderNumber: [],
-      orderNumberValue: '',
-      OrderNumber_check: 0,
-      engineTypeValue: '',
-      engineType: [],
-      partCodeList: [],
-      OKWarehouseValue: '',
-      OKWarehouse: [],
-      NGWarehouseValue: '',
-      NGWarehouse: [],
-      engineType_check: 0,
-      printForm: { // 创建订单
-        订单号: '',
-        零件号: '',
-        产品型号: '',
-        产品型号代码: '',
-        起始号码: '',
-        打印日期: '',
-        打印数量: 1
-      },
-      printRules: { // 打印条码验证
-        零件号: [{ required: true, message: '请输入总成号', trigger: 'blur' }],
-        订单号: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        产品型号: [{ required: true, message: '请输入产品型号', trigger: 'blur' }],
-        起始号码: [{ required: true, min: 8, message: '长度最少为八位', trigger: 'blur' }],
-        打印日期: [{ required: true, message: '请选择打印日期', trigger: 'blur' }],
-        打印数量: [{ required: true, message: '请输入打印数量', trigger: 'blur' }]
-      },
-      form: { // 创建订单
-        workCode: '', // 工程号
-        orderCode: '', // 订单号
-        engineType: '', // 物料号
-        engineTypeDescribe: '', // 物料描述
-        number: 1, // 数量
-        startPlanTime: '', // 开始时间
-        endPlanTime: '' // 结束时间
-      },
-      rules: { // 创建订单验证
-        workCode: [{ required: true, message: '请输入工程号', trigger: 'blur' }],
-        orderCode: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        engineType: [{ required: true, message: '请输入物料号', trigger: 'blur' }],
-        engineTypeDescribe: [{ required: true, message: '请输入物料描述', trigger: 'blur' }],
-        number: [{ required: true, message: '请输入生产数量', trigger: 'blur' }],
-        startPlanTime: [{ required: true, message: '请输入计划开始时间', trigger: 'blur' }],
-        endPlanTime: [{ required: true, message: '请输入计划结束时间', trigger: 'blur' }]
-      },
-      form1: { // 修改订单
-        workCode: '', // 制造编号
-        projectName: '', // 项目名称
-        splitCode: '', // 间隔号
-        unidCode: '', // 单元号
-        engineType: '', // 本体类型
-        engineTypeModel: '', // 附件类型
-        startPlanTime: '', // 开始时间
-        endPlanTime: '' // 结束时间
-      },
-      rules1: { // 修改订单验证
-        planQuantity: [{ required: true, message: '请输入计划数量', trigger: 'blur' }],
-        orderNumber: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        engineTypeValue: [{ required: true, message: '请选择机型', trigger: 'blur' }],
-        partCode: [{ required: true, message: '请选择总成号', trigger: 'blur' }],
-        startPlanTime: [{ required: true, message: '请选择计划开始时间', trigger: 'blur' }],
-        endPlanTime: [{ required: true, message: '请选择计划结束时间', trigger: 'blur' }],
-        quantityCompletion: [{ required: true, message: '请输入计划完成数量', trigger: 'blur' }]
-      },
-      form2: { // 订单下发
-        planQuantity: '',
-        orderNumber: '',
-        engineTypeValue: '',
-        MID: '',
-        IssuedQuantity: 1
-      },
-      rules2: { // 订单下发验证
-        planQuantity: [{ required: true, message: '请输入计划数量', trigger: 'blur' }],
-        orderNumber: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        engineTypeValue: [{ required: true, message: '请选择机型', trigger: 'blur' }],
-        IssuedQuantity: [{ required: true, message: '请输入订单下发数量', trigger: 'blur' }]
-      },
-      form3: { // 订单下发
-        planQuantity: '',
-        orderNumber: '',
-        engineTypeValue: '',
-        MID: '',
-        IssuedQuantity: 1
-      },
-      rules3: { // 订单下发验证
-        planQuantity: [{ required: true, message: '请输入计划数量', trigger: 'blur' }],
-        orderNumber: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
-        engineTypeValue: [{ required: true, message: '请选择机型', trigger: 'blur' }],
-        IssuedQuantity: [{ required: true, message: '请输入订单下发数量', trigger: 'blur' }]
-      },
-      isForceOffLine: false,
-      forceOffLineForm: {
-        opName: '',
-        workCode: '',
-        unitCode: '',
-        engineID: '',
-        type: '',
-        offLineTest: '' // 下线原因
-      },
-      forceOffTypeList: ['工件下线处理', '重新上线加工'],
-      // planTime: [new Date(new Date().getTime() - 3600 * 1000 * 24 * 3000), new Date(new Date().getTime())],
-      planTime: [],
-      startPlanTime: '',
-      startPlanTime_check: 0,
-      endPlanTime: '',
-      endPlanTime_check: 0,
-      tableData: [],
-      tableDataPrint: [],
-      tableDataPrintDetail: [],
-      importData: [],
-      dialogFormVisible: false, // 创建订单
-      dialogFormVisible1: false, // 修改订单
-      dialogFormVisible3: false, // 订单导入
-      dialogFormVisible4: false, // 打印
-      isAllowAddClike: false, // 打印按钮是否禁用
-      states: '', // 当前库存状态
-      printCountPlan: 0, // 打印进度条
-      printCountPlanIsShow: false, // 打印进度条是否显示
-      MIDGroup: [],
-      total: 0, // 总条数
-      pageList: 30, // 每页显示条数
-      pageSize: 30, // 每页显示条数
-      pageCurrent: 1, // 后台获取页
-      loading: false,
-      tableDataVisibleModifyOrder: [],
-      dialogFormVisibleModifyOrder: false,
-      numberModifyOrder: ''
-    }
-  },
-  created() {
-    this.getOrderNumber()
-    this.getEndStation()
-    this.searchOrder()
-
-    // 定时重新读取数据
-    // setInterval(() => {
-    //   this.searchOrder()
-    // }, 1000 * 10)
-  },
-  mounted() {
-
-  },
-  beforeDestroy() {
-
-  },
-  methods: {
-    viewModifyOrder() {
-      this.dialogFormVisibleModifyOrder = true
-      this.viewModifyOrderClick()
-    },
-    viewModifyOrderClick() {
-      var param1 = []
-      var Data1 = this.CreateData('11', 'MES_强制下线记录_查询', param1)
-      this.ExecDatabase(Data1).then(response => {
-        // this.numberModifyOrder = response.data.length
-        this.tableDataVisibleModifyOrder = response.data
-      })
-    },
-    printShow(row) {
-      this.printForm.订单号 = row.订单号
-      this.printForm.产品型号 = row.产品型号
-      this.printForm.产品型号代码 = row.机型代码
-      this.printForm.零件号 = row.零件号
-      this.printForm.打印日期 = this.getNowFormatDate()
-      this.printForm.打印数量 = 1
-      this.dialogFormVisible4 = true
-    },
-    removeAll() {
-      this.worksheet = []
-      this.itemFile = []
-    },
-    async selected(data) { // 选择需要导入的文件
-      console.log(data, 1111)
-      this.worksheet = data.worksheet // 获取每个多选文件的表格坐标及值
-      this.itemFile = data.itemFile
-    },
-    handleRemove(file) { // 移除文件
-      for (let i = 0; i < this.itemFile.length; i++) {
-        if (this.itemFile[i].name === file.name) {
-          this.worksheet.splice(i, 1)
-          this.itemFile.splice(i, 1)
-        }
-      }
-    },
-    /* 验证内容是否英文数字以及下划线*/
-    // isPassword(rule, value, callback) {
-    //   const reg = /^[_a-zA-Z0-9]+$/
-    //   if (value === '' || value === undefined || value == null) {
-    //     callback()
-    //   } else {
-    //     if (!reg.test(value) || value.length !== 7) {
-    //       callback(new Error('订单仅由数字和字母组成，且只能位7位'))
-    //     } else {
-    //       callback()
-    //     }
-    //   }
-    // },
-    // 初始化获取产品型号
-    getEndStation() {
-      this.engineType = []
-      var param = []
-      var Data = this.CreateData('11', 'MES_基本变量_机型代码_查询', param)
-      this.ExecDatabase(Data).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.engineType.push({
-            label: response.data[i].发动机型号,
-            value: response.data[i].发动机型号
-          })
-        }
-      })
-    },
-    // 日期框点击事件
-    getPrintDate(date) {
-      this.printForm.打印日期 = date
-    },
-    // 获取当前日期函数
-    getNowFormatDate() {
-      const date = new Date()
-      const year = date.getFullYear() // 获取完整的年份(4位)
-      let month = date.getMonth() + 1 // 获取当前月份(0-11,0代表1月)
-      let strDate = date.getDate() // 获取当前日(1-31)
-      if (month < 10) month = `0${month}` // 如果月份是个位数，在前面补0
-      if (strDate < 10) strDate = `0${strDate}` // 如果日是个位数，在前面补0
-
-      return `${year}-${month}-${strDate}`
-    },
-    renderHeader(h) {
-      return (
-        <div>
-          <span>操作</span>
-          <el-button
-            type='primary'
-            style='padding:2px 5px;margin-left: 10px'
-            size='mini'
-            onClick={() => this.addDetailsRow()}
-          >
-            +
-          </el-button>
-        </div>
-      )
-    },
-    // 提交订单明细
-    addDetailsRow() {
-      if (!this.btn_makeOrder) {
-        this.$message.warning('请先创建生产订单！')
-        return
-      }
-      var param = []
-      param[0] = ['订单号', this.form.orderNumber]
-      param[1] = ['产品型号', '']
-      param[2] = ['计划数量', 1]
-      param[3] = ['加工方式代码', 1]
-      var Data = this.CreateData(
-        '12',
-        'SY_MES_计划BOM_发动机预制订单_明细_创建',
-        param
-      )
-      this.ExecDatabase(Data).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message({
-            message: '修改成功',
-            type: 'success'
-          })
-          this.searchOrderFirstDetails(this.form.orderNumber)
-        } else {
-          this.$message.error('新增失败！')
-        }
-      })
-    },
-    searchOrderFirstDetails(orderNumber) {
-      this.tableDataFirst = []
-      var param = []
-      param[0] = ['订单号', orderNumber]
-      var Data = this.CreateData(
-        '11',
-        'SY_MES_计划BOM_发动机预制订单_明细查询',
-        param
-      )
-      this.ExecDatabase(Data).then(response => {
-        for (const responseElement of response.data) {
-          responseElement['edit'] = false
-          responseElement['加工方式代码_yuan'] =
-            responseElement['加工方式代码']
-          responseElement['加工方式代码_yuan'] =
-            responseElement['加工方式代码']
-          responseElement['产品型号_yuan'] = responseElement['产品型号']
-          responseElement['计划数量_yuan'] = responseElement['计划数量']
-        }
-        this.tableDataFirst = response.data
-      })
-    },
-    // 初始化获取产品型号
-    getPartCodeList() {
-      this.partCodeList = []
-      this.form.engineTypeModel = ''
-      var param = []
-      param[0] = ['基本机型', this.form.engineType]
-      var Data = this.CreateData('11', '北汽福田订单创建零件号_查询', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data.length === 0) {
-          this.$message({
-            type: 'error',
-            message: '该机型没有对应的零件号'
-          })
-          return false
-        } else {
-          for (let i = 0; i < response.data.length; i++) {
-            this.partCodeList.push({
-              label: response.data[i].零件号,
-              value: response.data[i].零件号
-            })
-          }
-        }
-      })
-    },
-    // 初始化获取订单号
-    getOrderNumber() {
-      this.orderNumber = []
-      var param = []
-      param[0] = ['开始时间', this.planTime[0]]
-      param[1] = ['结束时间', this.planTime[1]]
-      var Data = this.CreateData('11', '订单计划_订单号_查询', param)
-      this.ExecDatabase(Data).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.orderNumber.push({
-            label: response.data[i].订单号,
-            value: response.data[i].订单号
-          })
-        }
-      })
-    },
-    buttonIsDisabled(row) {
-      let isDisabled = false
-      if (row.订单状态 !== 1) isDisabled = true
-      return isDisabled
-    },
-    // 下移订单
-    downOrder(row) {
-      if (row.MID) {
-        var param = []
-        param[0] = ['id', row.MID]
-        console.log(param)
-        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单下移', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'success',
-              duration: 3000
-            })
-            this.pageCurrent = 1
-            this.pageSize = 50
-            this.searchOrder()
-          } else {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'warning',
-              duration: 3000
-            })
-          }
-        })
-      } else {
-        this.$message.error('请选择订单！')
-      }
-    },
-    // 上移订单
-    topOrder(row) {
-      if (row.MID) {
-        var param = []
-        param[0] = ['id', row.MID]
-        console.log(param)
-        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单上移', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'success',
-              duration: 3000
-            })
-            this.pageCurrent = 1
-            this.pageSize = 50
-            this.searchOrder()
-          } else {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'warning',
-              duration: 3000
-            })
-          }
-        })
-      } else {
-        this.$message.error('请选择订单！')
-      }
-    },
-    // 修改小线剩余上料数
-    updateWorkOver(row) {
-      this.$confirm(`是否强制该工件完工下线 <i style="color: red">  工件编号：` + row.工件编号 + `</i> `, '提示', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        var param = []
-        param[0] = ['工件编号', row.工件编号]
-        var Data = this.CreateData('12', '生产计划_派工订单_工件追溯_强制完成', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('强制下线成功！')
-            this.selectPlan(row, this.expandsDetail)
-          } else {
-            this.$message.error('强制下线失败！')
-          }
-        })
-      })
-    },
-    // 导出检查项
-    uploadCheckDataExcel(row) {
-      if (this.tableData.length !== 0) {
-        var param = []
-        param[0] = ['订单号', row.订单号]
-        var Data = this.CreateData('2001', '电子看板_工序内容_记录表_订单号导出', param)
-        this.exportExcel_NPOI(Data)
-      } else {
-        this.$message.warning('暂无数据')
-      }
-    },
-    // 修改线首订单剩余上料数
-    updateMainWorkCount(row) {
-      // 弹窗输入数量弹窗 只能输入数字 不能负数
-      this.$prompt('请输入修改后的线首订单剩余上料数量', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputPattern: /^\d+$/,
-        inputErrorMessage: '只能输入数字',
-        inputValue: (row.计划数量 - row.总装上线)
-      }).then(({ value }) => {
-        if (value > row.计划数量) {
-          this.$notify.error({
-            title: '提示',
-            message: '剩余数不可大于计划数量！',
-            position: 'top-right',
-            offset: 10
-          })
-          return
-        }
-        const param = []
-        param[0] = ['订单号', row.订单号]
-        param[1] = ['待上线数量', value]
-        const Data = this.CreateData('12', '合力_总装线PLC_更新待上线数量', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === '1') {
-            this.$notify.success({
-              title: '提示',
-              message: '修改成功！',
-              position: 'bottom-right',
-              offset: 170
-            })
-          } else {
-            this.$message.error('修改失败')
-          }
-          this.searchOrder()
-          // this.getTable1()
-          // this.getTable2()
-        })
-      })
-    },
-    // 强制下线
-    forceOffLine(row) {
-      console.log(this.$store.state.user.id)
-      this.isForceOffLine = true
-      this.forceOffLineForm.engineID = row.工件编号
-      this.forceOffLineForm.unitCode = row.单元号
-      this.forceOffLineForm.workCode = row.制造编号
-      this.forceOffLineForm.type = ''
-      this.forceOffLineForm.offLineTest = ''
-    },
-    // 强制下线记录
-    forceOffLineSubmit() {
-      var param = []
-      param[0] = ['工位号', '管理系统']
-      param[1] = ['操作者', this.$store.state.user.id]
-      param[2] = ['原因', this.forceOffLineForm.offLineTest]
-      param[3] = ['工件编号', this.forceOffLineForm.engineID]
-      param[4] = ['下线类型', this.forceOffLineForm.type]
-      var Data = this.CreateData('12', 'MES_强制下线记录_增加', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data[0].result === '1') {
-          this.searchOrder()
-          this.$message({
-            message: '强制完工提交成功',
-            type: 'success'
-          })
-          this.isForceOffLine = false
-        } else {
-          this.$message({
-            message: '强制完工提交失败',
-            type: 'error'
-          })
-        }
-      })
-    },
-    // 控制展开列
-    selectPlan(row, expandedRows) {
-      if (expandedRows.length) {
-        if (row) {
-          var param = []
-          param[0] = ['工单号', row.订单号]
-          var Data = this.CreateData('11', '生产计划_派工订单_打印_查询', param)
-          this.ExecDatabase(Data).then(response => {
-            this.expands = []
-            console.log(response.data)
-            if (response.data.length !== 0) {
-              this.tableDataPrint = response.data
-            } else {
-              this.tableDataPrint = []
-            }
-            this.expands.push(row.订单号)
-          })
-
-          var Data2 = this.CreateData('11', '生产计划_派工订单_打印详细_查询', param)
-          this.ExecDatabase(Data2).then(response => {
-            this.expandsDetail = []
-            console.log(response.data)
-            if (response.data.length !== 0) {
-              this.tableDataPrintDetail = response.data
-            } else {
-              this.tableDataPrintDetail = []
-            }
-            this.expandsDetail.push(row.订单号)
-          })
-        }
-      } else {
-        this.expands = []
-        this.expandsDetail = []
-      }
-    },
-    // 获取展开列的工单号
-    getRowKeys(row) {
-      return row.订单号
-    },
-    // 查询订单
-    searchOrder() {
-      this.startPlanTime ? this.startPlanTime_check = 1 : this.startPlanTime_check = 0
-      this.endPlanTime ? this.endPlanTime_check = 1 : this.endPlanTime_check = 0
-      this.orderNumberValue ? this.OrderNumber_check = 1 : this.OrderNumber_check = 0
-      this.engineTypeValue ? this.engineType_check = 1 : this.engineType_check = 0
-      if (this.startPlanTime === null) {
-        this.startPlanTime = ''
-      }
-      if (this.endPlanTime === null) {
-        this.endPlanTime = ''
-      }
-      var param = []
-      param[0] = ['计划开始时间_check', this.startPlanTime_check]
-      param[1] = ['计划开始时间', this.startPlanTime]
-      param[2] = ['计划完成时间_check', this.endPlanTime_check]
-      param[3] = ['计划完成时间', this.endPlanTime]
-      param[4] = ['订单号_check', this.OrderNumber_check]
-      param[5] = ['订单号', this.orderNumberValue]
-      param[6] = ['产品型号_check', this.engineType_check]
-      param[7] = ['产品型号', this.engineTypeValue]
-      param[8] = ['PageCurrent', this.pageCurrent]
-      param[9] = ['PageSize', this.pageSize]
-      param[10] = ['PageCount', '1111', 'int', '1']
-      param[11] = ['ItemCount', '1111', 'int', '1']
-      var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_查询分页', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data.result.length !== 0) {
-          this.tableData = response.data.result
-          // 先获取当前选中订单号
-          let OrderForm
-          if (this.expandsDetail.length) {
-            OrderForm = this.expandsDetail[0]
-            for (const item of this.tableData) {
-              if (item.订单号 === OrderForm) {
-                this.selectPlan(item, this.expandsDetail)
-              }
-            }
-          }
-        } else {
-          this.tableData = []
-        }
-        this.total = parseInt(response.data.output[0].ItemCount)
-        this.loading = false
-      })
-    },
-    // 创建订单
-    creatOrder(formName) {
-      // if (this.$refs[formName] !== undefined) {
-      //   this.$refs[formName].resetFields()
-      // }
-      // this.form.planQuantity = ''
-      // this.form.orderNumber = ''
-      // this.form.startPlanTime = ''
-      // this.form.endPlanTime = ''
-      this.dialogFormVisible = true
-    },
-    // 提交新增订单
-    submitAdd(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          var param = []
-          param[0] = ['工程号', this.form.workCode]
-          param[1] = ['订单号', this.form.orderCode]
-          param[2] = ['物料号', this.form.engineType]
-          param[3] = ['物料描述', this.form.engineTypeDescribe]
-          param[4] = ['数量', this.form.number]
-          param[5] = ['开始时间', this.form.startPlanTime]
-          param[6] = ['结束时间', this.form.endPlanTime]
-          var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单手动增加', param)
-          this.ExecDatabase(Data).then(response => {
-            if (response.data[0].result === 1) {
-              this.$message({
-                message: '订单创建成功',
-                type: 'success'
-              })
-              this.pageCurrent = 1
-              this.pageSize = 30
-              this.searchOrder()
-              this.dialogFormVisible = false
-            } else if (response.data[0].result === 2) {
-              this.$message.error('制造编号与单元号重复，创建失败！')
-            } else {
-              this.$message.error('订单创建失败！')
-            }
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    submitAddPrint(formName) {
-      if (this.printForm.起始号码.length < 8) return
-      this.$refs[formName].validate((valid) => {
-        const scope = this
-        var param = []
-        param[0] = ['工单号', this.printForm.订单号]
-        param[1] = ['零件号', this.printForm.零件号]
-        param[2] = ['打印起始号', this.printForm.起始号码]
-        param[3] = ['打印数量', this.printForm.打印数量]
-        param[4] = ['打印日期', this.printForm.打印日期]
-        var Data = this.CreateData('12', '生产计划_派工订单_打印_增加', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message({
-              message: '开始打印变速器条码',
-              type: 'success'
-            })
-            // 置空进度条进度
-            this.printCountPlan = 0
-            this.printCountPlanIsShow = true
-            this.searchPrintListFinal()
-            const printPartCode = this.printForm.零件号
-            const printTemplate = window.g.printTemplate
-            const printStartNum = parseInt(this.printForm.起始号码)
-            const printDate = typeof (this.printForm.打印日期) === 'string' ? new Date(this.printForm.打印日期) : this.printForm.打印日期
-            const printCount = this.printForm.打印数量
-            const printDateFinal = printDate.getFullYear() + '' + ((printDate.getMonth() + 1) >= 10 ? (printDate.getMonth() + 1) : '0' + (printDate.getMonth() + 1)) + '' + (printDate.getDate() >= 10 ? printDate.getDate() : '0' + printDate.getDate())
-            for (let i = 0; i < printCount; i++) {
-              (function(t) { // 注意这里是形参
-                setTimeout(function() {
-                  const printCountFinal = (printStartNum + t).toString().padStart(8, '0')
-                  const printFinal = printPartCode.replaceAll(' ', '') + '*' + printDateFinal + '*' + printCountFinal
-                  scope.publication.topic = window.g.mqttPublishTopic
-                  scope.publication.payload = `J07MA000~1~${printTemplate}|BarCode^Code0^${printFinal}|TEXT^TEXT0^${printFinal}`
-                  const result = window.g.mqttClient.doPublish(scope.publication)
-                  console.log(result, printFinal)
-                  scope.submitAddPrintList(scope.printForm.订单号, scope.printForm.产品型号, scope.printForm.产品型号代码, scope.printForm.零件号, printFinal)
-                }, 100 * t)
-              })(i)
-            }
-          } else {
-            this.$message.error('打印变速器条码失败!')
-          }
-        })
-      })
-    },
-    // 判断起始号是否重复打印
-    startKeyChange() {
-      var param = []
-      param[0] = ['起始号', this.printForm.起始号码]
-      param[1] = ['机型', this.printForm.产品型号]
-      var Data = this.CreateData('11', '生产计划_派工订单_打印记录_是否重复_查询', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data[0].result === 2) {
-          this.$message.error(response.data[0].msg)
-          this.isAllowAddClike = true
-        } else {
-          this.isAllowAddClike = false
-        }
-      })
-    },
-    // 提交新增订单
-    submitAddPrintList(orderCode, engineType, engineTypeValue, partCode, engineId) {
-      var param = []
-      param[0] = ['订单号', orderCode]
-      param[1] = ['零件号', partCode]
-      param[2] = ['变速箱总成号', engineId]
-      param[3] = ['机型代码', engineTypeValue]
-      param[4] = ['机型', engineType]
-      var Data = this.CreateData('12', '生产计划_派工订单_打印记录_增加', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data[0].result === '1') {
-          // this.$message({
-          //   message: '订记录成功',
-          //   type: 'success'
-          // })
-          this.printCountPlan++
-          if (this.printCountPlan === Number(this.printForm.打印数量)) {
-            this.$message({
-              message: '全部条码打印完成',
-              type: 'success'
-            })
-            // 关闭进度条 关闭打印窗口
-            this.printCountPlanIsShow = false
-            this.dialogFormVisible4 = false
-          }
-        } else {
-          this.$message.error('记录失败！')
-        }
-      })
-    },
-    callOffPrint() {
-      this.searchPrintListFinal()
-      this.dialogFormVisible4 = false
-    },
-    searchPrintListFinal() {
-      this.tableDataPrint = []
-      const param = []
-      param[0] = ['工单号', this.printForm.订单号]
-      const Data = this.CreateData('11', '生产计划_派工订单_打印_查询', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data.length !== 0) {
-          this.tableDataPrint = response.data
-        }
-      })
-    },
-    // 取消新增订单
-    callOff(formName) {
-      this.dialogFormVisible = false
-      // this.$refs[formName].resetFields()
-    },
-    // 导入订单
-    importOrder() {
-      this.dialogFormVisible3 = true
-    },
-    // 删除订单
-    deleteOrder(row) {
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        var param = []
-        param[0] = ['MID', row.MID]
-        var Data = this.CreateData('11', '订单计划_删除', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'success'
-            })
-            this.pageCurrent = 1
-            this.pageSize = 30
-            this.searchOrder()
-          } else {
-            this.$message.error(response.data[0].msg)
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 修改订单
-    handleEdit(row) {
-      if (this.$refs['form1'] !== undefined) {
-        this.$refs['form1'].resetFields()
-      }
-      console.log(row)
-      this.form1.planQuantity = row.计划数量
-      this.form1.orderNumber = row.订单号
-      this.form1.partCode = row.零件号
-      this.form1.startPlanTime = row.计划开始时间
-      this.form1.endPlanTime = row.计划完成时间
-      this.form1.quantityCompletion = row.完成数量
-      this.form1.engineTypeValue = row.产品型号
-      this.form1.rank = row.排序
-      this.form1.MID = row.MID
-      this.form1.qiaoKeOverNumber = row.总装上线
-      this.form1.lunGuOverNumber = row.测试上线
-      this.dialogFormVisible1 = true
-    },
-    // 开始生产
-    planIssue(row) {
-      // 弹窗提示框是否下发订单 确认后修改订单是否下发字段
-      this.$confirm(`确定下发订单吗？下发后进入生产队列开始生产，生产后不可取消下发与修改订单信息 <i style="color: red">  机型：` + row.产品型号 + '，订单号：' + row.订单号 + `</i> `, '提示', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 无滞留信息
-        var param = []
-        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_滞留判断', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
-            // 无滞留信息
-            this.updateOrderStatus(row.MID, 1)
-          } else if (response.data[0].result === 2) {
-            this.$confirm('<i style="color: red">' + response.data[0].msg + '</i>', '提示', {
-              dangerouslyUseHTMLString: true,
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              // 强制切换
-              this.updateOrderStatus(row.MID, 1)
-            })
-          } else {
-            this.$message.error('订单下发失败')
-          }
-        })
-      })
-    },
-    // 继续生产
-    continueIssue(row) {
-      // 弹窗提示框是否下发订单 确认后修改订单是否下发字段
-      this.$confirm(`是否继续该订单的生产,重下发后订单排序将排至最新 <i style="color: red">  制造编号：` + row.制造编号 + '，DS/ES编号：' + row.间隔号 + `</i> `, '提示', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 直接改，不判断滞留
-        this.updateOrderStatus(row.MID, 3)
-        // var param = []
-        // var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_滞留判断', param)
-        // this.ExecDatabase(Data).then(response => {
-        //   if (response.data[0].result === 1) {
-        //     // 无滞留信息
-        //     this.updateOrderStatus(row.MID, 3)
-        //   } else if (response.data[0].result === 2) {
-        //     this.$confirm('<i style="color: red">' + response.data[0].msg + '</i>', '提示', {
-        //       dangerouslyUseHTMLString: true,
-        //       confirmButtonText: '确定',
-        //       cancelButtonText: '取消',
-        //       type: 'warning'
-        //     }).then(() => {
-        //       // 强制切换
-        //       this.updateOrderStatus(row.MID, 3)
-        //     })
-        //   } else {
-        //     this.$message.error('订单下发失败')
-        //   }
-        // })
-      })
-    },
-    // 修改订单状态
-    updateOrderStatus(MID, type) {
-      var param = []
-      param[0] = ['MID', MID]
-      param[1] = ['type', type]
-      var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_状态修改', param)
-      this.ExecDatabase(Data).then(response => {
-        if (response.data[0].result === 1) {
-          this.$message.success('订单状态操作成功！')
-          this.pageCurrent = 1
-          this.pageSize = 30
-          this.searchOrder()
-        } else {
-          this.$message.error(response.data[0].msg)
-        }
-      })
-    },
-    // 暂停生产
-    planIsStop(row) {
-      // 弹窗提示框是否下发订单 确认后修改订单是否下发字段
-      this.$confirm(`确定暂停此订单吗`, '提示', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 强制切换
-        this.updateOrderStatus(row.MID, 2)
-      })
-    },
-    // 提交修改订单
-    submitAdd1() {
-      this.$refs['form1'].validate((valid) => {
-        if (valid) {
-          var param = []
-          param[0] = ['计划开始时间', this.form1.startPlanTime]
-          param[1] = ['计划完成时间', this.form1.endPlanTime]
-          param[2] = ['计划数量', this.form1.planQuantity]
-          param[3] = ['MID', this.form1.MID]
-          var Data = this.CreateData('11', '订单计划_修改', param)
-          this.ExecDatabase(Data).then(response => {
-            if (response.data[0].result === 1) {
-              this.$message({
-                message: '订单修改成功',
-                type: 'success'
-              })
-              this.pageCurrent = 1
-              this.pageSize = 30
-              this.searchOrder()
-            } else {
-              this.$message.error(response.data[0].msg)
-            }
-          })
-          this.dialogFormVisible1 = false
-        } else {
-          return false
-        }
-      })
-    },
-    // 取消修改订单
-    callOff1() {
-      this.dialogFormVisible1 = false
-      this.$refs['form1'].resetFields()
-    },
-    // 多选
-    handleSelectionChange(val) {
-      this.MIDGroup = []
-      for (let i = 0; i < val.length; i++) {
-        this.MIDGroup.push(val[i].MID)
-      }
-    },
-    // 订单下发编辑
-    ordersIssuedEditor(row) {
-      this.$confirm(`确定下达订单<p style="color: deepskyblue;display: inline-block"> ${row.订单号}</p> 吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        dangerouslyUseHTMLString: true
-      }).then(() => {
-        var param = []
-        param[0] = ['MID', row.MID]
-        var Data = this.CreateData('12', 'MES_计划BOM_发动机订单计划_订单下发', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message({
-              message: '订单下发成功！',
-              type: 'success'
-            })
-            this.pageCurrent = 1
-            this.pageSize = 30
-            this.searchOrder()
-          } else {
-            this.$message.error('订单下发失败！')
-          }
-        })
-      })
-    },
-    // 取消下发
-    ordersIssuedEditor1(row) {
-      this.$confirm(`确定取消订单<p style="color: deepskyblue;display: inline-block"> ${row.订单号}</p> 吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        dangerouslyUseHTMLString: true
-      }).then(() => {
-        var param = []
-        param[0] = ['MID', row.MID]
-        var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单下发取消', param)
-        this.ExecDatabase(Data).then(response => {
-          if (response.data[0].result === 1) {
-            this.$message({
-              message: response.data[0].msg,
-              type: 'success'
-            })
-            this.pageCurrent = 1
-            this.pageSize = 30
-            this.searchOrder()
-          } else {
-            this.$message.error(response.data[0].msg)
-          }
-        })
-      })
-    },
-    // 查询
-    searchTable() {
-      var param = []
-      var Data = this.CreateData('11', '生产计划导入_确认导入前临时表_查询', param, this.pageSize, this.pageList)
-      this.ExecDatabase(Data).then(response => {
-        console.log(response.data)
-        this.tableData = response.data.rows
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    // 表格颜色变化
-    tableRowClassName({ row, rowIndex }) {
-      // console.log(row, rowIndex)
-      if (rowIndex % 2 === 0) {
-        return 'black'
-      } else {
-        return 'red'
-      }
-    },
-    async basicPartsToSQL() {
-      try {
-        this.loading = true
-        this.err = 0
-        for (let j = this.worksheet.length - 1; j >= 0; j--) {
-          let sort,
-            orderNumber,
-            productModel,
-            numberPlan,
-            startDate,
-            endDate
-          var param = []
-          param[0] = ['订单号', this.worksheet[j].B2.v]
-          console.log('订单号', this.worksheet[j].B2.v)
-          var Data = this.CreateData('11', 'MES_计划BOM_发动机订单计划_订单导入校验', param)
-          const response = await this.ExecDatabase(Data)
-          const res = response.data
-          if (res[0].Column1 !== 0) {
-            this.$notify.error(`${this.worksheet[j].C2.v}已经存在，请确认文件是否正确`)
-            this.loading = false
-            this.disabled = false
-            return
-          } else {
-            for (let i = 0; i < 999; i++) {
-              const attr = i + 2
-              sort = this.worksheet[j][`A${attr}`] ? this.worksheet[j][`A${attr}`].v : ''
-              orderNumber = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
-              productModel = this.worksheet[j][`C${attr}`] ? this.worksheet[j][`C${attr}`].v : ''
-              numberPlan = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
-              startDate = this.worksheet[j][`E${attr}`] ? this.worksheet[j][`E${attr}`].v : ''
-              endDate = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
-              console.log(sort, orderNumber, productModel, numberPlan, startDate, endDate)
-              if (!sort && !orderNumber && !productModel && !numberPlan && !startDate && !endDate) {
-                break
-              } else if (!orderNumber) { // 名称不能为空
-                this.$notify.error(`订单号不能为空`)
-                break
-              } else if (Number(numberPlan) <= 0) { // 数量不能为0
-                this.$notify.error(`计划数量不能为空`)
-                break
-              } else {
-                if (orderNumber) {
-                  await sleep(50)
-                  await this.insertToSQL(sort, orderNumber, productModel, numberPlan, startDate, endDate)
-                } else {
-                  this.loading = false
-                  this.disabled = false
-                  this.$notify.error(`请确认导入文件是否正确`)
-                  return
-                }
-              }
-            }
-          }
-          this.itemFile.splice(j, 1)
-          this.worksheet.splice(j, 1)
-          this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`)
-        }
-        this.loading = false
-        this.searchOrder()
-      } catch (e) {
-        this.err++
-        this.loading = false
-        this.$notify.error(`导入数据错误,请检查导入文件是否正确`)
-        console.log(`导入数据错误${e}`)
-      }
-    },
-    async insertToSQL(sort, orderNumber, productModel, numberPlan, startDate, endDate) {
-      console.log(startDate, endDate, 'startDate, endDate')
-      try {
-        var param = []
-        param[0] = ['排序', sort]
-        param[1] = ['订单号', orderNumber]
-        param[2] = ['产品型号', productModel]
-        param[3] = ['计划数量', numberPlan]
-        param[4] = ['计划开始时间', startDate]
-        param[5] = ['计划完成时间', endDate]
-        param[6] = ['导入类型', '1', 'int', '1']
-        var Data = this.CreateData('12', 'MES_计划BOM_发动机订单计划_订单导入', param)
-        const response = await this.ExecDatabase(Data)
-        const res = response.data
-        if (Object.prototype.hasOwnProperty.call(res, 'output') === false) {
-          if (res[0].result === '0') {
-            this.$notify.error(`${orderNumber}导入失败`)
-          }
-        } else {
-          if (res.result[0].result === '0') {
-            this.$notify.error(`${numberPlan}导入失败`)
-          }
-          if (res.output[0].导入类型 === '2') {
-            this.$notify.warning(`${numberPlan}存在重复数据`)
-          }
-        }
-      } catch (e) {
-        this.err++
-        this.$message.error(`导入数据错误`)
-        console.log(`导入数据错误${e}`)
-      }
-    },
-    exportExcel() {
-      if (this.tableData.length !== 0) {
-        this.startPlanTime ? this.startPlanTime_check = 1 : this.startPlanTime_check = 0
-        this.endPlanTime ? this.endPlanTime_check = 1 : this.endPlanTime_check = 0
-        this.orderNumberValue ? this.OrderNumber_check = 1 : this.OrderNumber_check = 0
-        this.engineTypeValue ? this.engineType_check = 1 : this.engineType_check = 0
-        if (this.startPlanTime === null) {
-          this.startPlanTime = ''
-        }
-        if (this.endPlanTime === null) {
-          this.endPlanTime = ''
-        }
-        var param = []
-        param[0] = ['计划开始时间_check', this.startPlanTime_check]
-        param[1] = ['计划开始时间', this.startPlanTime]
-        param[2] = ['计划完成时间_check', this.endPlanTime_check]
-        param[3] = ['计划完成时间', this.endPlanTime]
-        param[4] = ['订单号_check', this.OrderNumber_check]
-        param[5] = ['订单号', this.orderNumberValue]
-        param[6] = ['产品型号_check', this.engineType_check]
-        param[7] = ['产品型号', this.engineTypeValue]
-        var Data = this.CreateData('2001', 'MES_计划BOM_发动机订单计划_订单导出', param)
-        this.exportExcel_NPOI(Data)
-      } else {
-        this.$message.warning('暂无数据')
-      }
-    },
-    // 分页
-    handleSizeChange(val) {
-      this.pageCurrent = 1
-      this.pageSize = val
-      this.expands = []
-      this.searchOrder()
-    },
-    handleCurrentChange(val) {
-      this.pageCurrent = val
-      this.expands = []
-      this.searchOrder()
-    }
-  }
-}
-</script>
-
-<style scoped>
-.topCard {
-  margin: 5px;
-}
-
-.topDiv {
-  margin-bottom: 10px;
-}
-
-.el-select {
-  width: 200px
-}
-
-.el-input {
-  width: 200px
-}
-
-.text {
-  font-size: 14px;
-}
-
-.item {
-  padding: 18px 0;
-}
-
-.box-card {
-  position: absolute;
-  right: 6px;
-  top: 80px;
-  width: 300px;
-}
-
-.el-table .warning-row {
-  background: oldlace;
-}
-
-.el-table .success-row {
-  background: #f0f9eb;
-}
-</style>
-
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index e9b6290..a97eabe 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -3,7 +3,6 @@
     <el-menu class="navbar" mode="horizontal" style="background: #1576e8!important;">
       <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
       <breadcrumb />
-      <span style="display: inline-block;position: absolute;right: 100px;font-size: 16px;color: #fff">550KV GIS隔离开关信息管理系统</span>
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
           <img :src="require('@/assets/img/leftPic.png')" class="user-avatar">
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index b34ac65..1d4725c 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -2,7 +2,7 @@
   <div>
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <div v-show="isShow" class="img-wrapper">
-        <img :src="require('@/assets/img/LOGO.png')" width="165px" height="49px">
+        <img :src="require('@/assets/img/LOGO1.png')" height="49px">
         <!--        <span style="font-size: 18px; font-weight: bold; color: white;margin-top: 7px">迈思信息<br>-->
         <!--          <span style="font-size: 13px; color: white;margin-top: 0px!important;">MESWORK</span>-->
         <!--        </span>-->
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1303a87..7bb06e0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,338 +1,394 @@
 <template>
-  <div class="scanner-container">
-    <div class="scanner-header">
-      <h1>平板摄像头扫码器</h1>
-      <p>将二维码对准扫描框即可自动识别</p>
-    </div>
-    <div class="scanner-content">
-      <div class="video-container">
-        <video id="video" autoplay playsinline></video>
-        <div class="scan-area">
-          <div class="scan-line"></div>
+  <div>
+    <div class="login-container">
+      <!--      <i class="login-img"/>-->
+      <el-form
+        ref="loginForm"
+        :model="loginForm"
+        :rules="loginRules"
+        auto-complete="on"
+        label-position="left"
+        label-width="0px"
+        class="card-box login-form">
+        <h1 class="title">
+          <img :src="require('@/assets/img/LOGO.png')" alt="" style="height: 50px;align-items: center;">
+          <div style="margin-left: 65px">
+            <!-- <div>550KV GIS隔离开关</div> -->
+            <div>智能装配线信息管理系统</div>
+          </div>
+        </h1>
+        <div class="line"/>
+        <div class="content">
+          <el-form-item prop="username">
+            <span class="svg-container svg-container_login">
+              <svg-icon icon-class="username" />
+            </span>
+            <el-input v-model="loginForm.username" name="username" type="text" auto-complete="off" placeholder="请输入用户名" @input.native="changeUser" />
+          </el-form-item>
+          <el-form-item prop="password">
+            <span class="svg-container">
+              <svg-icon icon-class="password"/>
+            </span>
+            <el-input
+              :type="pwdType"
+              v-model="loginForm.password"
+              name="password"
+              auto-complete="on"
+              placeholder="请输入密码"
+              @keyup.enter.native="handleLogin"/>
+            <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" /></span>
+          </el-form-item>
+          <div style="display: flex;align-items: center;">
+            <el-checkbox v-model="loginForm.checked" class="remeberPassword">记住密码</el-checkbox>
+            <el-button type="text" style="margin-left: 190px;color: #1576e8" @click="handleEdit('form')">修改密码</el-button>
+          </div>
+          <el-button :loading="loading" class="signIn" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
+            <span style="font-size: 20px!important;">登录</span>
+          </el-button>
         </div>
-      </div>
-
-      <div class="status" :class="statusClass" v-if="statusMessage">
-        {{ statusMessage }}
-      </div>
-
-      <div class="controls">
-        <button class="btn-primary" @click="startScanning" :disabled="isScanning">
-          <svg class="icon" viewBox="0 0 24 24" fill="white">
-            <path d="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z" />
-          </svg>
-          开始扫描
-        </button>
-        <button class="btn-secondary" @click="stopScanning">
-          <svg class="icon" viewBox="0 0 24 24" fill="currentColor">
-            <path d="M12,2C17.52,2 22,6.48 22,12C22,17.52 17.52,22 12,22C6.48,22 2,17.52 2,12C2,6.48 6.48,2 12,2M12,4C7.58,4 4,7.58 4,12C4,16.42 7.58,20 12,20C16.42,20 20,16.42 20,12C20,7.58 16.42,4 12,4M12,10.5C11.17,10.5 10.5,11.17 10.5,12C10.5,12.83 11.17,13.5 12,13.5C12.83,13.5 13.5,12.83 13.5,12C13.5,11.17 12.83,10.5 12,10.5Z" />
-          </svg>
-          停止扫描
-        </button>
-      </div>
-
-      <div class="result-container" v-if="scanResult">
-        <div class="result-title">扫描结果：</div>
-        <div class="result-content">{{ scanResult }}</div>
-      </div>
-
-      <div class="performance-info" v-if="showPerformanceWarning">
-        <strong>性能提示：</strong> 已启用性能优化模式，降低扫描频率以避免浏览器警告。
-      </div>
-
-      <div class="instructions">
-        <h3>使用说明sad：</h3>
-        <ul>
-          <li>点击"开始扫描"按钮启用摄像头</li>
-          <li>将二维码置于扫描框内，系统会自动识别</li>
-          <li>确保环境光线充足，二维码清晰可见</li>
-          <li>扫描完成后可点击"停止扫描"关闭摄像头</li>
-        </ul>
-      </div>
+      </el-form>
     </div>
+
+    <el-dialog :visible.sync="dialogFormVisible" title="修改密码" center style="min-height: 200px" width="400px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
+        <el-form-item label="考勤编号" prop="Account" style="display: inline-block">
+          <el-input v-model="form.Account" size="small" style="width:200px"/>
+        </el-form-item>
+        <el-form-item label="原始密码" prop="beforPassword" style="display: inline-block">
+          <el-input v-model="form.beforPassword" size="small" style="width:200px"/>
+        </el-form-item>
+        <el-form-item label="新密码" prop="newPassword" style="display: inline-block">
+          <el-input v-model="form.newPassword" size="small" style="width:200px"/>
+        </el-form-item>
+        <el-form-item label="确认密码" prop="againPassword" style="display: inline-block">
+          <el-input v-model="form.againPassword" size="small" style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="callOff()">取消</el-button>
+        <el-button type="primary" size="small" @click="EditPassword('form')">确定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 <script>
+import { cloudEditPassword, editPassword } from '@/api/login'
+import Cookie from 'js-cookie'
 
 export default {
   name: 'Login',
   data() {
+    const validateValue = (rules, value, callback) => {
+      if (this.form.newPassword !== this.form.againPassword) {
+        callback(new Error('两次输入密码不同'))
+      } else {
+        callback()
+      }
+    }
+    const validateUsername = (rule, value, callback) => {
+      // if (!isvalidUsername(value)) {
+      //   callback(new Error('请输入4-5位工号'))
+      // } else {
+      //   callback()
+      // }
+      callback()
+    }
+    // const validatePass = (rule, value, callback) => {
+    //   if (value.length < 5) {
+    //     callback(new Error('密码不能小于5位'))
+    //   } else {
+    //     callback()
+    //   }
+    // }
     return {
-      video: null,
-      canvas: null,
-      context: null,
-      isScanning: false,
-      scanResult: '',
-      statusMessage: '',
-      statusClass: 'info',
-      stream: null,
-      scanInterval: null,
-      lastScanTime: 0,
-      scanDelay: 300, // 扫描间隔(毫秒)
-      showPerformanceWarning: false
+      rules: {
+        againPassword: [
+          { required: true, message: '请输入确认密码', trigger: 'blur' },
+          { required: true, trigger: 'blur', validator: validateValue }],
+        Account: [{ required: true, trigger: 'blur', validator: validateUsername }],
+        beforPassword: [{ required: true, message: '请输入原始密码', trigger: 'blur' }],
+        newPassword: [{ required: true, message: '请输入新密码', trigger: 'blur' }]
+      },
+      list: [],
+      form: {
+        againPassword: '',
+        Account: '',
+        beforPassword: '',
+        newPassword: ''
+      },
+      dialogFormVisible: false,
+      loginForm: {
+        username: '',
+        password: '',
+        checked: false
+      },
+      loginRules: {
+        username: [{ required: true, trigger: 'blur', validator: validateUsername }]
+        // password: [{ required: true, trigger: 'blur', validator: validatePass }]
+      },
+      loading: false,
+      pwdType: 'password'
     }
   },
+  // 页面加载调用获取cookie值
   mounted() {
-    this.video = document.getElementById('video');
-    this.canvas = document.createElement('canvas');
-    this.context = this.canvas.getContext('2d');
-    this.statusMessage = '点击"开始扫描"按钮启用摄像头';
-
-    // 检测设备性能并调整扫描频率
-    this.adjustPerformance();
+    this.getCookie()
   },
-
-  beforeDestroy() {
-    this.stopScanning()
-  },
-
   methods: {
-    async startScanning() {
-      this.statusMessage = '正在请求摄像头权限...'
-      this.statusClass = 'info'
-
-      try {
-        // 请求摄像头访问权限
-        this.stream = await navigator.mediaDevices.getUserMedia({
-          video: {
-            facingMode: 'environment', // 优先使用后置摄像头
-            width: { ideal: 1280 },
-            height: { ideal: 720 }
-          }
-        })
-
-        this.video.srcObject = this.stream
-        this.isScanning = true
-        this.statusMessage = '摄像头已启用，请将二维码对准扫描框'
-        this.statusClass = 'info'
-        this.scanResult = ''
-
-        // 使用setInterval替代requestAnimationFrame，控制扫描频率
-        this.scanInterval = setInterval(() => {
-          this.scanQRCode()
-        }, this.scanDelay)
-      } catch (error) {
-        console.error('无法访问摄像头:', error)
-        this.statusMessage = '无法访问摄像头: ' + error.message
-        this.statusClass = 'error'
+    showPwd() {
+      if (this.pwdType === 'password') {
+        this.pwdType = ''
+      } else {
+        this.pwdType = 'password'
       }
     },
-
-    stopScanning() {
-      this.isScanning = false
-      if (this.scanInterval) {
-        clearInterval(this.scanInterval)
-        this.scanInterval = null
-      }
-      if (this.stream) {
-        this.stream.getTracks().forEach(track => track.stop())
-        this.stream = null
-      }
-      this.statusMessage = '扫描已停止'
-      this.statusClass = 'info'
+    changeUser() {
+      this.loginForm.password = ''
     },
-
-    scanQRCode() {
-      if (!this.isScanning || !this.video.readyState === this.video.HAVE_ENOUGH_DATA) return
-
-      // 设置canvas尺寸与视频一致
-      this.canvas.width = this.video.videoWidth
-      this.canvas.height = this.video.videoHeight
-
-      // 绘制当前视频帧到canvas
-      this.context.drawImage(this.video, 0, 0, this.canvas.width, this.canvas.height)
-
-      // 获取图像数据
-      const imageData = this.context.getImageData(0, 0, this.canvas.width, this.canvas.height)
-
-      // 使用jsQR库识别二维码
-      try {
-        const code = jsQR(imageData.data, imageData.width, imageData.height, {
-          inversionAttempts: 'dontInvert'
-        })
-
-        if (code) {
-          this.scanResult = code.data
-          this.statusMessage = '二维码识别成功！'
-          this.statusClass = 'success'
-
-          // 识别成功后可以继续扫描或停止扫描
-          // this.stopScanning();
+    handleLogin() {
+      this.$refs.loginForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+          this.$store.dispatch('Login', this.loginForm).then(() => {
+            this.loading = false
+            this.$router.push({ path: '/' })
+          }).catch(() => {
+            this.loading = false
+          })
+        } else {
+          console.log('error submit!!')
+          return false
         }
-      } catch (error) {
-        console.warn('二维码识别出错:', error)
-      }
+        if (this.loginForm.checked === true) { // 传入账号名，密码，和保存天数3个参数
+          this.setCookie(this.loginForm.username, this.loginForm.password, this.loginForm.checked)
+        } else {
+          this.clearCookie()
+        }
+      })
     },
-
-    adjustPerformance() {
-      // 根据设备性能调整扫描频率
-      const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)
-      if (isMobile) {
-        this.scanDelay = 500 // 移动设备上降低扫描频率
-        this.showPerformanceWarning = true
-      }
+    // 设置cookie
+    setCookie(username, password, checked) {
+      Cookie.set('username', username, { expires: 7 })
+      Cookie.set('password', password, { expires: 7 })
+      Cookie.set('checked', checked, { expires: 7 })
+    },
+    // 读取 cookie
+    getCookie() {
+      this.loginForm.username = Cookie.get('username')
+      this.loginForm.password = Cookie.get('password')
+      this.loginForm.checked = Boolean(Cookie.get('checked'))
+    },
+    // 清除cookie
+    clearCookie() {
+      Cookie.remove('username')
+      Cookie.remove('password')
+      Cookie.remove('checked')
+    },
+    handleEdit() {
+      this.addForm('form', [this.dialogFormVisible = true])
+    },
+    callOff() {
+      this.dialogFormVisible = false
+    },
+    EditPassword(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          editPassword(this.form.Account, this.form.beforPassword, this.form.newPassword, 5).then(response => {
+            if (response.data.result[0].result === '1') {
+              if (response.data.output[0].返回 === '1') {
+                cloudEditPassword(this.form.Account, this.form.newPassword).then(response => {
+                  console.log(response, 333)
+                  if (response.data[0].result === '1') {
+                    this.$message.success('修改成功')
+                    this.dialogFormVisible = false
+                  } else {
+                    this.$message.error('编辑失败')
+                  }
+                })
+              } else {
+                this.$message.error('用户名或密码不正确')
+              }
+            } else {
+              this.$message.error('编辑失败')
+            }
+          })
+        }
+      })
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.scanner-container {
-  width: 100%;
-  max-width: 800px;
-  background-color: rgba(255, 255, 255, 0.95);
-  border-radius: 20px;
-  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.2);
-  overflow: hidden;
-}
-.scanner-header {
-  background: linear-gradient(to right, #4a00e0, #8e2de2);
-  color: white;
-  padding: 20px;
-  text-align: center;
-}
-.scanner-header h1 {
-  font-size: 1.8rem;
-  margin-bottom: 10px;
-}
-.scanner-header p {
-  opacity: 0.9;
-}
-.scanner-content {
-  padding: 30px;
-}
-.video-container {
-  position: relative;
-  width: 100%;
-  margin-bottom: 20px;
-  border-radius: 10px;
-  overflow: hidden;
-  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.1);
-}
-#video {
-  width: 100%;
-  height: auto;
-  display: block;
-  background-color: #000;
-}
-.scan-area {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 70%;
-  height: 200px;
-  border: 2px solid #4a00e0;
-  border-radius: 10px;
-  box-shadow: 0 0 0 1000px rgba(0, 0, 0, 0.3);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.scan-line {
-  width: 100%;
-  height: 2px;
-  background: #4a00e0;
-  position: absolute;
-  animation: scan 2s linear infinite;
-}
-@keyframes scan {
-  0% { top: 0; }
-  50% { top: calc(100% - 2px); }
-  100% { top: 0; }
-}
-.controls {
-  display: flex;
-  justify-content: center;
-  gap: 15px;
-  margin-bottom: 25px;
-}
-button {
-  padding: 12px 25px;
-  border: none;
-  border-radius: 50px;
-  font-size: 1rem;
-  font-weight: 600;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-.btn-primary {
-  background: linear-gradient(to right, #4a00e0, #8e2de2);
-  color: white;
-}
-.btn-primary:hover {
-  transform: translateY(-3px);
-  box-shadow: 0 5px 15px rgba(142, 45, 226, 0.4);
-}
-.btn-secondary {
-  background: #f0f0f0;
-  color: #333;
-}
-.btn-secondary:hover {
-  background: #e0e0e0;
-}
-.result-container {
-  background-color: #f8f9fa;
-  border-radius: 10px;
-  padding: 20px;
-  margin-top: 20px;
-  border-left: 4px solid #4a00e0;
-}
-.result-title {
-  font-weight: 600;
-  margin-bottom: 10px;
-  color: #4a00e0;
-}
-.result-content {
-  word-break: break-all;
-  background: white;
-  padding: 15px;
-  border-radius: 8px;
-  border: 1px solid #e0e0e0;
-}
-.status {
-  text-align: center;
-  padding: 10px;
-  border-radius: 8px;
-  margin-bottom: 15px;
-}
-.status.success {
-  background-color: #d4edda;
-  color: #155724;
-  border: 1px solid #c3e6cb;
-}
-.status.error {
-  background-color: #f8d7da;
-  color: #721c24;
-  border: 1px solid #f5c6cb;
-}
-.status.info {
-  background-color: #d1ecf1;
-  color: #0c5460;
-  border: 1px solid #bee5eb;
-}
-.instructions {
-  background-color: #e8f4fd;
-  border-radius: 10px;
-  padding: 15px;
-  margin-top: 20px;
-  font-size: 0.9rem;
-}
-.instructions h3 {
-  color: #4a00e0;
-  margin-bottom: 10px;
-}
-.instructions ul {
-  padding-left: 20px;
-}
-.instructions li {
-  margin-bottom: 8px;
-}
-.icon {
-  width: 20px;
-  height: 20px;
-}
+  $bg:#2d3a4b;
+  $dark_gray:#889aa4;
+  $light_gray:#eee;
+
+  .login-container {
+    position: fixed;
+    height: 100%;
+    width:100%;
+    background-color: #ebebeb;
+    background-image:url("../../../static/login.png");background-repeat:no-repeat; background-size:100% 100%;-moz-background-size:100% 100%;
+    input:-webkit-autofill {
+      -webkit-box-shadow: 0 0 0 1000px #293444 inset !important;
+      -webkit-text-fill-color: #fff !important;
+    }
+    /*.login-img{*/
+    /*  position: absolute;*/
+    /*  width: 100%;*/
+    /*  height: 100%;*/
+    /*  background: url("../../../static/login.png") no-repeat;*/
+    /*}*/
+    input {
+      background: transparent;
+      border: 1px;
+      -webkit-appearance: none;
+      border-radius: 0;
+      padding: 12px 5px 12px 15px;
+      color: $light_gray;
+      height: 47px;
+    }
+    .el-input {
+      display: inline-block;
+      height: 47px;
+      width: 85%;
+    }
+    .svg-container {
+      padding: 6px 5px 6px 15px;
+      color: #1576e8;
+      font-size: 20px!important;
+      vertical-align: middle;
+      width: 30px;
+      display: inline-block;
+      &_login {
+        font-size: 20px;
+      }
+    }
+    .title {
+      font-size: 22px;
+      line-height: 30px;
+      color: #1576e8;
+      margin: 0 auto 20px auto;
+      text-align: center;
+      font-weight: bold;
+      font-family: 微软雅黑Regular＆Bold;
+      display: flex;
+    }
+    .content{
+      width: 330px;
+      margin: 30px auto 0 auto;
+    }
+    .line{
+      width: 100%;
+      margin: 0 auto 25px auto;
+      background-color: #1576e8;
+      height: 1px;
+    }
+    .login-form {
+      height: 500px;
+      border-radius: 20px;
+      background-color: white;
+      position: absolute;
+      left: 0;
+      right: 0;
+      width: 400px;
+      padding: 35px 15px 15px 15px;
+      margin: 120px auto;
+    }
+    .tips {
+      font-size: 14px;
+      color: #fff;
+      margin-bottom: 10px;
+      span {
+        &:first-of-type {
+          margin-right: 16px;
+        }
+      }
+    }
+    .el-input__inner{
+      border: none!important;
+      font-size: 18px!important;
+      color: #29335b!important;
+    }
+    .el-form-item {
+      border: 1px solid #1576e8;
+      background: #ffffff;
+      border-radius: 5px;
+      color: #454545;
+    }
+    /*登录button*/
+    .signIn{
+      width: 100%;
+      border: none;
+      margin-top: 20px;
+      border-radius: 5px;
+      font-size: 18px;
+      color:white;
+      background: -webkit-linear-gradient(left, #1576e8 , #9fd2ab); /* Safari 5.1 - 6.0 */
+      background: -o-linear-gradient(right, #1576e8, #9fd2ab); /* Opera 11.1 - 12.0 */
+      background: -moz-linear-gradient(right, #1576e8, #9fd2ab); /* Firefox 3.6 - 15 */
+      background: linear-gradient(to right, #1576e8 , #9fd2ab); /* 标准的语法（必须放在最后） */
+    }
+    .remeberPassword{
+      color: #1576e8;
+    }
+    .show-pwd {
+      position: absolute;
+      right: 10px;
+      top: 7px;
+      font-size: 16px;
+      color: #1576e8;
+      cursor: pointer;
+      user-select:none;
+    }
+    @media (min-width: 1024px) {
+      /*根据屏幕大小确定显示的位置*/
+      .login-form{
+        position: absolute;
+        left: 40%;
+        top: 0;
+        width: 600px;
+      }
+      .title{
+        font-size: 32px!important;
+        line-height: 32px;
+      }
+      .el-form-item{
+        width: 400px;
+        height: 48px;
+      }
+      .content{
+        width: 400px;
+      }
+    }
+    @media (min-width: 1281px) {
+      .login-form{
+        position: absolute;
+        left: 30%;
+        top: 6%;
+        width: 600px;
+      }
+    }
+  }
+</style>
+<style>
+  .remeberPassword .el-checkbox__inner:hover{
+    border: 1px solid #1576e8;
+  }
+  .remeberPassword .el-checkbox__input.is-checked .el-checkbox__inner{
+    background-color: #1576e8;
+    border-color: #1576e8;
+  }
+  .remeberPassword .el-checkbox__input.is-checked+.el-checkbox__label{
+    color: #1576e8;
+  }
+  .remeberPassword .el-checkbox__input.is-focus .el-checkbox__inner{
+    border-color: #1576e8;
+  }
+  .login-container input:-webkit-autofill{
+    -webkit-box-shadow:0 0 0 1000px #fff inset !important;
+    -webkit-text-fill-color: #29335b !important;
+  }
 </style>
diff --git a/src/views/login/indexbak.vue b/src/views/login/indexbak.vue
deleted file mode 100644
index 08bb14f..0000000
--- a/src/views/login/indexbak.vue
+++ /dev/null
@@ -1,394 +0,0 @@
-<template>
-  <div>
-    <div class="login-container">
-      <!--      <i class="login-img"/>-->
-      <el-form
-        ref="loginForm"
-        :model="loginForm"
-        :rules="loginRules"
-        auto-complete="on"
-        label-position="left"
-        label-width="0px"
-        class="card-box login-form">
-        <h1 class="title">
-          <img :src="require('@/assets/img/LOGO.png')" alt="" style="height: 50px;align-items: center;">
-          <div style="margin-left: 30px">
-            <div>550KV GIS隔离开关</div>
-            <div>信息管理系统</div>
-          </div>
-        </h1>
-        <div class="line"/>
-        <div class="content">
-          <el-form-item prop="username">
-            <span class="svg-container svg-container_login">
-              <svg-icon icon-class="username" />
-            </span>
-            <el-input v-model="loginForm.username" name="username" type="text" auto-complete="off" placeholder="请输入用户名" @input.native="changeUser" />
-          </el-form-item>
-          <el-form-item prop="password">
-            <span class="svg-container">
-              <svg-icon icon-class="password"/>
-            </span>
-            <el-input
-              :type="pwdType"
-              v-model="loginForm.password"
-              name="password"
-              auto-complete="on"
-              placeholder="请输入密码"
-              @keyup.enter.native="handleLogin"/>
-            <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" /></span>
-          </el-form-item>
-          <div style="display: flex;align-items: center;">
-            <el-checkbox v-model="loginForm.checked" class="remeberPassword">记住密码</el-checkbox>
-            <el-button type="text" style="margin-left: 190px;color: #1576e8" @click="handleEdit('form')">修改密码</el-button>
-          </div>
-          <el-button :loading="loading" class="signIn" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
-            <span style="font-size: 20px!important;">登录</span>
-          </el-button>
-        </div>
-      </el-form>
-    </div>
-
-    <el-dialog :visible.sync="dialogFormVisible" title="修改密码" center style="min-height: 200px" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
-        <el-form-item label="考勤编号" prop="Account" style="display: inline-block">
-          <el-input v-model="form.Account" size="small" style="width:200px"/>
-        </el-form-item>
-        <el-form-item label="原始密码" prop="beforPassword" style="display: inline-block">
-          <el-input v-model="form.beforPassword" size="small" style="width:200px"/>
-        </el-form-item>
-        <el-form-item label="新密码" prop="newPassword" style="display: inline-block">
-          <el-input v-model="form.newPassword" size="small" style="width:200px"/>
-        </el-form-item>
-        <el-form-item label="确认密码" prop="againPassword" style="display: inline-block">
-          <el-input v-model="form.againPassword" size="small" style="width:200px"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="callOff()">取消</el-button>
-        <el-button type="primary" size="small" @click="EditPassword('form')">确定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-<script>
-import { cloudEditPassword, editPassword } from '@/api/login'
-import Cookie from 'js-cookie'
-
-export default {
-  name: 'Login',
-  data() {
-    const validateValue = (rules, value, callback) => {
-      if (this.form.newPassword !== this.form.againPassword) {
-        callback(new Error('两次输入密码不同'))
-      } else {
-        callback()
-      }
-    }
-    const validateUsername = (rule, value, callback) => {
-      // if (!isvalidUsername(value)) {
-      //   callback(new Error('请输入4-5位工号'))
-      // } else {
-      //   callback()
-      // }
-      callback()
-    }
-    // const validatePass = (rule, value, callback) => {
-    //   if (value.length < 5) {
-    //     callback(new Error('密码不能小于5位'))
-    //   } else {
-    //     callback()
-    //   }
-    // }
-    return {
-      rules: {
-        againPassword: [
-          { required: true, message: '请输入确认密码', trigger: 'blur' },
-          { required: true, trigger: 'blur', validator: validateValue }],
-        Account: [{ required: true, trigger: 'blur', validator: validateUsername }],
-        beforPassword: [{ required: true, message: '请输入原始密码', trigger: 'blur' }],
-        newPassword: [{ required: true, message: '请输入新密码', trigger: 'blur' }]
-      },
-      list: [],
-      form: {
-        againPassword: '',
-        Account: '',
-        beforPassword: '',
-        newPassword: ''
-      },
-      dialogFormVisible: false,
-      loginForm: {
-        username: '',
-        password: '',
-        checked: false
-      },
-      loginRules: {
-        username: [{ required: true, trigger: 'blur', validator: validateUsername }]
-        // password: [{ required: true, trigger: 'blur', validator: validatePass }]
-      },
-      loading: false,
-      pwdType: 'password'
-    }
-  },
-  // 页面加载调用获取cookie值
-  mounted() {
-    this.getCookie()
-  },
-  methods: {
-    showPwd() {
-      if (this.pwdType === 'password') {
-        this.pwdType = ''
-      } else {
-        this.pwdType = 'password'
-      }
-    },
-    changeUser() {
-      this.loginForm.password = ''
-    },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          this.$store.dispatch('Login', this.loginForm).then(() => {
-            this.loading = false
-            this.$router.push({ path: '/' })
-          }).catch(() => {
-            this.loading = false
-          })
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-        if (this.loginForm.checked === true) { // 传入账号名，密码，和保存天数3个参数
-          this.setCookie(this.loginForm.username, this.loginForm.password, this.loginForm.checked)
-        } else {
-          this.clearCookie()
-        }
-      })
-    },
-    // 设置cookie
-    setCookie(username, password, checked) {
-      Cookie.set('username', username, { expires: 7 })
-      Cookie.set('password', password, { expires: 7 })
-      Cookie.set('checked', checked, { expires: 7 })
-    },
-    // 读取 cookie
-    getCookie() {
-      this.loginForm.username = Cookie.get('username')
-      this.loginForm.password = Cookie.get('password')
-      this.loginForm.checked = Boolean(Cookie.get('checked'))
-    },
-    // 清除cookie
-    clearCookie() {
-      Cookie.remove('username')
-      Cookie.remove('password')
-      Cookie.remove('checked')
-    },
-    handleEdit() {
-      this.addForm('form', [this.dialogFormVisible = true])
-    },
-    callOff() {
-      this.dialogFormVisible = false
-    },
-    EditPassword(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          editPassword(this.form.Account, this.form.beforPassword, this.form.newPassword, 5).then(response => {
-            if (response.data.result[0].result === '1') {
-              if (response.data.output[0].返回 === '1') {
-                cloudEditPassword(this.form.Account, this.form.newPassword).then(response => {
-                  console.log(response, 333)
-                  if (response.data[0].result === '1') {
-                    this.$message.success('修改成功')
-                    this.dialogFormVisible = false
-                  } else {
-                    this.$message.error('编辑失败')
-                  }
-                })
-              } else {
-                this.$message.error('用户名或密码不正确')
-              }
-            } else {
-              this.$message.error('编辑失败')
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  $bg:#2d3a4b;
-  $dark_gray:#889aa4;
-  $light_gray:#eee;
-
-  .login-container {
-    position: fixed;
-    height: 100%;
-    width:100%;
-    background-color: #ebebeb;
-    background-image:url("../../../static/login.png");background-repeat:no-repeat; background-size:100% 100%;-moz-background-size:100% 100%;
-    input:-webkit-autofill {
-      -webkit-box-shadow: 0 0 0 1000px #293444 inset !important;
-      -webkit-text-fill-color: #fff !important;
-    }
-    /*.login-img{*/
-    /*  position: absolute;*/
-    /*  width: 100%;*/
-    /*  height: 100%;*/
-    /*  background: url("../../../static/login.png") no-repeat;*/
-    /*}*/
-    input {
-      background: transparent;
-      border: 1px;
-      -webkit-appearance: none;
-      border-radius: 0;
-      padding: 12px 5px 12px 15px;
-      color: $light_gray;
-      height: 47px;
-    }
-    .el-input {
-      display: inline-block;
-      height: 47px;
-      width: 85%;
-    }
-    .svg-container {
-      padding: 6px 5px 6px 15px;
-      color: #1576e8;
-      font-size: 20px!important;
-      vertical-align: middle;
-      width: 30px;
-      display: inline-block;
-      &_login {
-        font-size: 20px;
-      }
-    }
-    .title {
-      font-size: 22px;
-      line-height: 30px;
-      color: #1576e8;
-      margin: 0 auto 20px auto;
-      text-align: center;
-      font-weight: bold;
-      font-family: 微软雅黑Regular＆Bold;
-      display: flex;
-    }
-    .content{
-      width: 330px;
-      margin: 30px auto 0 auto;
-    }
-    .line{
-      width: 100%;
-      margin: 0 auto 25px auto;
-      background-color: #1576e8;
-      height: 1px;
-    }
-    .login-form {
-      height: 500px;
-      border-radius: 20px;
-      background-color: white;
-      position: absolute;
-      left: 0;
-      right: 0;
-      width: 400px;
-      padding: 35px 15px 15px 15px;
-      margin: 120px auto;
-    }
-    .tips {
-      font-size: 14px;
-      color: #fff;
-      margin-bottom: 10px;
-      span {
-        &:first-of-type {
-          margin-right: 16px;
-        }
-      }
-    }
-    .el-input__inner{
-      border: none!important;
-      font-size: 18px!important;
-      color: #29335b!important;
-    }
-    .el-form-item {
-      border: 1px solid #1576e8;
-      background: #ffffff;
-      border-radius: 5px;
-      color: #454545;
-    }
-    /*登录button*/
-    .signIn{
-      width: 100%;
-      border: none;
-      margin-top: 20px;
-      border-radius: 5px;
-      font-size: 18px;
-      color:white;
-      background: -webkit-linear-gradient(left, #1576e8 , #9fd2ab); /* Safari 5.1 - 6.0 */
-      background: -o-linear-gradient(right, #1576e8, #9fd2ab); /* Opera 11.1 - 12.0 */
-      background: -moz-linear-gradient(right, #1576e8, #9fd2ab); /* Firefox 3.6 - 15 */
-      background: linear-gradient(to right, #1576e8 , #9fd2ab); /* 标准的语法（必须放在最后） */
-    }
-    .remeberPassword{
-      color: #1576e8;
-    }
-    .show-pwd {
-      position: absolute;
-      right: 10px;
-      top: 7px;
-      font-size: 16px;
-      color: #1576e8;
-      cursor: pointer;
-      user-select:none;
-    }
-    @media (min-width: 1024px) {
-      /*根据屏幕大小确定显示的位置*/
-      .login-form{
-        position: absolute;
-        left: 40%;
-        top: 0;
-        width: 600px;
-      }
-      .title{
-        font-size: 32px!important;
-        line-height: 32px;
-      }
-      .el-form-item{
-        width: 400px;
-        height: 48px;
-      }
-      .content{
-        width: 400px;
-      }
-    }
-    @media (min-width: 1281px) {
-      .login-form{
-        position: absolute;
-        left: 30%;
-        top: 6%;
-        width: 600px;
-      }
-    }
-  }
-</style>
-<style>
-  .remeberPassword .el-checkbox__inner:hover{
-    border: 1px solid #1576e8;
-  }
-  .remeberPassword .el-checkbox__input.is-checked .el-checkbox__inner{
-    background-color: #1576e8;
-    border-color: #1576e8;
-  }
-  .remeberPassword .el-checkbox__input.is-checked+.el-checkbox__label{
-    color: #1576e8;
-  }
-  .remeberPassword .el-checkbox__input.is-focus .el-checkbox__inner{
-    border-color: #1576e8;
-  }
-  .login-container input:-webkit-autofill{
-    -webkit-box-shadow:0 0 0 1000px #fff inset !important;
-    -webkit-text-fill-color: #29335b !important;
-  }
-</style>
diff --git a/static/config.js b/static/config.js
index 437a451..64ffcad 100644
--- a/static/config.js
+++ b/static/config.js
@@ -5,7 +5,7 @@ window.g = {
   mqttIP: '192.168.0.80',
   mqttPortNumber: '8083',
   printTemplate: 'BQFT_BarCode_001',
-  baseURL: 'http://127.0.0.1:10040',
+  baseURL: 'http://127.0.0.1:10026',
   requestConfig_baseURL: 'http://127.0.0.1:9981/mes'
   // requestConfig_baseURL: 'http://10.89.33.67:6867/mes'
 }