From b7ab73d87c6687d6b5f6100dcf115b461a002d76 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Mon, 31 Jul 2023 17:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97(=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E3=80=81=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91)=E3=80=81=E6=B9=BF=E6=96=99=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86(=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2)=E3=80=81=E5=A2=9E=E5=8A=A0=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/order/index.vue | 1262 ++++++++++++++++----------------
 src/views/plan/plan/index.vue  | 1048 +++++++++++++-------------
 2 files changed, 1166 insertions(+), 1144 deletions(-)

diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index c2fd29d5..9be291bd 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -43,12 +43,24 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label-width="100px" label="计划生产日期" prop="planProDate">
-        <el-date-picker clearable
-                        v-model="queryParams.planProDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择计划生产日期">
+      <!--      <el-form-item label-width="100px" label="计划生产日期" prop="planProDate">-->
+      <!--        <el-date-picker clearable-->
+      <!--                        v-model="queryParams.planProDate"-->
+      <!--                        type="date"-->
+      <!--                        value-format="yyyy-MM-dd"-->
+      <!--                        placeholder="选择计划生产日期"-->
+      <!--        >-->
+      <!--        </el-date-picker>-->
+      <!--      </el-form-item>-->
+      <el-form-item label-width="100px" label="计划生产日期" prop="productDateArray">
+        <el-date-picker
+          v-model="queryParams.planDateArray"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </el-form-item>
 
@@ -67,7 +79,8 @@
           size="mini"
           @click="dialogVisible = true"
           v-hasPermi="['order:order:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -115,18 +128,18 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 
-      <el-table-column width="150" label="订单号" align="center" prop="orderCode" />
-      <el-table-column width="180" label="物料号" align="center" prop="prodCode" />
-      <el-table-column width="200" label="物料名称" align="center" prop="prodDesc" />
+      <el-table-column width="150" label="订单号" align="center" prop="orderCode"/>
+      <el-table-column width="180" label="物料号" align="center" prop="prodCode"/>
+      <el-table-column width="200" label="物料名称" align="center" prop="prodDesc"/>
       <el-table-column width="90" label="订单数量" align="center" prop="quantity"/>
       <el-table-column width="70" label="单位" align="center" prop="unit"/>
-      <el-table-column label="任务清单" align="center" prop="workerOrder" />
-      <el-table-column width="120" label="计划生产日期" align="center" prop="planProDate" >
+      <el-table-column label="任务清单" align="center" prop="workerOrder"/>
+      <el-table-column width="120" label="计划生产日期" align="center" prop="planProDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planProDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="计划完成日期" align="center" prop="planComplete" >
+      <el-table-column width="120" label="计划完成日期" align="center" prop="planComplete">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planComplete, '{y}-{m}-{d}') }}</span>
         </template>
@@ -143,7 +156,7 @@
           <dict-tag :options="dict.type.product_type" :value="scope.row.prodType"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width " fixed="right" >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width " fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -166,7 +179,7 @@
           <!-- 第一列 -->
           <el-col :offset="1" :span="8">
             <el-form-item label-width="100px" label="物料号" prop="prodCode">
-              <el-input type="number" v-model="form.prodCode" placeholder="请输入物料号" />
+              <el-input type="number" v-model="form.prodCode" placeholder="请输入物料号"/>
             </el-form-item>
           </el-col>
           <!-- 第二列 -->
@@ -176,7 +189,8 @@
                               v-model="form.planProDate"
                               type="date"
                               value-format="yyyy-MM-dd"
-                              placeholder="选择计划生产日期">
+                              placeholder="选择计划生产日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -186,7 +200,7 @@
           <!-- 第一列 -->
           <el-col :offset="1" :span="8">
             <el-form-item label-width="100px" label="物料名称" prop="prodDesc">
-              <el-input v-model="form.prodDesc" placeholder="请输入物料名称" />
+              <el-input v-model="form.prodDesc" placeholder="请输入物料名称"/>
             </el-form-item>
           </el-col>
           <!-- 第二列 -->
@@ -196,7 +210,8 @@
                               v-model="form.planComplete"
                               type="date"
                               value-format="yyyy-MM-dd"
-                              placeholder="选择计划完成日期">
+                              placeholder="选择计划完成日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -205,14 +220,14 @@
         <el-row>
           <!-- 第一列 -->
           <el-col :offset="1" :span="8">
-            <el-form-item  label-width="100px" label="订单数量" prop="quantity">
-              <el-input type="number" v-model="form.quantity" placeholder="请输入订单数量" />
+            <el-form-item label-width="100px" label="订单数量" prop="quantity">
+              <el-input type="number" v-model="form.quantity" placeholder="请输入订单数量"/>
             </el-form-item>
           </el-col>
           <!-- 第二列 -->
           <el-col :offset="2" :span="9">
             <el-form-item label-width="100px" label="单位" prop="unit">
-              <el-input v-model="form.unit" placeholder="请输入单位" />
+              <el-input v-model="form.unit" placeholder="请输入单位"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -277,7 +292,8 @@
           <!-- 工单日期 -->
           <el-col :offset="1" :span="5">
             <el-form-item size="small" label="工单日期: ">
-              <el-date-picker @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"></el-date-picker>
+              <el-date-picker @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -288,7 +304,8 @@
             <el-form-item size="small" label="选择班次:" class="my-select my-first">
               <el-select v-model="splitForm.shiftId" placeholder="请选择班次">
                 <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
-                           :value="item.shiftId"></el-option>
+                           :value="item.shiftId"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -297,7 +314,8 @@
             <el-form-item size="small" label="选择工艺:" class="my-select my-first">
               <el-select v-model="splitForm.routeCode" placeholder="请选择工艺">
                 <el-option v-for="item in routes" :key="item.routeCode" :label="item.routeName"
-                           :value="item.routeCode"></el-option>
+                           :value="item.routeCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -335,7 +353,7 @@
         style="width: 100%"
         max-height="240"
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-        >
+      >
         <el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
         <el-table-column width="200" align="center" prop="workorderCode" label="工单号"></el-table-column>
         <el-table-column width="100" align="center" prop="productDate" label="工单日期"></el-table-column>
@@ -357,366 +375,517 @@
 </template>
 
 <script>
