计划管理优化

src/views/plan/workorder/index.vue

@@ -24,7 +24,6 @@
           />
         </el-select>
       </el-form-item>
-
       <el-form-item label="订单编码" prop="orderCode">
         <el-input
           v-model="queryParams.orderCode"
@@ -103,7 +102,8 @@
           :disabled="multiple"
           @click="handleUpdateDown"
           v-hasPermi="['mes:pro:workorder:edit']"
-				>派发工单</el-button>
+        >派发工单
+        </el-button>
       </el-col>
 
       <el-col :span="1.5">
@@ -115,7 +115,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:pro:workorder:edit']"
-				>工单变更</el-button>
+        >工单变更
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -126,7 +127,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:pro:workorder:remove']"
-				>删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -136,7 +138,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['mes:pro:workorder:export']"
-				>导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -147,7 +150,8 @@
           size="mini"
           @click="showPrint"
           v-hasPermi="['mes:pro:workorder:export']"
-        >打印预览</el-button>
+        >打印预览
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -441,18 +445,16 @@
 import {
   getWorkOrders,
   listWorkorder,
-  getWorkorder,
   delWorkorder,
   downWorkorder,
-  addWorkorder,
-  updateWorkorder,
   getOrderAndWork,
   getWorkBatchList,
   subChangeWorkOrder,
   checkWorkOrder
 } from '@/api/plan/workorder'
 import moment from 'moment';
-import { getprodLineShift, getProEquipment, getProRoutes, getProShifts } from '@/api/plan/order'
+import { getProEquipment, getProRoutes, getProShifts} from '@/api/plan/order'
+
 export default {
   name: "Workorder",
   dicts: ['product_type', 'workorder_type', 'shift_type'],
@@ -598,284 +600,32 @@ export default {
     this.getList();
   },
   methods: {
-    // 选择线体改变
+    // 派发-工单派发按钮操作
-    changeEquipment(){
+    handleUpdateDown(row) {
-      if (this.splitForm.routeCode == null) {
+      var statusesArray = this.statuses;
-        this.$message({
+      for (var i = 0; i < statusesArray.length; i++) {
-          message: '请先选择工艺！',
+        if (statusesArray[i] == 'w1') {//已经下达的不允许操作
-          type: 'warning'
+          this.$modal.msgError("已经下达的订单不允许操作");
-        })
-        return
-      }
-    },
-    // 打印
-    handlePrint(params) {
-      printJS({
-        printable: params.printable, // 'printFrom', // 标签元素id
-        type: params.type || 'html',
-        maxWidth: 1500, // 最大宽度
-        font_size: "",// 设置字体大小
-        header: params.header, // '表单',
-        targetStyles: ['*'],
-        style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
-        ignoreElements: params.ignore || [], // ['no-print']
-        properties: params.properties || null
-      })
-    },
-    // 打印预览
-    showPrint() {
-      // 清楚缓存
-      this.printData.workCenter = "暂无数据";
-      this.printData.printDate = null;
-      this.printData.workTable = [];
-      this.printData.factory = null;
-      this.printData.productDate = null;
-      // 打开工单信息对话框
-      this.printDialogVisible = true;
-      this.printData.printDate = moment(new Date()).format('YYYY.MM.DD');
-      this.printData.manufacture = this.$store.state.user.name;
-      this.newWorkerLoading = true // 设置加载状态为true，表示正在加载
-      this.refreshNewWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
-      getWorkOrders(this.selectWork.workorderCode).then(response => {
-        this.printData.workTable = response.data;
-        this.printData.factory = response.data[0].factoryCode;
-        this.printData.productDate = response.data[0].productDate;
-        this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
-        this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
-      })
-    },
-    /** 动态添加表单 */
-    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)
-    },
-    /** 填写批次数量 */
-    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.formFields[this.formFields.length - 1].batchQuantity <= 0) {
-          this.formFields[this.formFields.length - 1].batchQuantity = 1
-        }
-      }
-      //如果拆分数量为空
-      if (this.productData[0].atrr1 == '' || this.productData[0].atrr1 == null) {
-        this.formFields[this.formFields.length - 1].batchQuantity = ''
-      }
-    },
-    /** 检验批次编码是否重复 */
-    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
         }
       }
-      }
-    },
-    /** 更改工艺 */
-    routeChange(e){
-      getProEquipment(e).then(response => {
-        this.eRouteOptions = response.data
-      })
-      this.workForm.routeCode = e
-    },
-    /** 更改班次 */
-    shiftChange(e){
-      this.workForm.shiftId = e
-    },
-    /** 拆分数量 */
-    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: '最大值不能超过' + max + '!',
-            type: 'warning'
-          })
-          this.splitForm.splitNum = max
-        }
-        //前端数据同步
-        // 在获取到新的数据后执行以下代码
-        this.proLoading = true // 设置加载状态为true，表示正在加载
 
