FQC排产的页面

src/views/modules/schedule/order_schedule_fqc.vue

@@ -23,7 +23,7 @@
             <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 90px"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4" style="margin-left: -25px;">
+        <el-col :span=4 style="margin-left: -25px;">
           <el-form-item :label="'加工中心名称:'">
             <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 120px"></el-input>
           </el-form-item>
@@ -59,7 +59,7 @@
     </el-form>
 
     <!-- 排产信息   -->
-    <fieldset class="customer-field" style="margin-top: -80px; width: 140px; height: 95px; padding: 0.125em;" >
+    <fieldset class="customer-field" style="margin-top: -85px; width: 140px; height: 95px; padding: 0.125em;">
       <legend>排产日期</legend>
       <el-form style="margin-left: 10px; height: 60px;">
         <el-row style="margin-top: 10px; width: 120px; height: 20px;">
@@ -106,35 +106,42 @@
       </el-form>
     </fieldset>
 
-    <!--  工单主表信息  -->
-    <el-main style="margin-left: -20px; margin-top: 5px; width: 104%;">
-      <el-form :inline="true"  label-position="top" label-width="100px">
-        <el-form-item :label="'主记录'">
-        </el-form-item>
-        <el-dropdown class="customer-dropdown" @command="handleCommand">
-          <el-button type="primary">
-            主菜单<i class="el-icon-arrow-down el-icon--right"></i>
+    <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 100%;">
+      <el-tabs v-model="activeTable" style="margin-top: 0px;"
+               type="border-card" @tab-click="tabClick" class="customer-tab">
+        <el-tab-pane label="排产" name="scheduling">
+          <fieldset class="customer-mid-fieldset" style="width: 50%; margin-left: -15px; margin-top: -15px;">
+            <legend>可用操作员</legend>
+            <el-row>
+              <el-col :span="8">
+                <el-button class="customer-bun-mid" type="primary" @click=""
+                           style="margin-left: 10px; margin-bottom: 5px;">
+                  排产
                 </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item class="customer-li" command="分批排产">分批排产</el-dropdown-item>
-            <el-dropdown-item class="customer-li"  command="重新排产">重新排产</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-
-
-      </el-form>
-      <el-table
-        :height="height"
-        :data="shopOrderList"
+              </el-col>
+              <el-col :span="8">
+                <el-button class="customer-bun-mid" type="primary" @click=""
+                           style="margin-left: 10px; margin-bottom: 5px;">
+                  刷新数据
+                </el-button>
+              </el-col>
+              <el-col :span="8">
+                <el-button class="customer-bun-max" type="primary" @click=""
+                           style="margin-left: 10px; margin-bottom: 5px;">
+                  虚拟机台排产
+                </el-button>
+              </el-col>
+            </el-row>
+            <el-container>
+              <el-main class="customer-main">
+                <el-table class="customer-left-table"
+                          :height="tableHeight" :width="tableWidth"
+                          :data="operatorList"
                           border
-        ref="routingTable"
-        @row-click="setCurrentRoutingRow"
-        :row-class-name="routingRowClassName"
-        @row-dblclick="startScheduleOperation"
                           v-loading="dataListLoading"
-        style="margin-top: -20px; width: 100%;">
+                          style="margin-left: -15px; margin-top: -5px;">
                   <el-table-column
-          v-for="(item,index) in columnOrderArray" :key="index"
+                    v-for="(item,index) in columnOperatorArray" :key="index"
                     :sortable="item.columnSortable"
                     :prop="item.columnProp"
                     :header-align="item.headerAlign"
@@ -151,24 +158,36 @@
                   </el-table-column>
                 </el-table>
               </el-main>
-    <!--  工单明细表信息  -->
-    <el-main style="margin-left: -20px; margin-top: -35px; width: 104%;">
-      <el-form :inline="true"  label-position="top" label-width="100px">
-        <el-form-item :label="'明细记录'">
-        </el-form-item>
-      </el-form>
-      <el-table
-        :height="height"
-        :data="orderScheduleList"
+            </el-container>
+          </fieldset>
+
+
+          <fieldset class="customer-right-field">
+            <legend>已排产记录</legend>
+            <el-row>
+              <el-col :span="8">
+                <el-button class="customer-bun-mid" type="primary" @click=""
+                           style="margin-left: 10px; margin-bottom: 5px;">
+                  上移
+                </el-button>
+              </el-col>
+              <el-col :span="8">
+                <el-button class="customer-bun-mid" type="primary" @click=""
+                           style="margin-left: 10px; margin-bottom: 5px;">
+                  下移
+                </el-button>
+              </el-col>
+            </el-row>
+            <el-container>
+              <el-main class="customer-main">
+                <el-table class="customer-left-table"
+                          :height="tableHeight" :width="tableWidth"
+                          :data="operatorList"
                           border
-        highlight-current-row
-        ref="scheduleTable"
-        @row-click="setCurrentSchedulingRow"
-        @row-dblclick="warnCancelScheduleConfirm"
                           v-loading="dataListLoading"
-        style="margin-top: -20px; width: 100%;">
+                          style="margin-left: -15px; margin-top: -5px;">
                   <el-table-column
-          v-for="(item,index) in columnOrderScheduleArray" :key="index"
+                    v-for="(item,index) in columnOperatorArray" :key="index"
                     :sortable="item.columnSortable"
                     :prop="item.columnProp"
                     :header-align="item.headerAlign"
@@ -185,6 +204,13 @@
                   </el-table-column>
                 </el-table>
               </el-main>
+            </el-container>
+          </fieldset>
+        </el-tab-pane>
+        <el-tab-pane label="待排产清单" name="wait_schedule">
+        </el-tab-pane>
+      </el-tabs>
+    </fieldset>
 
     <!--列表的组件-->
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
@@ -211,7 +237,6 @@
     </comSplitSchedule>
 
 