-  import {
-    getWorkOrderList,
-    getOrderList,
-    subSplitOrder,
-    getprodLineShift,
-    listOrder,
-    getOrder,
-    delOrder,
-    addOrder,
-    updateOrder,
-    syncSAP
-  } from "@/api/plan/order";
-  import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-  export default {
-    name: "Order",
-    dicts: ['product_type', 'order_status'],
-    components: {
-      Treeselect
-    },
-    data() {
-      return {
-        // 工艺list
-        routes: [],
-        // 表单参数
-        form: {},
-        // 新增模块
-        dialogVisible: false,
-        //以下为新内容
-        productList:[],
-        //工单遮罩层
-        workerLoading: false,
-        //工单重新渲染表格
-        refreshWorkerTable: true,
-        //订单遮罩层
-        proLoading: true,
-        //订单重新渲染表格
-        refreshProTable: true,
-        //二级换算值
-        secConvert: null,
-        //三级换算值
-        thiConvert: null,
-        //拆分头pro
-        productData: [],
-        //拆分下部分
-        splitData: [],
-        //选择产线list表
-        proline: [],
-        //
-        splitnum: null,
-        // 班次
-        workShift: [],
-        // 批次
-        formFields: [{
-          batchCode: '',
-          batchQuantity: ''
-        }],
-        // 遮罩层
-        loading: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 订单表格数据
-        orderList: [],
-        // 订单树选项
-        orderOptions: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        splitOpen: false,
-        // 是否展开，默认全部展开
-        isExpandAll: true,
-        // 重新渲染表格状态
-        refreshTable: true,
-        // 查询参数
-        queryParams: {
-          planFactoryCode: null,
-          orderType: null,
-          orderCode: null,
-          prodCode: null,
-          prodDesc: null,
-          quantity: null,
-          unit: null,
-          workerOrder: null,
-          planProDate: null,
-          planComplete: null,
-          atrr1: null,
-          atrr2: null,
-          atrr3: null,
-          status: null,
-          parentOrder: null,
-          prodType: null
-        },
-        // 拆分表单参数
-        splitForm: {
-          id: null,
-          prodLineCode: null,
-          splitNum: null,
-          productDate: null,
-          shiftId: null,
-          routeCode: null,
-          formFields: [],
-        },
-        // 表单校验
-        rules: {},
-        addrules: {}
-      };
-    },
-    created() {
-
-      var now = new Date();
-      // 转换日期格式
-      const year = now.getFullYear(); // 获取年份
-      const month = String(now.getMonth() + 1).padStart(2, '0'); // 获取月份
-      const day = String(now.getDate()).padStart(2, '0'); // 获取日期
-      const date = `${year}-${month}-${day}`;
-
-      this.loading = true;
-      this.queryParams.status = 'o0';
-      this.queryParams.planProDate = date;
-      listOrder(this.queryParams).then(response => {
-        this.orderList = this.handleTree(response.data, "orderCode", "parentOrder");
-        this.loading = false;
-      });
-    },
-    methods: {
-      // 判空、空串
-      checkNull(entity) {
-        if (entity !== undefined && entity !== '' && entity !== null){
-          return 1;
-        }
-        return 0;
+import {
+  getWorkOrderList,
+  getOrderList,
+  subSplitOrder,
+  getprodLineShift,
+  listOrder,
+  getOrder,
+  delOrder,
+  addOrder,
+  updateOrder,
+  syncSAP
+} from '@/api/plan/order'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import moment from 'moment'
+
+export default {
+  name: 'Order',
+  dicts: ['product_type', 'order_status'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 工艺list
+      routes: [],
+      // 表单参数
+      form: {},
+      // 新增模块
+      dialogVisible: false,
+      //以下为新内容
+      productList: [],
+      //工单遮罩层
+      workerLoading: false,
+      //工单重新渲染表格
+      refreshWorkerTable: true,
+      //订单遮罩层
+      proLoading: true,
+      //订单重新渲染表格
+      refreshProTable: true,
+      //拆分头pro
+      productData: [],
+      //拆分下部分
+      splitData: [],
+      //选择产线list表
+      proline: [],
+      //
+      splitnum: null,
+      // 班次
+      workShift: [],
+      // 批次
+      formFields: [{
+        batchCode: '',
+        batchQuantity: ''
+      }],
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 订单表格数据
+      orderList: [],
+      // 订单树选项
+      orderOptions: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      splitOpen: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        planDateArray: [],
+        planFactoryCode: null,
+        orderType: null,
+        orderCode: null,
+        prodCode: null,
+        prodDesc: null,
+        quantity: null,
+        unit: null,
+        workerOrder: null,
+        planProDate: null,
+        planComplete: null,
+        atrr1: null,
+        atrr2: null,
+        atrr3: null,
+        status: null,
+        parentOrder: null,
+        prodType: null
       },
-      handleClose(done) {
-        this.$confirm('确认关闭？')
-          .then(_ => {
-            this.reset();
-            done();
-          })
-          .catch(_ => {});
+      // 拆分表单参数
+      splitForm: {
+        id: null,
+        prodLineCode: null,
+        splitNum: null,
+        productDate: null,
+        shiftId: null,
+        routeCode: null,
+        formFields: []
       },
-      /** 提交按钮 */
-      submitForm() {
-        // 表单校验
-        if (this.checkNull(this.form.prodCode) == 0 || this.checkNull(this.form.planProDate) == 0 || this.checkNull(this.form.prodDesc) == 0 || this.checkNull(this.form.planComplete) == 0 || this.checkNull(this.form.quantity) == 0 || this.checkNull(this.form.unit) == 0 || this.checkNull(this.form.prodType) == 0){
+      // 表单校验
+      rules: {},
+      addrules: {}
+    }
+  },
+  created() {
+    // 初始化
+    this.loading = true
+    this.queryParams.status = 'o0'
+    this.queryParams.planDateArray = [new Date(), new Date()]
+    this.queryParams.planDateStart = moment(this.queryParams.planDateArray[0]).format('YYYY-MM-DD')
+    this.queryParams.planDateEnd = moment(this.queryParams.planDateArray[1]).format('YYYY-MM-DD')
+    listOrder(this.queryParams).then(response => {
+      this.orderList = this.handleTree(response.data, 'orderCode', 'parentOrder')
+      this.loading = false
+    })
+  },
+  methods: {
+    /** 拆分按钮操作 */
+    splitBtn(row) {
+      //数据初始化
+      function setAtrr1(row) {
+        row.atrr1 = 0
+        if (row.children !== undefined) {
+          for (let i = 0; i < row.children.length; i++) {
+            setAtrr1(row.children[i])
+          }
+        }
+      }
+
+      setAtrr1(row)
+
+      // 在获取到新的数据后执行以下代码
+      this.proLoading = true // 设置加载状态为true，表示正在加载
+      // 发送请求或执行异步操作获取最新的数据
+      //重置表单
+      this.resetBatch()
+      //将数据放入到productData中
+      this.productData.push(row)
+      //存放id
+      this.splitForm.id = row.id
+      this.refreshProTable = false // 先将refreshProTable设置为false，隐藏表格
+      this.$nextTick(() => {
+        // 使用$nextTick来等待DOM更新完成
+        this.refreshProTable = true // 立即将refreshProTable设置为true，显示表格
+        this.proLoading = false // 设置加载状态为false，表示加载完成
+      })
+      //初始化日期为默认今天
+      this.splitForm.productDate = new Date()
+      //获取成型机和班次
+      getprodLineShift(row.orderType).then(response => {
+        this.proline = response.data.lines
+        this.workShift = response.data.shifts
+        this.routes = response.data.routes
+      })
+
+      this.workerLoading = true // 设置加载状态为true，表示正在加载
+      // 获取工单
+      getWorkOrderList(row.id).then(response => {
+        var data = response.data
+        this.splitData = data
+
+        this.refreshWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
+        this.$nextTick(() => {
+          // 使用$nextTick来等待DOM更新完成
+          this.refreshWorkerTable = true // 立即将refreshProTable设置为true，显示表格
+          this.workerLoading = false // 设置加载状态为false，表示加载完成
+        })
+      })
+
+      this.splitOpen = true
+      this.title = '拆分'
+    },
+    /** 拆分数量方法 */
+    splitNumChange(e) {
+      //不能为负数
+      if (e <= 0) {
+        e = 1
+        this.splitForm.splitNum = 1
+      } else {
+        // 获取最大值，拆分数量不得超过最大值
+        let max = Number(this.productData[0].quantity) - Number(this.productData[0].quantitySplit)
+        // 超过最大值，给用户提醒
+        if (e > max) {
           this.$message({
-            message:'数据不能为空！',
-            type:'warning'
+            message: '最大值不能超过' + max + '!',
+            type: 'warning'
           })
-          return;
+          this.splitForm.splitNum = max
         }
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateOrder(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.dialogVisible = false;
-                this.reset();
-                this.getList();
-              });
-            } else {
-              addOrder(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.dialogVisible = false;
-                this.reset();
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 检验批次编码是否重复 */
-      batchCodeChange(e){
-        if (this.formFields.length>1){
-          for (let i = 0; i < this.formFields.length-1; i++){
-            if (this.formFields[this.formFields.length-1].batchCode == this.formFields[i].batchCode){
-              this.$message({
-                message:'批次号不能重复！',
-                type:'warning'
-              })
-              this.formFields = [{
-                batchCode: '',
-                batchQuantity: ''
-              }]
-              return;
+        //前端数据同步
+        // 在获取到新的数据后执行以下代码
+        this.proLoading = true // 设置加载状态为true，表示正在加载
+
+        // 递归操作动态显示拆分数量
+        function setAtrr1(data, splitNum) {
+          if (data.children !== undefined) {
+            for (let i = 0; i < data.children.length; i++) {
+              data.children[i].atrr1 = splitNum * (data.children[i].quantity / data.quantity)
+              setAtrr1(data.children[i], splitNum)
             }
           }
         }
-      },
-      /** 校验日期 */
-      checkDate(e) {
-        var now = new Date();
-        if (e < now){
-          e = now;
-          this.splitForm.productDate = now;
-        }
-      },
-      /** 拆分提交按钮 */
-      batchBtn() {
-        // 判断数据不能为空
-        if (this.splitForm.splitNum == null || this.splitForm.shiftId == null || this.splitForm.prodLineCode == null || this.splitForm.routeCode == null){
-          this.$message({
-            message:'数据不能为空！',
-            type:'warning'
-          })
-          return;
-        }
-        if (this.splitForm.routeCode == null){
-          this.$message({
-            message:'数据不能为空！',
-            type:'warning'
-          })
-          return;
+
+        this.productData[0].atrr1 = this.splitForm.splitNum
+        setAtrr1(this.productData[0], this.splitForm.splitNum)
+
+        this.refreshProTable = false // 先将refreshProTable设置为false，隐藏表格
+        this.$nextTick(() => {
+          // 使用$nextTick来等待DOM更新完成
+          this.refreshProTable = true // 立即将refreshProTable设置为true，显示表格
+          this.proLoading = false // 设置加载状态为false，表示加载完成
+        })
+      }
+      this.product = this.productData[0]
+    },
+    // 判空、空串
+    checkNull(entity) {
+      if (entity !== undefined && entity !== '' && entity !== null) {
+        return 1
+      }
+      return 0
+    },
+    /** 确认关闭 */
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.reset()
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      // 表单校验
+      if (this.checkNull(this.form.prodCode) == 0 || this.checkNull(this.form.planProDate) == 0 || this.checkNull(this.form.prodDesc) == 0 || this.checkNull(this.form.planComplete) == 0 || this.checkNull(this.form.quantity) == 0 || this.checkNull(this.form.unit) == 0 || this.checkNull(this.form.prodType) == 0) {
+        this.$message({
+          message: '数据不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOrder(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.dialogVisible = false
+              this.reset()
+              this.getList()
+            })
+          } else {
+            addOrder(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.dialogVisible = false
+              this.reset()
+              this.getList()
+            })
+          }
         }
-        // 判断如果拆分数量不等于拆分批次数量之和
-        let sum = 0;
-        for (let i = 0; i< this.formFields.length ;i++){
-          sum = Number(sum) + Number(this.formFields[i].batchQuantity);
-          if (this.formFields[i].batchQuantity == '' || this.formFields[i].batchQuantity ==null || this.formFields[i].batchCode ==null || this.formFields[i].batchCode ==''){
+      })
+    },
+    /** 检验批次编码是否重复 */
+    batchCodeChange(e) {
+      if (this.formFields.length > 1) {
+        for (let i = 0; i < this.formFields.length - 1; i++) {
+          if (this.formFields[this.formFields.length - 1].batchCode == this.formFields[i].batchCode) {
             this.$message({
-              message:'批次数据不能为空',
+              message: '批次号不能重复！',
               type: 'warning'
             })
-            return;
+            this.formFields = [{
+              batchCode: '',
+              batchQuantity: ''
+            }]
+            return
           }
         }
-        if (sum != this.productData[0].atrr1){
+      }
+    },
+    /** 校验日期 */
+    checkDate(e) {
+      var now = new Date()
+      if (e < now) {
+        e = now
+        this.splitForm.productDate = now
+      }
+    },
+    /** 拆分提交按钮 */
+    batchBtn() {
+      // 判断数据不能为空
+      if (this.splitForm.splitNum == null || this.splitForm.shiftId == null || this.splitForm.prodLineCode == null || this.splitForm.routeCode == null) {
+        this.$message({
+          message: '数据不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.splitForm.routeCode == null) {
+        this.$message({
+          message: '数据不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      // 判断如果拆分数量不等于拆分批次数量之和
+      let sum = 0
+      for (let i = 0; i < this.formFields.length; i++) {
+        sum = Number(sum) + Number(this.formFields[i].batchQuantity)
+        if (this.formFields[i].batchQuantity == '' || this.formFields[i].batchQuantity == null || this.formFields[i].batchCode == null || this.formFields[i].batchCode == '') {
           this.$message({
-            message: '批次数量之和不等于拆分数量',
+            message: '批次数据不能为空',
             type: 'warning'
           })
-          return;
+          return
         }
+      }
+      if (sum != this.productData[0].atrr1) {
+        this.$message({
+          message: '批次数量之和不等于拆分数量',
+          type: 'warning'
+        })
+        return
+      }
+
+      //整理订单传入到后端
+      this.splitForm.formFields = this.formFields
+      //整理数据往后端发送
+      //下面是请求处理
+      const data = {
+        formFields: this.formFields,
+        prodLineCode: this.splitForm.prodLineCode,
+        productDate: this.splitForm.productDate,
+        shiftId: this.splitForm.shiftId,
+        splitNum: this.splitForm.splitNum,
+        product: this.productData[0],
+        routeCode: this.splitForm.routeCode
+      }
 
-        //整理订单传入到后端
-        this.splitForm.formFields = this.formFields;
-        //整理数据往后端发送
-        //下面是请求处理
-        const data = {
-          formFields : this.formFields,
-          prodLineCode : this.splitForm.prodLineCode,
-          productDate : this.splitForm.productDate,
-          shiftId : this.splitForm.shiftId,
-          splitNum : this.splitForm.splitNum,
-          product : this.productData[0],
-          routeCode : this.splitForm.routeCode
+      let check = 1
+      subSplitOrder(data).then(response => {
+        if (response.code == 500) {
+          check = 0
+          this.$modal.msgError(response.msg)
+          return
         }
+        this.$modal.msgSuccess('提交成功')
+      })
 
-        let check = 1;
-        subSplitOrder(data).then(response => {
-          if(response.code == 500){
-            check = 0;
-            this.$modal.msgError(response.msg);
-            return;
-          }
-          this.$modal.msgSuccess("提交成功");
-        });
-
-        let id = this.productData[0].id;
-        // 清除缓存
-        this.splitForm = {
-          id: null,
-          prodLineCode: null,
-          splitNum: null,
-          productDate: null,
-          shiftId: null,
-          formFields: [],
+      let id = this.productData[0].id
+      // 清除缓存
+      this.splitForm = {
+        id: null,
+        prodLineCode: null,
+        splitNum: null,
+        productDate: null,
+        shiftId: null,
+        formFields: []
+      }
+      this.formFields = [{
+        batchCode: '',
+        batchQuantity: ''
+      }]
+
+      // 获取该订单下的最新工单列表
+      getWorkOrderList(id).then(response => {
+        if (response.code == 500) {
+          this.$modal.msgError(response.msg)
         }
-        this.formFields = [{
-          batchCode: '',
-          batchQuantity: ''
-        }],
-
-        // 获取该订单下的最新工单列表
-        getWorkOrderList(id).then(response => {
-          if(response.code == 500){
-            this.$modal.msgError(response.msg);
-          };
-          // 设置最新数据
-          this.splitData = response.data;
-          // 在获取到新的数据后执行以下代码
-          this.workerLoading = true; // 设置加载状态为true，表示正在加载
-          this.refreshWorkerTable = false; // 先将refreshProTable设置为false，隐藏表格
-          this.$nextTick(() => {
-            // 使用$nextTick来等待DOM更新完成
-            this.refreshWorkerTable = true; // 立即将refreshProTable设置为true，显示表格
-            this.workerLoading = false; // 设置加载状态为false，表示加载完成
-          });
+
+        // 设置最新数据
+        this.splitData = response.data
+        // 在获取到新的数据后执行以下代码
+        this.workerLoading = true // 设置加载状态为true，表示正在加载
+        this.refreshWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
+        this.$nextTick(() => {
+          // 使用$nextTick来等待DOM更新完成
+          this.refreshWorkerTable = true // 立即将refreshProTable设置为true，显示表格
+          this.workerLoading = false // 设置加载状态为false，表示加载完成
         })
+      })
 
-        if (check){
-          setTimeout(() => {
-            this.getList();
-            // 等待1秒后执行的代码
-            this.splitOpen = false;
-          }, 500);
-        }
-      },
-      /** 动态添加表单 */
-      addField() {
-        //如果批次数量大于等于拆分数量则不允许拆分
-        let sum = 0;
-        for (let i = 0; i < this.formFields.length; i++) {
-          sum += Number(this.formFields[i].batchQuantity);
-        }
-        ;
-        if (sum >= this.productData[0].atrr1) {
-          this.$message({
-            message: '无法添加！您的批次数量已满！',
-            type: 'warning'
-          })
-          return;
-        }
-        ;
-        this.formFields.push({batchCode: '', batchQuantity: ''});
-        //自动填充
-        this.formFields[this.formFields.length - 1].batchQuantity = Number(this.productData[0].atrr1) - Number(sum);
-      },
-      /** 动态删除表单 */
-      removeField(index) {
-        this.formFields.splice(index, 1);
-      },
-      /** 查询订单列表 */
-      getList() {
-        this.loading = true;
-        listOrder(this.queryParams).then(response => {
-          this.orderList = this.handleTree(response.data, "orderCode", "parentOrder");
-          this.loading = false;
-        });
-      },
-      /** 转换订单数据结构 */
-      normalizer(node) {
-        if (node.children && !node.children.length) {
-          delete node.children;
-        }
-        return {
-          id: node.orderCode,
-          label: node.orderCode,
-          children: node.children
-        };
-      },
-      /** 查询订单下拉树结构 */
-      getTreeselect() {
-        listOrder().then(response => {
-          this.orderOptions = [];
-          const data = {orderCode: 0, orderCode: '顶级节点', children: []};
-          data.children = this.handleTree(response.data, "orderCode", "parentOrder");
-          this.orderOptions.push(data);
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.dialogVisible = false;
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
+      if (check) {
+        setTimeout(() => {
+          this.getList()
+          // 等待1秒后执行的代码
+          this.splitOpen = false
+        }, 500)
+      }
+    },
+    /** 动态添加表单 */
+    addField() {
+      //如果批次数量大于等于拆分数量则不允许拆分
+      let sum = 0
+      for (let i = 0; i < this.formFields.length; i++) {
+        sum += Number(this.formFields[i].batchQuantity)
+      }
+
+      if (sum >= this.productData[0].atrr1) {
+        this.$message({
+          message: '无法添加！您的批次数量已满！',
+          type: 'warning'
+        })
+        return
+      }
+
+      this.formFields.push({ batchCode: '', batchQuantity: '' })
+      //自动填充
+      this.formFields[this.formFields.length - 1].batchQuantity = Number(this.productData[0].atrr1) - Number(sum)
+    },
+    /** 动态删除表单 */
+    removeField(index) {
+      this.formFields.splice(index, 1)
+    },
+    /** 查询订单列表 */
+    getList() {
+      console.log("这里是日期范围")
+      console.log(this.queryParams.planDateArray)
+      this.loading = true
+      if (this.queryParams.planDateArray != null) {
+        this.queryParams.planDateStart = moment(this.queryParams.planDateArray[0]).format('YYYY-MM-DD')
+        this.queryParams.planDateEnd = moment(this.queryParams.planDateArray[1]).format('YYYY-MM-DD')
+      }
+      listOrder(this.queryParams).then(response => {
+        this.orderList = this.handleTree(response.data, 'orderCode', 'parentOrder')
+        this.loading = false
+      })
+    },
+    /** 转换订单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children
+      }
+      return {
+        id: node.orderCode,
+        label: node.orderCode,
+        children: node.children
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.dialogVisible = false;
+      this.splitOpen = false;
+      this.reset();
+    },
+    /** 查询订单下拉树结构 */
+    getTreeselect() {
+      listOrder().then(response => {
+        this.orderOptions = []
+        const data = { orderCode: 0, orderCode: '顶级节点', children: [] }
+        data.children = this.handleTree(response.data, 'orderCode', 'parentOrder')
+        this.orderOptions.push(data)
+      })
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        planFactoryCode: null,
+        orderType: null,
+        orderCode: null,
+        prodCode: null,
+        prodDesc: null,
+        quantity: null,
+        unit: null,
+        workerOrder: null,
+        planProDate: null,
+        planComplete: null,
+        atrr1: null,
+        atrr2: null,
+        atrr3: null,
+        status: null,
+        parentOrder: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        prodType: null
+      }
+      this.resetForm('form')
+    },
+    /** 拆分表单重置 */
+    resetBatch() {
+      this.splitForm = {
+        id: null,
+        prodLineCode: null,
+        splitNum: null,
+        productDate: null,
+        shiftId: null,
+        formFields: []
+      }
+      this.splitData = []
+      this.productData = []
+      this.proline = []
+      this.splitnum = null
+      this.workShift = []
+      this.formFields = [{
+        batchCode: '',
+        batchQuantity: ''
+      }]
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+          planDateArray: [],
           planFactoryCode: null,
           orderType: null,
           orderCode: null,
@@ -732,290 +901,115 @@
           atrr3: null,
           status: null,
           parentOrder: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
           prodType: null
-        };
-        this.resetForm("form");
-      },
-      /** 拆分表单重置 */
-      resetBatch() {
-        this.splitForm = {
-          id: null,
-          prodLineCode: null,
-          splitNum: null,
-          productDate: null,
-          shiftId: null,
-          formFields: [],
-        }
-        this.splitData = [],
-        this.secConvert = null,
-        this.thiConvert = null,
-        this.productData = [],
-        this.proline = [],
-        this.splitnum = null,
-        this.workShift = [],
-        this.formFields = [{
-          batchCode: '',
-          batchQuantity: ''
-        }]
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      /** 拆分按钮操作 */
-      handleAdd(row) {
-        this.reset();
-        this.getTreeselect();
-        if (row != null && row.orderCode) {
-          this.splitForm.parentOrder = row.orderCode;
-        } else {
-          this.splitForm.parentOrder = 0;
-        }
-        this.splitOpen = true;
-        this.title = "拆分";
-      },
-      /** 展开/折叠操作 */
-      toggleExpandAll() {
-        this.refreshTable = false;
-        this.isExpandAll = !this.isExpandAll;
-        this.$nextTick(() => {
-          this.refreshTable = true;
-        });
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        this.getTreeselect();
-        if (row != null) {
-          this.splitForm.parentOrder = row.orderCode;
-        }
-        getOrder(row.id).then(response => {
-          this.splitForm = response.data;
-          this.splitOpen = true;
-          this.title = "修改订单";
-        });
-      },
-      /** 拆分按钮操作 */
-      splitBtn(row) {
-        //数据初始化
-        //一级
-        row.atrr1 = 0;
-        //二级
-        if (row.children !== undefined) {
-          for (let i = 0; i < row.children.length; i++) {
-            row.children[i].atrr1 = 0;
-            //三级
-            if (row.children[i].children !== undefined) {
-              for (let j = 0; j < row.children[i].children.length; j++) {
-                row.children[i].children[j].atrr1 = 0;
-              }
-            }
-          }
-        }
-        // 在获取到新的数据后执行以下代码
-        this.proLoading = true; // 设置加载状态为true，表示正在加载
-        // 发送请求或执行异步操作获取最新的数据
-        //重置表单
-        this.resetBatch();
-        //将数据放入到productData中
-        this.productData.push(row);
-        //存放id
-        this.splitForm.id = row.id;
-        this.refreshProTable = false; // 先将refreshProTable设置为false，隐藏表格
-        this.$nextTick(() => {
-          // 使用$nextTick来等待DOM更新完成
-          this.refreshProTable = true; // 立即将refreshProTable设置为true，显示表格
-          this.proLoading = false; // 设置加载状态为false，表示加载完成
-        });
-        //初始化日期为默认今天
-        this.splitForm.productDate = new Date();
-        //获取成型机和班次
-        getprodLineShift(row.orderType).then(response => {
-          this.proline = response.data.lines;
-          this.workShift = response.data.shifts;
-          this.routes = response.data.routes;
-        });
-        //获取换算值
-        if (row.children !== undefined){
-          this.secConvert = Number(row.children[0].quantity) / Number(row.quantity);
-          if (row.children[0].children !== undefined){
-            this.thiConvert = Number(row.children[0].children[0].quantity) / Number(row.quantity);
-          }
-        }
-        // getConvert().then(response => {
-        //   for (let i = 0; i < response.data.length; i++) {
-        //     if (response.data[i].dictSort == 2) {
-        //       this.secConvert = response.data[i];
-        //     } else if (response.data[i].dictSort == 3) {
-        //       this.thiConvert = response.data[i];
-        //     }
-        //   }
-        // })
-
-
-        // 获取工单
-        getWorkOrderList(row.id).then(response => {
-          var data = response.data;
-          // 循环遍历将批次编码进行换行
-          // for(let fir = 0;fir < data.length;fir++){
-          //   for(let i = 0;i < data[fir].batchCodeList.length;i++){
-          //     // 未完成
-          //     data[fir].batchCodeList[i]
-          //   }
-          // }
-          this.splitData = data;
+      }
+      this.handleQuery()
+    },
+    /** 拆分按钮操作 */
+    handleAdd(row) {
+      this.reset()
+      this.getTreeselect()
+      if (row != null && row.orderCode) {
+        this.splitForm.parentOrder = row.orderCode
+      } else {
+        this.splitForm.parentOrder = 0
+      }
+      this.splitOpen = true
+      this.title = '拆分'
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false
+      this.isExpandAll = !this.isExpandAll
+      this.$nextTick(() => {
+        this.refreshTable = true
+      })
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      this.getTreeselect()
+      if (row != null) {
+        this.splitForm.parentOrder = row.orderCode
+      }
+      getOrder(row.id).then(response => {
+        this.splitForm = response.data
+        this.splitOpen = true
+        this.title = '修改订单'
+      })
+    },
+    /** 填写批次数量 */
+    inBatch(e) {
+      //不能为负数
+      if (e <= 0) {
+        this.formFields[this.formFields.length - 1].batchQuantity = 1
+      }
+      //逻辑判断
+      let sum = 0
+      for (let i = 0; i < this.formFields.length; i++) {
+        sum += Number(this.formFields[i].batchQuantity)
+      }
+      //如果超过拆分数量，提示并清空当前输入
+      if (sum > this.productData[0].atrr1) {
+        this.$message({
+          message: '你的批次数量总和不能超过拆分数量!',
+          type: 'warning'
         })
-
-        this.splitOpen = true;
-        this.title = "拆分";
-      },
-      /** 拆分数量方法 */
-      splitNumChange(e) {
-        //打印换算值
-        //不能为负数
-        if (e <= 0) {
-          e = 1;
-          this.splitForm.splitNum = 1;
-        }
-        if (e != '' && e > 0) {
-          let max = Number(this.productData[0].quantity) - Number(this.productData[0].quantitySplit);
-          if (e > max) {
-            this.$message({
-              message: "最大值不能超过" + max + "!",
-              type: 'warning'
-            })
-            this.splitForm.splitNum = max;
-          }
-          //前端数据同步
-          // 在获取到新的数据后执行以下代码
-          this.proLoading = true; // 设置加载状态为true，表示正在加载
-          //一级
-          this.productData[0].atrr1 = this.splitForm.splitNum;
-          //二级
-          if (this.productData[0].children !== undefined) {
-            for (let i = 0; i < this.productData[0].children.length; i++) {
-              this.productData[0].children[i].atrr1 = Number(this.splitForm.splitNum) * Number(this.secConvert);
-              //三级
-              if (this.productData[0].children[i].children !== undefined) {
-                for (let j = 0; j < this.productData[0].children[i].children.length; j++) {
-                  this.productData[0].children[i].children[j].atrr1 = Number(this.splitForm.splitNum) * Number(this.secConvert) * Number(this.thiConvert);
-                }
-              }
-            }
-          }
-          this.refreshProTable = false; // 先将refreshProTable设置为false，隐藏表格
-          this.$nextTick(() => {
-            // 使用$nextTick来等待DOM更新完成
-            this.refreshProTable = true; // 立即将refreshProTable设置为true，显示表格
-            this.proLoading = false; // 设置加载状态为false，表示加载完成
-          });
-        } else {
-          //前端数据同步
-          // 在获取到新的数据后执行以下代码
-          this.proLoading = true; // 设置加载状态为true，表示正在加载
-          //一级
-          this.productData[0].atrr1 = 0;
-          //二级
-          if (this.productData[0].children !== undefined) {
-            for (let i = 0; i < this.productData[0].children.length; i++) {
-              this.productData[0].children[i].atrr1 = 0;
-              //三级
-              if (this.productData[0].children[i].children !== undefined) {
-                for (let j = 0; j < this.productData[0].children[i].children.length; j++) {
-                  this.productData[0].children[i].children[j].atrr1 = 0;
-                }
-              }
-            }
-          }
-          this.refreshProTable = false; // 先将refreshProTable设置为false，隐藏表格
-          this.$nextTick(() => {
-            // 使用$nextTick来等待DOM更新完成
-            this.refreshProTable = true; // 立即将refreshProTable设置为true，显示表格
-            this.proLoading = false; // 设置加载状态为false，表示加载完成
-          });
-        }
-        this.product = this.productData[0];
-      },
-      /** 填写批次数量 */
-      inBatch(e) {
-        //不能为负数
-        if (e <= 0) {
-          this.formFields[this.formFields.length - 1].batchQuantity = 1;
-        }
-        //逻辑判断
-        let sum = 0;
-        for (let i = 0; i < this.formFields.length; i++) {
-          sum += Number(this.formFields[i].batchQuantity);
-        }
-        //如果超过拆分数量，提示并清空当前输入
-        if (sum > this.productData[0].atrr1) {
-          this.$message({
-            message: '你的批次数量总和不能超过拆分数量!',
-            type: 'warning'
-          })
-          this.formFields[this.formFields.length - 1].batchQuantity = Number(this.productData[0].atrr1) - Number(Number(sum) - Number(e));
-        }
-        //如果拆分数量为空
-        if (this.productData[0].atrr1 == '' || this.productData[0].atrr1 == null) {
-          this.formFields[this.formFields.length - 1].batchQuantity = '';
-        }
-      },
-      /** SAP同步按钮操作 */
-      handleSyncSAP() {
-        this.$modal.confirm('是否确认SAP同步操作步骤？').then(function() {
-          return syncSAP(contentIds);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("同步成功");
-        }).catch(() => {});
-      },
+        this.formFields[this.formFields.length - 1].batchQuantity = Number(this.productData[0].atrr1) - Number(Number(sum) - Number(e))
+      }
+      //如果拆分数量为空
+      if (this.productData[0].atrr1 == '' || this.productData[0].atrr1 == null) {
+        this.formFields[this.formFields.length - 1].batchQuantity = ''
+      }
+    },
+    /** SAP同步按钮操作 */
+    handleSyncSAP() {
+      this.$modal.confirm('是否确认SAP同步操作步骤？').then(function() {
+        return syncSAP(contentIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('同步成功')
+      }).catch(() => {
+      })
     }
+  }
 
-  };
+}
 </script>
 <style>
-  .el-row {
-    margin: 0;
-    padding: 0;
-  }
+.el-row {
+  margin: 0;
+  padding: 0;
+}
 
-  .el-col {
-    border-radius: 4px;
-  }
+.el-col {
+  border-radius: 4px;
+}
 
-  .bg-purple-dark {
-    background: #99a9bf;
-  }
+.bg-purple-dark {
+  background: #99a9bf;
+}
 
-  .bg-purple {
-    background: #d3dce6;
-  }
+.bg-purple {
+  background: #d3dce6;
+}
 
-  .bg-purple-light {
-    background: #e5e9f2;
-  }
+.bg-purple-light {
+  background: #e5e9f2;
+}
 
-  .grid-content {
-    border-radius: 4px;
-    min-height: 36px;
-  }
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+}
 
-  .row-bg {
-    padding: 10px 0;
-    background-color: #f9fafc;
-  }
+.row-bg {
+  padding: 10px 0;
+  background-color: #f9fafc;
+}
 
-  .my-margin {
-    margin-top: 40px;
-    margin-bottom: 10px;
-  }
+.my-margin {
+  margin-top: 40px;
+  margin-bottom: 10px;
+}
 </style>
diff --git a/src/views/plan/plan/index.vue b/src/views/plan/plan/index.vue
index 27a6af8a..39135637 100644
--- a/src/views/plan/plan/index.vue
+++ b/src/views/plan/plan/index.vue
@@ -1,125 +1,131 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="计划日期" prop="planTime">
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="计划日期" prop="planTime">
         <el-date-picker
           v-model="timeList"
+          value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
-			</el-form-item>
-<!--      <el-form-item label="同步状态">-->
-<!--        <el-select v-model="queryParams.syncFlag" placeholder="请选择同步状态">-->
-<!--          <el-option label="已同步" value="1"></el-option>-->
-<!--          <el-option label="未同步" value="0"></el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
-
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['mes:plan:add']"
-				>新增</el-button>
-			</el-col>
-<!--			<el-col :span="1.5">-->
-<!--				<el-button-->
-<!--					type="success"-->
-<!--					plain-->
-<!--					icon="el-icon-edit"-->
-<!--					size="mini"-->
-<!--					:disabled="single"-->
-<!--					@click="handleUpdate"-->
-<!--					v-hasPermi="['mes:plan:edit']"-->
-<!--				>修改</el-button>-->
-<!--			</el-col>-->
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['mes:plan:remove']"
-				>删除</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['mes:plan:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
-
-		<el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-<!--			<el-table-column label="ID" align="center" prop="id" />-->
-			<el-table-column label="计划工厂编码" align="center" prop="factoryCode" />
-			<el-table-column label="计划日期" align="center" prop="planTime" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.planTime, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="已同步" align="center" prop="syncFlag" />
-			<el-table-column label="创建人" align="center" prop="createBy" />
-			<el-table-column label="创建时间" align="center" prop="createTime" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="更新人" align="center" prop="updateBy" />
-			<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['mes:plan:edit']"
-					>修改</el-button>
-<!--					<el-button-->
-<!--						size="mini"-->
-<!--						type="text"-->
-<!--						icon="el-icon-delete"-->
-<!--						@click="handleDelete(scope.row)"-->
-<!--						v-hasPermi="['mes:plan:remove']"-->
-<!--					>删除</el-button>-->
-				</template>
-			</el-table-column>
-		</el-table>
-
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
-
-		<!-- 新增湿料计划模块 -->
-		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      </el-form-item>
+      <el-form-item label="同步状态">
+        <el-select v-model="queryParams.syncFlag" placeholder="请选择同步状态">
+          <el-option label="已同步" value="1"></el-option>
+          <el-option label="未同步" value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mes:plan:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <!--			<el-col :span="1.5">-->
+      <!--				<el-button-->
+      <!--					type="success"-->
+      <!--					plain-->
+      <!--					icon="el-icon-edit"-->
+      <!--					size="mini"-->
+      <!--					:disabled="single"-->
+      <!--					@click="handleUpdate"-->
+      <!--					v-hasPermi="['mes:plan:edit']"-->
+      <!--				>修改</el-button>-->
+      <!--			</el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mes:plan:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['mes:plan:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <!--			<el-table-column label="ID" align="center" prop="id" />-->
+      <el-table-column label="计划工厂编码" align="center" prop="factoryCode"/>
+      <el-table-column label="计划日期" align="center" prop="planTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.planTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="已同步" align="center" prop="syncFlag"/>
+      <el-table-column label="创建人" align="center" prop="createBy"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:plan:edit']"
+          >修改
+          </el-button>
+          <!--					<el-button-->
+          <!--						size="mini"-->
+          <!--						type="text"-->
+          <!--						icon="el-icon-delete"-->
+          <!--						@click="handleDelete(scope.row)"-->
+          <!--						v-hasPermi="['mes:plan:remove']"-->
+          <!--					>删除</el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 新增湿料计划模块 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form :model="form" ref="dynamicForm" label-width="80px">
         <!-- 选择工单生产日期 -->
         <el-row>
@@ -129,7 +135,8 @@
                 @change="workOrderTimeChange"
                 v-model="workOrderTime"
                 type="date"
-                placeholder="工单日期">
+                placeholder="工单日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -144,12 +151,14 @@
             tooltip-effect="dark"
             style="width: 100%"
             max-height="240"
-            @selection-change="handleSelectionChange">
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
             <el-table-column width="140" align="center" prop="workorderCode" label="工单编码"></el-table-column>
             <el-table-column width="230" align="center" prop="productName" label="产品名称"></el-table-column>
-            <el-table-column width="150" align="center" prop="productDate" label="工单日期" show-overflow-tooltip></el-table-column>
+            <el-table-column width="150" align="center" prop="productDate" label="工单日期" show-overflow-tooltip
+            ></el-table-column>
             <el-table-column prop="shiftDesc" label="班次"></el-table-column>
             <el-table-column prop="" label="料罐"></el-table-column>
             <el-table-column prop="" label="物料"></el-table-column>
@@ -162,7 +171,8 @@
             <el-form-item size="small" label="选择料罐:">
               <el-select v-model="form.bucketId" placeholder="请选择料罐">
                 <el-option v-for="item in selectBucketList" :key="item.bucketId" :label="item.bucketName"
-                           :value="item.bucketId"></el-option>
+                           :value="item.bucketId"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -171,14 +181,16 @@
             <el-form-item size="small" label="选择物料:">
               <el-select v-model="form.productId" placeholder="请选择物料">
                 <el-option v-for="item in selectProductList" :key="item.productId" :label="item.productDesc"
-                           :value="item.productId"></el-option>
+                           :value="item.productId"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <!-- 选择日期 -->
           <el-col :span="8">
             <el-form-item size="small" label="计划日期: ">
-              <el-date-picker @change="checkDate" v-model="form.planTime" type="date" placeholder="选择日期"></el-date-picker>
+              <el-date-picker @change="checkDate" v-model="form.planTime" type="date" placeholder="选择日期"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -198,40 +210,42 @@
             tooltip-effect="dark"
             style="width: 100%"
             max-height="240"
-            @selection-change="handleSelectionChange">
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
             <el-table-column width="140" align="center" prop="workorderCode" label="工单编码"></el-table-column>
             <el-table-column width="230" align="center" prop="productName" label="产品名称"></el-table-column>
-            <el-table-column width="150" align="center" prop="productDate" label="工单日期" show-overflow-tooltip></el-table-column>
+            <el-table-column width="150" align="center" prop="productDate" label="工单日期" show-overflow-tooltip
+            ></el-table-column>
             <el-table-column prop="shiftDesc" label="班次"></el-table-column>
             <el-table-column prop="bucketName" label="料罐"></el-table-column>
             <el-table-column prop="materialName" label="物料"></el-table-column>
           </el-table>
         </el-row>
       </el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="addSubmitForm">提 交</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="addSubmitForm">提 交</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
 
     <!-- 修改计划模块 -->
     <el-dialog title="修改计划模块" :visible.sync="dialogVisible" width="1000px" append-to-body>
       <el-form :model="form" ref="dynamicForm" label-width="80px">
         <!-- 选择工单生产日期 -->
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item size="small" label="工单日期: ">-->
-<!--              <el-date-picker-->
-<!--                @change="workOrderTimeChange"-->
-<!--                v-model="workOrderTime"-->
-<!--                type="date"-->
-<!--                placeholder="工单日期">-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item size="small" label="工单日期: ">-->
+        <!--              <el-date-picker-->
+        <!--                @change="workOrderTimeChange"-->
+        <!--                v-model="workOrderTime"-->
+        <!--                type="date"-->
+        <!--                placeholder="工单日期">-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
         <!-- 湿料计划详情列表 -->
         <el-row>
           <el-table
@@ -242,12 +256,14 @@
             tooltip-effect="dark"
             style="width: 100%"
             max-height="240"
-            @selection-change="handleSelectionChange">
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
             <el-table-column width="140" align="center" prop="workorderCode" label="工单编码"></el-table-column>
             <el-table-column width="230" align="center" prop="productName" label="产品名称"></el-table-column>
-            <el-table-column width="150" align="center" prop="productDate" label="工单日期" show-overflow-tooltip></el-table-column>
+            <el-table-column width="150" align="center" prop="productDate" label="工单日期" show-overflow-tooltip
+            ></el-table-column>
             <el-table-column prop="shiftDesc" label="班次"></el-table-column>
             <el-table-column prop="bucketName" label="料罐"></el-table-column>
             <el-table-column prop="materialName" label="物料"></el-table-column>
@@ -260,7 +276,8 @@
             <el-form-item size="small" label="选择料罐:">
               <el-select v-model="form.bucketId" placeholder="请选择料罐">
                 <el-option v-for="item in selectBucketList" :key="item.bucketId" :label="item.bucketName"
-                           :value="item.bucketId"></el-option>
+                           :value="item.bucketId"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -269,14 +286,16 @@
             <el-form-item size="small" label="选择物料:">
               <el-select v-model="form.productId" placeholder="请选择物料">
                 <el-option v-for="item in selectProductList" :key="item.productId" :label="item.productDesc"
-                           :value="item.productId"></el-option>
+                           :value="item.productId"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <!-- 选择日期 -->
           <el-col :span="8">
             <el-form-item size="small" label="计划日期: ">
-              <el-date-picker readonly @change="checkDate" v-model="form.planTime" type="date" placeholder="选择日期"></el-date-picker>
+              <el-date-picker readonly @change="checkDate" v-model="form.planTime" type="date" placeholder="选择日期"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -296,12 +315,14 @@
             tooltip-effect="dark"
             style="width: 100%"
             max-height="240"
-            @selection-change="handleSelectionChange">
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
             <el-table-column width="140" align="center" prop="workorderCode" label="工单编码"></el-table-column>
             <el-table-column width="230" align="center" prop="productName" label="产品名称"></el-table-column>
-            <el-table-column width="150" align="center" prop="productDate" label="工单日期" show-overflow-tooltip></el-table-column>
+            <el-table-column width="150" align="center" prop="productDate" label="工单日期" show-overflow-tooltip
+            ></el-table-column>
             <el-table-column prop="shiftDesc" label="班次"></el-table-column>
             <el-table-column prop="bucketName" label="料罐"></el-table-column>
             <el-table-column prop="materialName" label="物料"></el-table-column>
@@ -314,569 +335,576 @@
       </div>
     </el-dialog>
 
-	</div>
+  </div>
 </template>
 
 <script>
-import { updatePlanDetail,getPlanDetailList,addWetPlan,getBMSList,getProductList,getBucketList,getWorkOrderList,listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/plan/plan";
+import {
+  updatePlanDetail,
+  getPlanDetailList,
+  addWetPlan,
+  getBMSList,
+  getProductList,
+  getBucketList,
+  getWorkOrderList,
+  listPlan,
+  getPlan,
+  delPlan,
+  addPlan,
+  updatePlan
+} from '@/api/plan/plan'
+import moment from 'moment'
 
 export default {
-	name: "Plan",
-	data() {
-		return {
-		  // 湿料计划详情list
+  name: 'Plan',
+  data() {
+    return {
+      // 湿料计划详情list
       wetMaterialPlanList: [],
-		  // 修改计划弹出框
+      // 修改计划弹出框
       dialogVisible: false,
-		  // 校验是否能提交
+      // 校验是否能提交
       checkSelect: true,
-		  // selectList
+      // selectList
       selectList: null,
-		  // 当前计划日期下的BMS
+      // 当前计划日期下的BMS
       bmsList: [],
-		  // 新增下方的工单表
+      // 新增下方的工单表
       newWorkOrderList: [],
-		  // 物料的选择list
+      // 物料的选择list
       selectProductList: null,
-		  // 料罐的选择list
+      // 料罐的选择list
       selectBucketList: null,
-		  // 上工单遮罩层
+      // 上工单遮罩层
       workLoading: false,
-		  // 上工单渲染
+      // 上工单渲染
       refreshWorkTable: true,
-		  // 工单新增工单list
+      // 工单新增工单list
       workOrderList: [],
-		  // 新增-查询-工单日期
+      // 新增-查询-工单日期
       workOrderTime: null,
-		  // 首日期查询
-      timeList: null,
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 湿料计划管理表格数据
-			planList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				planTime: null,
-				syncFlag: null,
+      // 首日期查询
+      timeList: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 湿料计划管理表格数据
+      planList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planTime: null,
+        syncFlag: null,
         startTime: null,
-        endTime: null,
-			},
-			// 表单参数
-			form: {
+        endTime: null
+      },
+      // 表单参数
+      form: {
         bucketId: null,
         productId: null,
-        planTime: null,
+        planTime: null
       },
-			// 表单校验
-			rules: {
-			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-	  /** 修改-确定按钮 */
-	  changeBatchBtn() {
+      // 表单校验
+      rules: {}
+    }
+  },
+  created() {
+    this.timeList = [new Date(),new Date()]
+    this.queryParams.startTime = moment(this.timeList[0]).format('YYYY-MM-DD')
+    this.queryParams.endTime = moment(this.timeList[1]).format('YYYY-MM-DD')
+    this.getList()
+  },
+  methods: {
+    /** 修改-确定按钮 */
+    changeBatchBtn() {
       // 数据判空
-      if (this.selectList == null || this.selectList === undefined){
+      if (this.selectList == null || this.selectList === undefined) {
         this.$message({
           message: '请选择工单！',
           type: 'warning'
         })
-        return;
+        return
       }
-      if (this.form.bucketId == null || this.form.productId == null){
+      if (this.form.bucketId == null || this.form.productId == null) {
         this.$message({
           message: '数据不能为空！',
           type: 'warning'
         })
-        return;
+        return
       }
       // 数据校验班次冲突问题
-      if (this.checkSelect === false){
+      if (this.checkSelect === false) {
         this.$message({
           message: '班次冲突请重新选择！',
           type: 'warning'
         })
-        return;
+        return
       }
 
       // 校验数据班次、物料、料罐
       var bms = {
         bucketId: this.form.bucketId,
         materialId: this.form.productId,
-        shiftId: this.selectList[0].shiftId,
-      };
-      if (this.bmsList != null || this.bmsList === undefined){
-        for (let i = 0;i<this.bmsList.length;i++){
-          if (bms.shiftId == this.bmsList[i].shiftId && bms.bucketId == this.bmsList[i].bucketId && bms.materialId != this.bmsList[i].materialId){
+        shiftId: this.selectList[0].shiftId
+      }
+      if (this.bmsList != null || this.bmsList === undefined) {
+        for (let i = 0; i < this.bmsList.length; i++) {
+          if (bms.shiftId == this.bmsList[i].shiftId && bms.bucketId == this.bmsList[i].bucketId && bms.materialId != this.bmsList[i].materialId) {
             this.$message({
-              message:'同班次同料罐下不能混料！',
-              type:'warning'
+              message: '同班次同料罐下不能混料！',
+              type: 'warning'
             })
-            return;
+            return
           }
         }
       }
-      this.bmsList.push(bms);
+      this.bmsList.push(bms)
       // 数据保存（仅前端）
       // 创建料罐对象
-      var bucket;
-      for (let i = 0;i < this.selectBucketList.length;i++){
-        if (this.form.bucketId == this.selectBucketList[i].bucketId){
-          bucket = this.selectBucketList[i];
+      var bucket
+      for (let i = 0; i < this.selectBucketList.length; i++) {
+        if (this.form.bucketId == this.selectBucketList[i].bucketId) {
+          bucket = this.selectBucketList[i]
         }
       }
       // 创建物料对象
-      var material;
-      for (let i = 0;i < this.selectProductList.length;i++){
-        if (this.form.productId == this.selectProductList[i].productId){
-          material = this.selectProductList[i];
+      var material
+      for (let i = 0; i < this.selectProductList.length; i++) {
+        if (this.form.productId == this.selectProductList[i].productId) {
+          material = this.selectProductList[i]
         }
       }
 
       // 将选择的信息放入newList
-      for (let i = 0;i < this.selectList.length;i++){
-        this.selectList[i].bucketName = bucket.bucketName;
-        this.selectList[i].bucketId = bucket.bucketId;
-        this.selectList[i].bucketCode = bucket.bucketCode;
-        this.selectList[i].materialId = material.productId;
-        this.selectList[i].materialCode = material.productCode;
-        this.selectList[i].materialName = material.productDesc;
-        this.selectList[i].planTime = this.form.planTime;
-        this.newWorkOrderList.push(this.selectList[i]);
+      for (let i = 0; i < this.selectList.length; i++) {
+        this.selectList[i].bucketName = bucket.bucketName
+        this.selectList[i].bucketId = bucket.bucketId
+        this.selectList[i].bucketCode = bucket.bucketCode
+        this.selectList[i].materialId = material.productId
+        this.selectList[i].materialCode = material.productCode
+        this.selectList[i].materialName = material.productDesc
+        this.selectList[i].planTime = this.form.planTime
+        this.newWorkOrderList.push(this.selectList[i])
       }
 
       // 将选择的数据在上方的列表中删除
-      const selectedCodes = this.selectList.map(item => item.workorderCode);
-      this.wetMaterialPlanList = this.wetMaterialPlanList.filter(item => !selectedCodes.includes(item.workorderCode));
+      const selectedCodes = this.selectList.map(item => item.workorderCode)
+      this.wetMaterialPlanList = this.wetMaterialPlanList.filter(item => !selectedCodes.includes(item.workorderCode))
 
       // 重置数据
-      this.form.bucketId = null;
-      this.form.productId = null;
+      this.form.bucketId = null
+      this.form.productId = null
     },
-	  /** 新增-确定按钮 */
+    /** 新增-确定按钮 */
     batchBtn() {
       // 数据判空
-      if (this.selectList == null || this.selectList === undefined){
+      if (this.selectList == null || this.selectList === undefined) {
         this.$message({
           message: '请选择工单！',
           type: 'warning'
         })
-        return;
+        return
       }
-      if (this.form.bucketId == null || this.form.productId == null){
+      if (this.form.bucketId == null || this.form.productId == null) {
         this.$message({
           message: '数据不能为空！',
           type: 'warning'
         })
-        return;
+        return
       }
       // 数据校验班次冲突问题
-      if (this.checkSelect === false){
+      if (this.checkSelect === false) {
         this.$message({
           message: '班次冲突请重新选择！',
           type: 'warning'
         })
-        return;
+        return
       }
 
       // 校验数据班次、物料、料罐
       var bms = {
         bucketId: this.form.bucketId,
         materialId: this.form.productId,
-        shiftId: this.selectList[0].shiftId,
-      };
-      if (this.bmsList != null || this.bmsList === undefined){
-        for (let i = 0;i<this.bmsList.length;i++){
-          if (bms.shiftId == this.bmsList[i].shiftId && bms.bucketId == this.bmsList[i].bucketId && bms.materialId != this.bmsList[i].materialId){
+        shiftId: this.selectList[0].shiftId
+      }
+      if (this.bmsList != null || this.bmsList === undefined) {
+        for (let i = 0; i < this.bmsList.length; i++) {
+          if (bms.shiftId == this.bmsList[i].shiftId && bms.bucketId == this.bmsList[i].bucketId && bms.materialId != this.bmsList[i].materialId) {
             this.$message({
-              message:'同班次同料罐下不能混料！',
-              type:'warning'
+              message: '同班次同料罐下不能混料！',
+              type: 'warning'
             })
-            return;
+            return
           }
         }
       }
-      this.bmsList.push(bms);
+      this.bmsList.push(bms)
       // 数据保存（仅前端）
       // 创建料罐对象
-      var bucket;
-      for (let i = 0;i < this.selectBucketList.length;i++){
-        if (this.form.bucketId == this.selectBucketList[i].bucketId){
-          bucket = this.selectBucketList[i];
+      var bucket
+      for (let i = 0; i < this.selectBucketList.length; i++) {
+        if (this.form.bucketId == this.selectBucketList[i].bucketId) {
+          bucket = this.selectBucketList[i]
         }
       }
       // 创建物料对象
-      var material;
-      for (let i = 0;i < this.selectProductList.length;i++){
-        if (this.form.productId == this.selectProductList[i].productId){
-          material = this.selectProductList[i];
+      var material
+      for (let i = 0; i < this.selectProductList.length; i++) {
+        if (this.form.productId == this.selectProductList[i].productId) {
+          material = this.selectProductList[i]
         }
       }
 
       // 将选择的信息放入newList
-      for (let i = 0;i < this.selectList.length;i++){
-        this.selectList[i].bucketName = bucket.bucketName;
-        this.selectList[i].bucketId = bucket.bucketId;
-        this.selectList[i].bucketCode = bucket.bucketCode;
-        this.selectList[i].materialId = material.productId;
-        this.selectList[i].materialCode = material.productCode;
-        this.selectList[i].materialName = material.productDesc;
-        this.selectList[i].planTime = this.form.planTime;
-        this.newWorkOrderList.push(this.selectList[i]);
+      for (let i = 0; i < this.selectList.length; i++) {
+        this.selectList[i].bucketName = bucket.bucketName
+        this.selectList[i].bucketId = bucket.bucketId
+        this.selectList[i].bucketCode = bucket.bucketCode
+        this.selectList[i].materialId = material.productId
+        this.selectList[i].materialCode = material.productCode
+        this.selectList[i].materialName = material.productDesc
+        this.selectList[i].planTime = this.form.planTime
+        this.newWorkOrderList.push(this.selectList[i])
       }
 
       // 将选择的数据在上方的列表中删除
-      const selectedCodes = this.selectList.map(item => item.workorderCode);
-      this.workOrderList = this.workOrderList.filter(item => !selectedCodes.includes(item.workorderCode));
+      const selectedCodes = this.selectList.map(item => item.workorderCode)
+      this.workOrderList = this.workOrderList.filter(item => !selectedCodes.includes(item.workorderCode))
 
       // 重置数据
-      this.form.bucketId = null;
-      this.form.productId = null;
+      this.form.bucketId = null
+      this.form.productId = null
 
     },
-	  /** 校验计划日期 */
-    checkDate(e){
-      if (this.newWorkOrderList.length>0){
+    /** 校验计划日期 */
+    checkDate: function(e) {
+      if (this.newWorkOrderList.length > 0) {
         this.$message({
-          message:'您已生成数据不能更改日期!',
-          type:'warning'
+          message: '您已生成数据不能更改日期!',
+          type: 'warning'
         })
-        return;
+        return
       }
-      var now = new Date();
-      if (e < now){
+      var now = new Date()
+      if (e < now) {
         this.$message({
           message: '日期不得早于今天',
           type: 'warning'
         })
-        e = now;
-        this.form.planTime = now;
+        e = now
+        this.form.planTime = now
       }
       // 获取计划日期下已分配的班次、料罐、物料信息list
-      const year = this.form.planTime.getFullYear(); // 获取年份
-      const month = String(this.form.planTime.getMonth() + 1).padStart(2, '0'); // 获取月份
-      const day = String(this.form.planTime.getDate()).padStart(2, '0'); // 获取日期
-      const planTime = `${year}-${month}-${day}`;
+      var planTime = moment(this.form.planTime).format('YYYY-MM-DD')
       getBMSList(planTime).then(response => {
-        console.log("w这里是改变日期")
-        console.log(response.data)
-        if (response.data !== undefined){
-          this.bmsList = response.data;
+        if (response.data !== undefined) {
+          this.bmsList = response.data
         }
       })
     },
-	  /** 新增-选择工单日期 */
+    /** 新增-选择工单日期 */
     workOrderTimeChange(e) {
       // 校验日期并进行计划日期同步
-      var now = new Date();
-      if (e < now){
-        this.form.planTime = now;
-      }else {
-        this.form.planTime = e;
+      var now = new Date()
+      if (e < now) {
+        this.form.planTime = now
+      } else {
+        this.form.planTime = e
       }
       // 转换日期格式
-      const year = e.getFullYear(); // 获取年份
-      const month = String(e.getMonth() + 1).padStart(2, '0'); // 获取月份
-      const day = String(e.getDate()).padStart(2, '0'); // 获取日期
-      const productDate = `${year}-${month}-${day}`;
+      var productDate = moment(e).format('YYYY-MM-DD')
 
       getWorkOrderList(productDate).then(response => {
-        this.workOrderList = response.data;
+        this.workOrderList = response.data
         // 刷新表格
         // 在获取到新的数据后执行以下代码
-        this.workLoading = true; // 设置加载状态为true，表示正在加载
-        this.refreshWorkTable = false; // 先将refreshProTable设置为false，隐藏表格
+        this.workLoading = true // 设置加载状态为true，表示正在加载
+        this.refreshWorkTable = false // 先将refreshProTable设置为false，隐藏表格
         this.$nextTick(() => {
           // 使用$nextTick来等待DOM更新完成
-          this.refreshWorkTable = true; // 立即将refreshProTable设置为true，显示表格
-          this.workLoading = false; // 设置加载状态为false，表示加载完成
-        });
+          this.refreshWorkTable = true // 立即将refreshProTable设置为true，显示表格
+          this.workLoading = false // 设置加载状态为false，表示加载完成
+        })
+      })
+    },
+    /** 查询湿料计划管理列表 */
+    getList() {
+      this.loading = true
+      listPlan(this.queryParams).then(response => {
+        this.planList = response.rows
+        this.total = response.total
+        this.loading = false
       })
     },
-		/** 查询湿料计划管理列表 */
-		getList() {
-			this.loading = true;
-			listPlan(this.queryParams).then(response => {
-				this.planList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				id: null,
-				factoryCode: null,
-				planTime: null,
-				syncFlag: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
-				orderType: null,
-				prodCode: null,
-				prodDesc: null,
-				prodSource: null,
-				quantity: null,
-				unit: null,
-				atrr1: null,
-				atrr2: null,
-				atrr3: null,
-				status: null,
-				prodType: null,
-				planCode: null
-			};
-			this.resetForm("form");
-		},
-		/** 首-搜索按钮操作 */
-		handleQuery() {
-      if (this.timeList.length-1>1){
-        // 赋值
-        const year = this.timeList[0].getFullYear(); // 获取年份
-        const month = String(this.timeList[0].getMonth() + 1).padStart(2, '0'); // 获取月份
-        const day = String(this.timeList[0].getDate()).padStart(2, '0'); // 获取日期
-        const startTime = `${year}-${month}-${day}`;
-
-        this.queryParams.startTime = startTime;
-
-        const year1 = this.timeList[1].getFullYear(); // 获取年份
-        const month1 = String(this.timeList[1].getMonth() + 1).padStart(2, '0'); // 获取月份
-        const day1 = String(this.timeList[1].getDate()).padStart(2, '0'); // 获取日期
-        const endTime = `${year1}-${month1}-${day1}`;
-
-        this.queryParams.endTime = endTime;
-      }else {
-        this.queryParams.startTime = null;
-        this.queryParams.endTime = null;
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        factoryCode: null,
+        planTime: null,
+        syncFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        orderType: null,
+        prodCode: null,
+        prodDesc: null,
+        prodSource: null,
+        quantity: null,
+        unit: null,
+        atrr1: null,
+        atrr2: null,
+        atrr3: null,
+        status: null,
+        prodType: null,
+        planCode: null
       }
-
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 首-重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.timeList = [];
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-		  // 初始化
-      this.checkSelect = true;
+      this.resetForm('form')
+    },
+    /** 首-搜索按钮操作 */
+    handleQuery() {
+      if (this.timeList.length > 0) {
+        this.queryParams.startTime = moment(this.timeList[0]).format('YYYY-MM-DD')
+        this.queryParams.endTime = moment(this.timeList[1]).format('YYYY-MM-DD')
+      }
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 首-重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.timeList = []
+      this.queryParams.syncFlag = null
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      // 初始化
+      this.checkSelect = true
       // 如果选择中班次冲突
-      for (let i = 0; i < selection.length; i++){
-        if (selection[0].shiftId != selection[i].shiftId){
+      for (let i = 0; i < selection.length; i++) {
+        if (selection[0].shiftId != selection[i].shiftId) {
           this.$message({
             message: '班次冲突！',
             type: 'warning'
-          });
-          this.checkSelect = false;
+          })
+          this.checkSelect = false
         }
       }
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
       // 将选择的信息放入selectList
-      this.selectList = selection;
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-		  // 刷新缓存
-			this.reset();
-			this.selectBucketList = null;
-			this.workOrderTime = null;
-			this.workOrderList = [];
-			this.selectProductList = null;
-			this.newWorkOrderList = [];
-			this.bmapId = null;
-			// 数据初始化
-      this.workOrderTime = new Date();
-      this.form.planTime = new Date();
+      this.selectList = selection
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      // 刷新缓存
+      this.reset()
+      this.selectBucketList = null
+      this.workOrderTime = null
+      this.workOrderList = []
+      this.selectProductList = null
+      this.newWorkOrderList = []
+      this.bmapId = null
+      // 数据初始化
+      this.workOrderTime = new Date()
+      this.form.planTime = new Date()
       // 获取当前日期下的未被分配的工单list
-      // 转换日期格式
-      const year = this.workOrderTime.getFullYear(); // 获取年份
-      const month = String(this.workOrderTime.getMonth() + 1).padStart(2, '0'); // 获取月份
-      const day = String(this.workOrderTime.getDate()).padStart(2, '0'); // 获取日期
-      const productDate = `${year}-${month}-${day}`;
+      var productDate = moment(this.workOrderTime).format('YYYY-MM-DD')
 
+      // 在获取到新的数据后执行以下代码
+      this.workLoading = true // 设置加载状态为true，表示正在加载
       getWorkOrderList(productDate).then(response => {
-        this.workOrderList = response.data;
+        this.workOrderList = response.data
         // 刷新表格
-        // 在获取到新的数据后执行以下代码
-        this.workLoading = true; // 设置加载状态为true，表示正在加载
-        this.refreshWorkTable = false; // 先将refreshProTable设置为false，隐藏表格
+
+        this.refreshWorkTable = false // 先将refreshProTable设置为false，隐藏表格
         this.$nextTick(() => {
           // 使用$nextTick来等待DOM更新完成
-          this.refreshWorkTable = true; // 立即将refreshProTable设置为true，显示表格
-          this.workLoading = false; // 设置加载状态为false，表示加载完成
-        });
+          this.refreshWorkTable = true // 立即将refreshProTable设置为true，显示表格
+          this.workLoading = false // 设置加载状态为false，表示加载完成
+        })
       })
       // 获取今天已分配的班次、料罐、物料信息list
       getBMSList(productDate).then(response => {
-        if (response.data !== undefined){
-          this.bmsList = response.data;
-          console.log("这里是bms开始")
+        if (response.data !== undefined) {
+          this.bmsList = response.data
+          console.log('这里是bms开始')
           console.log(this.bmsList)
         }
       })
       // 一会完成下方数据同步
-			// 获取料罐list
+      // 获取料罐list
       getBucketList().then(response => {
-        this.selectBucketList = response.data;
+        this.selectBucketList = response.data
       })
       // 获取物料信息list
       getProductList().then(response => {
-        this.selectProductList = response.data;
+        this.selectProductList = response.data
       })
-			this.open = true;
-			this.title = "新增湿料计划";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-      console.log("这里是修改操作区域")
+      this.open = true
+      this.title = '新增湿料计划'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      console.log('这里是修改操作区域')
       console.log(row)
       // 清除缓存
-      this.reset();
-      this.selectBucketList = null;
-      this.workOrderTime = null;
-      this.workOrderList = [];
-      this.selectProductList = null;
-      this.newWorkOrderList = [];
-      this.bmapId = null;
+      this.reset()
+      this.selectBucketList = null
+      this.workOrderTime = null
+      this.workOrderList = []
+      this.selectProductList = null
+      this.newWorkOrderList = []
+      this.bmapId = null
       // 初始化数据
-      this.form.planTime = new Date();
+      this.form.planTime = new Date()
+      // 在获取到新的数据后执行以下代码
+      this.workLoading = true // 设置加载状态为true，表示正在加载
       // 获取订单详情list
       getPlanDetailList(row.id).then(response => {
-        if (response.data !== undefined){
-          this.wetMaterialPlanList = response.data;
+        if (response.data !== undefined) {
+          this.wetMaterialPlanList = response.data
+
+          this.refreshWorkTable = false // 先将refreshProTable设置为false，隐藏表格
+          this.$nextTick(() => {
+            // 使用$nextTick来等待DOM更新完成
+            this.refreshWorkTable = true // 立即将refreshProTable设置为true，显示表格
+            this.workLoading = false // 设置加载状态为false，表示加载完成
+          })
         }
       })
       // 获取料罐list
       getBucketList().then(response => {
-        this.selectBucketList = response.data;
+        this.selectBucketList = response.data
       })
       // 获取物料信息list
       getProductList().then(response => {
-        this.selectProductList = response.data;
+        this.selectProductList = response.data
       })
 
-			this.dialogVisible = true;
-		},
+      this.dialogVisible = true
+    },
     /** 修改-提交按钮 */
     updateForm() {
       // 校验数据判断newList是否为空
-      if (this.newWorkOrderList == [] || this.newWorkOrderList.length == 0 || this.newWorkOrderList == null){
+      if (this.newWorkOrderList == [] || this.newWorkOrderList.length == 0 || this.newWorkOrderList == null) {
         this.$message({
-          message:'提交数据不能为空！',
-          type:'warning'
+          message: '提交数据不能为空！',
+          type: 'warning'
         })
-        return;
+        return
       }
 
       updatePlanDetail(this.newWorkOrderList).then(response => {
-        if (response.code === 200){
+        if (response.code === 200) {
           this.$message({
-            message:'提交成功',
-            type:'success'
+            message: '提交成功',
+            type: 'success'
           })
         }
       })
 
-      this.dialogVisible = false;
-      this.getList();
+      this.dialogVisible = false
+      this.getList()
     },
-		/** 新增-提交按钮 */
-		addSubmitForm() {
-		  // 校验数据判断newList是否为空
-      if (this.newWorkOrderList == [] || this.newWorkOrderList.length == 0 || this.newWorkOrderList == null){
+    /** 新增-提交按钮 */
+    addSubmitForm() {
+      // 校验数据判断newList是否为空
+      if (this.newWorkOrderList == [] || this.newWorkOrderList.length == 0 || this.newWorkOrderList == null) {
         this.$message({
-          message:'提交数据不能为空！',
-          type:'warning'
+          message: '提交数据不能为空！',
+          type: 'warning'
         })
-        return;
+        return
       }
 
-      console.log("这里是工单list")
+      console.log('这里是工单list')
       console.log(this.newWorkOrderList)
       addWetPlan(this.newWorkOrderList).then(response => {
-        if (response.code === 200){
+        if (response.code === 200) {
           this.$message({
-            message:'提交成功',
-            type:'success'
+            message: '提交成功',
+            type: 'success'
           })
         }
       })
-      this.open = false;
-      this.getList();
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const ids = row.id || this.ids;
-			this.$modal.confirm('是否确认删除湿料计划管理编号为"' + ids + '"的数据项？').then(function() {
-				return delPlan(ids);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('mes/plan/export', {
-				...this.queryParams
-			}, `plan_${new Date().getTime()}.xlsx`)
-		}
-	}
-};
+      this.open = false
+      this.getList()
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除湿料计划管理编号为"' + ids + '"的数据项？').then(function() {
+        return delPlan(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/plan/export', {
+        ...this.queryParams
+      }, `plan_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
 </script>
 <style>
-  .el-row {
-    margin-bottom: 20px;
+.el-row {
+  margin-bottom: 20px;
+
   &:last-child {
-     margin-bottom: 0;
-   }
-  }
-  .el-col {
-    border-radius: 4px;
-  }
-  .bg-purple-dark {
-    background: #99a9bf;
-  }
-  .bg-purple {
-    background: #d3dce6;
-  }
-  .bg-purple-light {
-    background: #e5e9f2;
-  }
-  .grid-content {
-    border-radius: 4px;
-    min-height: 36px;
-  }
-  .row-bg {
-    padding: 10px 0;
-    background-color: #f9fafc;
+    margin-bottom: 0;
   }
+}
+
+.el-col {
+  border-radius: 4px;
+}
+
+.bg-purple-dark {
+  background: #99a9bf;
+}
+
+.bg-purple {
+  background: #d3dce6;
+}
+
+.bg-purple-light {
+  background: #e5e9f2;
+}
+
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+}
+
+.row-bg {
+  padding: 10px 0;
+  background-color: #f9fafc;
+}
 </style>