Merge remote-tracking branch 'origin/master'

src/views/modules/schedule/order_schedule.vue

@@ -1,13 +1,10 @@
 <template>
   <div class="customer-css" >
     <!--  菜单按钮区域  -->
-    <fieldset class="customer-field" style="width: 612px; padding: 0.35em 0.75em 0.425em;" >
+    <fieldset class="customer-field" style="width: 612px; padding: 0.35em 0.35em 0.35em;" >
       <legend>菜单</legend>
-      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -2px;" >
-      <el-form-item :label="''">
-        <el-button class="customer-bun-min" type="primary" style="margin-left: 10px; margin-bottom: 5px;">关闭</el-button>
-      </el-form-item>
-      <el-form-item :label="''">
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;" >
+      <el-form-item :label="''" style="margin-left: 30px;">
         <el-button class="customer-bun-min" type="primary" @click="refreshPageTables" style="margin-left: 10px; margin-bottom: 5px;">刷新</el-button>
       </el-form-item>
       <el-form-item :label="''">
@@ -21,8 +18,8 @@
     <!--  排序规则  -->
     <fieldset class="customer-field" style="margin-left: 640px; margin-top: -45px; width: 135px;" >
       <legend>排序</legend><br>
-      <el-form :inline="true" style="margin-top: -10px; margin-bottom: 15px;" label-position="top" label-width="100px" >
-        <el-form-item :label="''" style="margin-bottom: 5px;">
+      <el-form :inline="true" style="margin-top: -10px; margin-bottom: 10px;" label-position="top" label-width="100px" >
+        <el-form-item :label="''" style="margin-bottom: 10px;">
           <el-radio-group v-model="pageData.sortField">
             <el-radio label="needDate">要求完工日期</el-radio>
             <el-radio label="orderNo">订单号</el-radio>
@@ -32,7 +29,7 @@
       </el-form>
     </fieldset>
     <!--  查询时间和产品  -->
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -15px;" >
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -25px;" >
       <el-form-item :label="'录入日期:'">
         <el-date-picker class="el-time-width"
                         style=""
@@ -67,7 +64,7 @@
     </el-form>
 
     <!-- 排产信息   -->
-    <fieldset class="customer-field" style="margin-top: 10px; width: 612px; padding: 0.125em;" >
+    <fieldset class="customer-field" style="margin-top: 0px; width: 612px; padding: 0.125em;" >
       <legend>排产信息</legend>
       <!--  排产日期  -->
       <el-form :inline="true" label-position="top" label-width="100px"  style="margin-top: 5px;">
@@ -136,9 +133,9 @@
 
     </fieldset >
     <!--  机台班次信息  -->
-    <el-main style="margin-left: 770px; margin-top: -255px; width: 452px;">
+    <el-main style="margin-left: 770px; margin-top: -235px; width: 452px;">
       <el-table
-        height="235"
+        height="215"
         :data="resourceShiftList"
         border
         v-loading="dataListLoading"
@@ -221,7 +218,7 @@
       </el-table>
     </el-main>
     <!--  工单明细表信息  -->
-    <el-main style="margin-left: -20px; margin-top: -35px; width: 104%;">
+    <el-main style="margin-top: -15px; width: 104%; padding: 0px;">
       <el-form :inline="true"  label-position="top" label-width="100px">
         <el-form-item :label="'明细记录'">
         </el-form-item>
@@ -1804,7 +1801,7 @@ export default {
 
   mounted() {
     this.$nextTick(() => {
-      this.height = (window.innerHeight - 405) / 2;
+      this.height = (window.innerHeight - 360) / 2;
     })
   },
   methods: {

src/views/modules/yieldReport/com_merge_roll.vue

@@ -131,6 +131,7 @@ export default {
       this.pageData.operatorId = operatorData.operatorId;
       this.pageData.newRollNo = '';
       this.pageData.newRollQty = 0;
+      this.pageData.totalQty = 0;
       //执行获取页面参数的功能
       this.refreshPageData();
       //自动获取焦点
@@ -201,7 +202,13 @@ export default {
         this.pageData.newRollQty = 0;//重新赋值
         return false;
       }
-      debugger;
+      //判断卷号是否相同
+      if (this.pageData.rollNo === this.pageData.newRollNo) {
+        this.$message.error('相同卷号无法合并!');
+        this.pageData.newRollNo = '';
+        return false;
+      }
+
       let requestData = {
         'site': this.pageData.site,
         'orderNo': this.pageData.orderNo,