-
   </div>
 </template>
 
@@ -232,9 +257,10 @@ import {
 export default {
   data() {
     return {
-      height: 200,
+      tableHeight: 0,
+      tableWidth: 0,
       tagNo: '',
-      showRoutingMenu: false,
+      activeTable: '',
       showScheduleMenu: false,
       showSplitScheduleFlag: false,
       scheduleIndex: -1,
@@ -242,7 +268,6 @@ export default {
       modelInputFlag: true,
       currentRoutingRow: {},
       currentSchedlingRow: {},
-      selectList: [],
       pageData: {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
@@ -263,6 +288,153 @@ export default {
         sortField: '',
         status: 1
       },
+      operatorList: [],
+      columnOperatorArray: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303Operator',
+          tableId: "5303Operator",
+          tableName: "操作员表",
+          columnProp: "operatorId",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "员工编号",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303Operator',
+          tableId: "5303Operator",
+          tableName: "操作员表",
+          columnProp: "operatorName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "员工姓名",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303Operator',
+          tableId: "5303Operator",
+          tableName: "操作员表",
+          columnProp: "operatorId",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "最后排产时间",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303Operator',
+          tableId: "5303Operator",
+          tableName: "操作员表",
+          columnProp: "operatorName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "效率",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303Operator',
+          tableId: "5303Operator",
+          tableName: "操作员表",
+          columnProp: "operatorName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "排产数量",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303Operator',
+          tableId: "5303Operator",
+          tableName: "操作员表",
+          columnProp: "operatorName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "排产数量",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303Operator',
+          tableId: "5303Operator",
+          tableName: "操作员表",
+          columnProp: "operatorName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "工作日历",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5303,
+          serialNumber: '5303Operator',
+          tableId: "5303Operator",
+          tableName: "操作员表",
+          columnProp: "operatorName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "虚拟机台",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        }
+      ],
       shopOrderList: [],
       orderScheduleList: [],
       dataListLoading: false,
@@ -1703,21 +1875,18 @@ export default {
 
   mounted() {
     this.$nextTick(() => {
-      this.height = (window.innerHeight - 405) / 2;
-    })
+      this.tableHeight = (window.innerHeight - 300);
+      this.tableWidth = (window.innerWidth - 100) / 2;
+    });
+    //设置当前的动态高度
+
   },
   methods: {
-    /*获取机台班次信息的方法*/
-    getResourceShiftData() {
-      let queryData = {
-        site: this.$store.state.user.site,
-        workCenterNo: this.pageData.workCenterNo,
-        resourceId: this.pageData.resourceId,
-        scheduleDate: this.pageData.scheduleDate
-      }
-      getResourceRestList(queryData).then(({data}) => {
-        this.resourceShiftList = data.rows
-      })
+
+    //列表表格选择替换
+    tabClick(tab, event) {
+      //刷新列表数据
+      //this.refreshCurrentTabTable();
     },
 
     /*获取工单信息*/
@@ -1745,7 +1914,6 @@ export default {
 
     /*刷新页面table*/
     refreshPageTables() {
-      this.getResourceShiftData();
       this.getShopOrderList();
       this.getOrderScheduleList();
     },
@@ -2007,8 +2175,6 @@ export default {
 
   },
   created() {
-    //执行查询休息时间数据
-    this.getResourceShiftData();
     //查询工单的数据
     this.getShopOrderList();
     //查询派工的数据
@@ -2024,6 +2190,7 @@ export default {
 .customer-card .el-form-item__content {
   margin-top: -15px;
 }
+
 .customer-card .el-form-item {
   height: 22px;
 }
@@ -2036,11 +2203,13 @@ export default {
 div.el-time-width {
   width: 110px !important;
 }
+
 /* 全局时间右边框*/
 .customer-css input.el-input__inner {
   height: 22px !important;
   padding-right: 0px !important;
 }
+
 /* 控制el-card标签的数据*/
 div.customer-el-card {
   margin-left: 110px;
@@ -2048,6 +2217,7 @@ div.customer-el-card {
   height: 20px;
   width: 60px;
 }
+
 /* 颜色控制 */
 div.customer-el-card-pink {
   background: #FF00FF;
@@ -2079,9 +2249,10 @@ div.customer-el-card-blue {
 }
 
 .customer-css .customer-bun-max {
-  width: 80px;
+  width: 85px;
   text-align: center;
 }
+
 /*当前按钮的通用样式*/
 .customer-css .el-button--medium {
   padding: 5px 5px;
@@ -2118,5 +2289,24 @@ div.customer-el-card-blue {
 .el-input /deep/ .el-icon-time {
   display: none;
 }
-/*控制上下间距*/
+
+/* el-main的样式 */
+.customer-css .customer-main {
+  width: calc(50vw - 300px) !important;
+  margin-left: -15px;
+  margin-top: -10px;
+  margin-right: -45px;
+  margin-bottom: -20px;
+}
+
+.customer-css .customer-left-table {
+  margin-top: -20px;
+}
+
+/*调整右边field的样式*/
+.customer-css .customer-right-field{
+  margin-left: 49%;
+  margin-top: calc(-100vh + 239px);
+  width: 52%;
+}
 </style>

src/views/modules/yieldReport/com_replace_material.vue

@@ -212,8 +212,8 @@ export default {
       let timeDiff = this.timeArray[len - 1] - this.timeArray[0];
       //判断时间是否在范围之内
       if(timeDiff > 1000){
-        this.$message.error('请扫码输入!');
-        return false;
+       // this.$message.error('请扫码输入!');
+        //return false;
       }
       //判断null和空字符串
       if (this.pageData.rmRollNo == null || this.pageData.rmRollNo === '') {