-        var num = this.productData[0].quantity;
+      const workorderIds = row.workorderCode || this.codes;
-        // 递归操作动态显示拆分数量
+      this.$modal.confirm('是否确认下发生产工单编号为"' + workorderIds + '"的数据项？').then(function () {
-        function setAtrr1(data, splitNum) {
+        return downWorkorder(workorderIds);
-          if (data.children !== undefined) {
+      }).then(() => {
-            for (let i = 0; i < data.children.length; i++) {
+        this.getList();
-              data.children[i].atrr1 = splitNum * (data.children[i].quantity / num)
+        this.$modal.msgSuccess("下发成功");
-              setAtrr1(data.children[i], splitNum)
+      }).catch(() => {
-            }
-          }
-        }
-
-        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.workForm.splitNum = this.splitForm.splitNum
-      }
-      this.product = this.productData[0]
-    },
-    /** 工单日期选择 */
-    checkDate(e){
-      this.workForm.productDate = e
-    },
-
-		/** 查询生产工单列表 */
-		getList() {
-			this.loading = true;
-			this.queryParams.endFlag = '1';//只查子单
-			if(this.queryParams.productDateArray!=null){
-				this.queryParams.productDateStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD');
-				this.queryParams.productDateEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD');
-			}
-
-			listWorkorder(this.queryParams).then(response => {
-				this.workorderList = response.rows;
-				this.total = response.total;
-				this.loading = false;
       });
     },
-		// 取消按钮
+    // 变更-工单变更按钮操作
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				workorderId: null,
-				workorderCode: null,
-				workorderName: null,
-				orderId: null,
-				orderCode: null,
-				productId: null,
-				productCode: null,
-				productName: null,
-				productSpc: null,
-				unit: null,
-				quantityProduced: null,
-				quantitySplit: null,
-				routeCode: null,
-				prodLineCode: null,
-        prodLineCodeArray:[],
-				productDate: null,
-				shiftId: null,
-				parentOrder: null,
-				ancestors: null,
-				status: null,
-				remark: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
-				prodType: null,
-				factoryCode: null,
-				endFlag: null
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-      // 这里设置选中的工单信息--用于工单变更
-      this.selectWork = selection[0]
-
-			this.ids = selection.map(item => item.workorderId)
-			this.codes = selection.map(item => item.workorderCode)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		    this.statuses = selection.map(item => item.status)
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			alert("待建设")
-			//this.reset();
-			//this.open = true;
-			//this.title = "添加生产工单";
-		},
-		/** 修改按钮操作 */
     handleUpdate(row) {
-      // 除了未派发都不允许修改(改为：未生产前都可以修改)
-      //if (this.selectWork.status == "w1"){
-      //  this.$message({
-      //    message:'工单已派发！不可修改！',
-      //    type:'warning'
-      //  })
-      //  return;
-      //}
       // 校验是否可以修改
       checkWorkOrder(this.selectWork.workorderId).then(response => {
         if (response.code == 500) {
           this.$message({
-            message:'该工单已有湿料计划，不可修改！',
+            message: '工单已生产，不可变更！',
             type: 'warning'
           })
           return;
@@ -966,25 +716,148 @@ export default {
       })
 
     },
-		/**下达工单**/
+    // 变更-选择线体改变
-    handleUpdateDown(row) {
+    changeEquipment() {
-            var statusesArray = this.statuses;
+      if (this.splitForm.routeCode == null) {
-			for(var i=0; i<statusesArray.length; i++) {
+        this.$message({
-               if(statusesArray[i]=='w1'){//已经下达的不允许操作
+          message: '请先选择工艺！',
-                   this.$modal.msgError("已经下达的订单不允许操作");
+          type: 'warning'
+        })
         return
       }
+    },
+    // 变更-变更工艺
+    routeChange(e) {
+      getProEquipment(e).then(response => {
+        this.eRouteOptions = response.data
+      })
+      this.workForm.routeCode = e
+    },
+    // 变更-变更班次
+    shiftChange(e) {
+      this.workForm.shiftId = e
+    },
+    // 变更-拆分数量变更
+    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: '最大值不能超过' + max + '!',
+            type: 'warning'
+          })
+          this.splitForm.splitNum = max
+        }
+        //前端数据同步
+        // 在获取到新的数据后执行以下代码
+        this.proLoading = true // 设置加载状态为true，表示正在加载
+
+        var num = this.productData[0].quantity;
+
+        // 递归操作动态显示拆分数量
+        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 / num)
+              setAtrr1(data.children[i], splitNum)
+            }
+          }
         }
 
-			const workorderIds = row.workorderCode || this.codes;
+        this.productData[0].atrr1 = this.splitForm.splitNum
-			this.$modal.confirm('是否确认下发生产工单编号为"' + workorderIds + '"的数据项？').then(function() {
+        setAtrr1(this.productData[0], this.splitForm.splitNum)
-				return downWorkorder(workorderIds);
+
-			}).then(() => {
+        this.refreshProTable = false // 先将refreshProTable设置为false，隐藏表格
-				this.getList();
+        this.$nextTick(() => {
-				this.$modal.msgSuccess("下发成功");
+          // 使用$nextTick来等待DOM更新完成
-			}).catch(() => {});
+          this.refreshProTable = true // 立即将refreshProTable设置为true，显示表格
+          this.proLoading = false // 设置加载状态为false，表示加载完成
+        })
+
+        this.workForm.splitNum = this.splitForm.splitNum
+      }
+      this.product = this.productData[0]
     },
