checkBox 选中全局样式修改

src/assets/scss/global.scss

@@ -347,7 +347,7 @@ a:hover{
   text-decoration: none;
 }
 
-/*重写checkbox的样式*/
+/*重写checkbox的样式 2022-03-09*/
 .el-checkbox__inner::after {
   left: 3px;
   top: -0.5px;

src/views/modules/schedule/com_split_schedule.vue

@@ -38,7 +38,7 @@ export default {
   methods: {
     /*初始化页面参数*/
     init(scheduleRow) {
-      this.titleCon = '工单：' + scheduleRow.orderNo + ',分批排产';
+      this.titleCon = '分批排产';
       //初始化页面的数据
       this.pageData.scheduleQty = scheduleRow.qtyToSchedule;
       this.pageData.maxScheduleQty = scheduleRow.qtyToSchedule;
@@ -62,8 +62,9 @@ export default {
         this.$message.error('排产数量必须大于0!');
         return false;
       }
+
       /*判断是否超过最大可排产的数量*/
-      if(this.pageData.maxScheduleQty < scheduleQty){
+      if(this.pageData.maxScheduleQty < parseFloat(scheduleQty)){
         this.$message.error('该订单累计排产数量超过订单数量!');
         return false;
       }

src/views/modules/schedule/order_schedule.vue

@@ -73,7 +73,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item :label="''" style="margin-top: -10px;">
-          <el-checkbox v-model="pageData.specifiedTime" true-label="Y"  false-label="N" style="margin-top: 28px;" ></el-checkbox>
+          <el-checkbox v-model="pageData.specifiedTime" true-label="Y"  false-label="N" style="margin-top: 28px; margin-right: -20px;" ></el-checkbox>
           <el-time-picker
             format="HH:mm"
             arrow-control
@@ -94,8 +94,7 @@
           <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台编号:</a></span>
           <el-input v-model="pageData.resourceId" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item>
-          <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码:</a></span>
+        <el-form-item :label="'加工中心编码:'">
           <el-input v-model="pageData.workCenterNo" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
@@ -175,7 +174,7 @@
 
       </el-form>
       <el-table
-        height="120"
+        :height="height"
         :data="shopOrderList"
         border
         ref="routingTable"
@@ -209,7 +208,7 @@
         </el-form-item>
       </el-form>
       <el-table
-        height="135"
+        :height="height"
         :data="orderScheduleList"
         border
         highlight-current-row
@@ -956,10 +955,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301Schedule',
+          serialNumber: '5301ScheduleScheduledSeqNo',
           tableId: "5301Schedule",
           tableName: "排产明细表",
-          columnProp: "",
+          columnProp: "scheduledSeqNo",
           headerAlign: "center",
           align: "center",
           columnLabel: "排产序号",
@@ -1757,7 +1756,7 @@ export default {
 
   mounted() {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 300;
+      this.height = (window.innerHeight - 405) / 2;
     })
   },
   methods: {
@@ -1900,9 +1899,8 @@ export default {
       }
       //赋值排产的数量
       let scheduledQty = row.qtyToSchedule;
-      debugger;
       row.qtyScheduled = scheduledQty;
-      row.qtyToSchedule = row.lotSize - row.qtyScheduled;
+      row.qtyToSchedule = parseFloat(row.qtyToSchedule) -  parseFloat(row.qtyScheduled);
       this.pageData.scheduledQty = scheduledQty;
       //设置工单和工序
       this.pageData.orderNo = row.orderNo;
@@ -1923,8 +1921,8 @@ export default {
         this.$message.error('机台不能为空!')
         return false;
       }
-      this.currentRoutingRow.qtyScheduled = this.currentRoutingRow.qtyScheduled + parseFloat(scheduledQty);
-      this.currentRoutingRow.qtyToSchedule =  parseFloat(this.currentRoutingRow.lotSize) - this.currentRoutingRow.qtyScheduled;
+      this.currentRoutingRow.qtyScheduled =  parseFloat(this.currentRoutingRow.qtyScheduled) + parseFloat(scheduledQty);
+      this.currentRoutingRow.qtyToSchedule =  parseFloat(this.currentRoutingRow.qtyToSchedule) -  parseFloat(scheduledQty);
       //执行排产的方法
       this.scheduleWorkOrderOperation(scheduledQty);
     },
@@ -1935,6 +1933,8 @@ export default {
       this.pageData.scheduledQty = scheduledQty;
       scheduleWorkOrder(this.pageData).then(({data}) => {
         if(data.code == 500){
+          this.currentRoutingRow.qtyScheduled =  parseFloat(this.currentRoutingRow.qtyScheduled) - parseFloat(scheduledQty);
+          this.currentRoutingRow.qtyToSchedule =  parseFloat(this.currentRoutingRow.qtyToSchedule) +  parseFloat(scheduledQty);
           this.$message.error(data.msg);
           this.pageData.scheduledQty = 0;
         }else{
@@ -2165,5 +2165,9 @@ div.customer-el-card-blue {
 .el-dropdown-menu /deep/ li.customer-li{
   font-size: 10px;
 }
+
+.el-input /deep/ .el-icon-time{
+  display: none;
+}
 /*控制上下间距*/
 </style>

src/views/modules/yieldReport/com_defect_roll.vue

@@ -349,7 +349,7 @@ export default {
         //判断是否存在异常
         if(data.code == 500){
           //this.$message.error(data.msg);
-          this.pageData.defectCode = ''
+          this.pageData.defectDesc = ''
         }else{
           let resultMap = data.resultMap;
           this.pageData.defectDesc = resultMap.defectDesc;
@@ -362,7 +362,7 @@ export default {
       checkDefectCode(this.pageData).then(({data}) => {
         //判断是否存在异常
         if(data.code == 500){
-          this.pageData.defectCode = ''
+          this.pageData.defectDesc = ''
         }else{
           let resultMap = data.resultMap;
           this.pageData.defectDesc = resultMap.defectDesc;

src/views/modules/yieldReport/com_separate_roll.vue

@@ -44,7 +44,7 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="">确 定</el-button>
+        <el-button type="primary" @click="checkCreateSeparateRolllBun">确 定</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
@@ -95,6 +95,7 @@ export default {
         rollNo: '',
         reportDate: '',
         reportTime: '',
+        operatorId: '',
         rollQty: 0,
         rollNums: 1
       },
@@ -124,6 +125,7 @@ export default {
       this.pageData.itemNo = scheduleData.itemNo;
       this.pageData.seqNo = scheduleData.seqNo;
       this.pageData.rollNo = scheduleData.rollNo;
+      this.pageData.operatorId = operatorData.operatorId;
       //清空参数
       this.pageData.rollQty = 0;
       this.pageData.rollNums = 1;
@@ -144,7 +146,7 @@ export default {
     /*检查材料卷号的数据*/
     checkValidQty() {
       //获取当前是的数量
-      let rollQty = this.pageData.rollQty;
+      let rollQty = parseFloat(this.pageData.rollQty);
       //判断是否可以修改
       if (rollQty <= 0 || !Number.isInteger(rollQty)){
         this.$message.error('良品数量必须是正整数!');
@@ -155,7 +157,7 @@ export default {
     /*检查材料卷号的数据*/
     checkRollNums() {
       //获取当前是的数量
-      let rollNums = this.pageData.rollNums;
+      let rollNums = parseFloat(this.pageData.rollNums);
       //判断是否是正整数
       if (rollNums <= 0 || !Number.isInteger(rollNums)){
         this.$message.error('卷数必须是正整数!');
@@ -171,7 +173,8 @@ export default {
       }
 
       //获取当前是的数量
-      let rollQty = this.pageData.rollQty;
+      let rollQty = parseFloat(this.pageData.rollQty);
+      debugger;
       //判断是否可以修改
       if (rollQty <= 0 || !Number.isInteger(rollQty)){
         this.$message.error('良品数量必须大于零且是整数!');
@@ -179,7 +182,7 @@ export default {
       }
 
       //获取当前是的数量
-      let rollNums = this.pageData.rollNums;
+      let rollNums = parseFloat(this.pageData.rollNums);
       //判断是否是正整数
       if (rollNums <= 0 || !Number.isInteger(rollNums)){
         this.$message.error('卷数必须大于零且是整数!');