-		/** 拆分-提交按钮 */
+    // 变更-工单日期变更
+    checkDate(e) {
+      this.workForm.productDate = e
+    },
+    // 变更-动态添加批次
+    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)
+    },
+    // 变更-填写批次数量
+    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.formFields[this.formFields.length - 1].batchQuantity <= 0) {
+          this.formFields[this.formFields.length - 1].batchQuantity = 1
+        }
+      }
+      //如果拆分数量为空
+      if (this.productData[0].atrr1 == '' || this.productData[0].atrr1 == null) {
+        this.formFields[this.formFields.length - 1].batchQuantity = ''
+      }
+    },
+    // 变更-检验批次编码是否重复
+    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
+          }
+        }
+      }
+    },
+    // 变更-变更提交按钮
     submitForm() {
       // 判断如果拆分数量不等于拆分批次数量之和
       let sum = 0
@@ -1047,7 +920,7 @@ export default {
       }]
       this.open = false
     },
-		/** 删除按钮操作 */
+    // 删除-工单删除按钮操作
     handleDelete(row) {
 
       var statusesArray = this.statuses;
@@ -1067,13 +940,136 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
+      }).catch(() => {
+      });
     },
-		/** 导出按钮操作 */
+    // 导出-工单list导出按钮操作
     handleExport() {
       this.download('plan/pro/workorder/export', {
         ...this.queryParams
       }, `workorder_${new Date().getTime()}.xlsx`)
+    },
+    // 打印预览-浏览器打印
+    handlePrint(params) {
+      printJS({
+        printable: params.printable, // 'printFrom', // 标签元素id
+        type: params.type || 'html',
+        maxWidth: 1500, // 最大宽度
+        font_size: "",// 设置字体大小
+        header: params.header, // '表单',
+        targetStyles: ['*'],
+        style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
+        ignoreElements: params.ignore || [], // ['no-print']
+        properties: params.properties || null
+      })
+    },
+    // 打印预览-点击打印预览按钮
+    showPrint() {
+      // 清楚缓存
+      this.printData.workCenter = "暂无数据";
+      this.printData.printDate = null;
+      this.printData.workTable = [];
+      this.printData.factory = null;
+      this.printData.productDate = null;
+      // 打开工单信息对话框
+      this.printDialogVisible = true;
+      this.printData.printDate = moment(new Date()).format('YYYY.MM.DD');
+      this.printData.manufacture = this.$store.state.user.name;
+      this.newWorkerLoading = true // 设置加载状态为true，表示正在加载
+      this.refreshNewWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
+      getWorkOrders(this.selectWork.workorderCode).then(response => {
+        this.printData.workTable = response.data;
+        this.printData.factory = response.data[0].factoryCode;
+        this.printData.productDate = response.data[0].productDate;
+        this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
+        this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
+      })
+    },
+    // 首-查询生产工单列表
+    getList() {
+      this.loading = true;
+      this.queryParams.endFlag = '1';//只查子单
+      if (this.queryParams.productDateArray != null) {
+        this.queryParams.productDateStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD');
+        this.queryParams.productDateEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD');
+      }
+
+      listWorkorder(this.queryParams).then(response => {
+        this.workorderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 首-表单重置
+    reset() {
+      this.form = {
+        workorderId: null,
+        workorderCode: null,
+        workorderName: null,
+        orderId: null,
+        orderCode: null,
+        productId: null,
+        productCode: null,
+        productName: null,
+        productSpc: null,
+        unit: null,
+        quantityProduced: null,
+        quantitySplit: null,
+        routeCode: null,
+        prodLineCode: null,
+        prodLineCodeArray: [],
+        productDate: null,
+        shiftId: null,
+        parentOrder: null,
+        ancestors: null,
+        status: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        prodType: null,
+        factoryCode: null,
+        endFlag: null
+      };
+      this.resetForm("form");
+    },
+    // 首-搜索按钮操作
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    // 首-重置按钮操作
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 首-多选框选中数据
+    handleSelectionChange(selection) {
+      // 这里设置选中的工单信息--用于工单变更
+      this.selectWork = selection[0]
+
+      this.ids = selection.map(item => item.workorderId)
+      this.codes = selection.map(item => item.workorderCode)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+      this.statuses = selection.map(item => item.status)
+    },
+    // 首-新增按钮操作
+    handleAdd() {
+      alert("待建设")
+      //this.reset();
+      //this.open = true;
+      //this.title = "添加生产工单";
     }
   }
 };
@@ -1114,17 +1110,21 @@ export default {
   margin-top: 40px;
   margin-bottom: 10px;
 }
+
 .my-print-head {
   margin-top: 20px;
   font-weight: bold;
 }
+
 .my-print-nav {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+
 .my-print-table {
 
 }
+
 .my-print-foot {
   margin-top: 20px;
 }