生产管理监控联调

src/views/productionManagement/productionMonitoring.vue

@@ -122,6 +122,9 @@
       :itemData="itemData"
       @closeDialog="closeDialog"
     ></productionMonitoringDialog>
+
+    <!-- 生产监控 -->
+    <workRate v-if="isWorkRateOpen" :showDialog="isWorkRateOpen" @closeDialog="closeDialog" :rowItem="rowItem"></workRate>
   </basic-container>
 </template>
 
@@ -132,7 +135,7 @@ import batchesDialog from './components/batchesDialog.vue';
 import closedDialog from './components/closedDialog.vue';
 import abnormalDialog from './components/abnormalDialog.vue';
 import productionMonitoringDialog from './components/productionMonitoringDialog.vue';
-
+import  workRate  from "@/views/workRate/index.vue";
 import { getList,turnType } from '@/api/productionManagement/productionMonitoring';
 
 export default {
@@ -143,9 +146,11 @@ export default {
     closedDialog,
     abnormalDialog,
     productionMonitoringDialog,
+    workRate,
   },
   data() {
     return {
+      isWorkRateOpen: true,
       isPriorityOpen: false,
       showAbnormal: false,
       showOemDialog: false,
@@ -645,7 +650,7 @@ export default {
     // 生产监控
     clickProduction(row) {
       this.rowItem = row;
-      this.monitorDialog = true;
+      this.isWorkRateOpen = true;
     },
     // 打印标签
     handlePrintTags() {
@@ -689,7 +694,7 @@ export default {
     // 关闭弹窗
     closeDialog(type) {
       this.showOemDialog = false;
-      this.monitorDialog = false;
+      this.isWorkRateOpen = false;
       this.showBatches = false;
       this.showClose = false;
       this.showAbnormal = false;

src/views/workRate/index.vue

@@ -1,11 +1,90 @@
 <template>
-  <el-dialog title="生产监控" append-to-body :modelValue="openShow" width="30%" @close="closeDialog" fullscreen>
-    <template #footer>
+  <el-dialog
+    title="生产监控"
+    append-to-body
+    :modelValue="openShow"
+    width="30%"
+    @close="closeDialog"
+    fullscreen
+  >
+    <el-collapse v-model="activeName" accordion>
+      <el-collapse-item title="订单信息" name="1">
+        <div style="margin: 30px 0 10px 0; display: flex; flex-wrap: wrap">
+          <div style="width: 20%; margin-bottom: 20px">订单编码：{{ rowItem.orderWoCode }}</div>
+          <div style="width: 20%; margin-bottom: 20px">流程卡号：{{ rowItem.cardNo }}</div>
+          <div style="width: 20%; margin-bottom: 20px">
+            零件号：{{ rowItem.partCode }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">批次号：{{ rowItem.batchNo }}</div>
+          <div style="width: 20%; margin-bottom: 20px">
+            订单数量：{{ rowItem.poQty }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">状态：{{ rowItem.runStatusTitle }}</div>
+          <div style="width: 20%; margin-bottom: 20px">优先级：{{ rowItem.priorityTitle }}</div>
+          <div style="width: 20%; margin-bottom: 20px">
+            调度员：{{ rowItem.dispatcher === null ? '' : rowItem.userName }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">
+            订单下达时间：{{ rowItem.sendDownTime }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">生产数量：{{ rowItem.makeQty }}</div>
+          <div style="width: 20%; margin-bottom: 20px">零件名称：{{ dsPart.partName }}</div>
+          <div style="width: 20%; margin-bottom: 20px">产品型号：{{ dsPart.productType }}</div>
+          <div style="width: 20%; margin-bottom: 20px">硬度：{{ dsPart.hardness }}</div>
+          <div style="width: 20%; margin-bottom: 20px">计划完工时间：{{ rowItem.planEndDate }}</div>
+          <div style="width: 20%; margin-bottom: 20px">
+            需求交期：{{ rowItem.priority === 4 ? rowItem.demandDate : '' }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">镀种：{{ dsPart.plate }}</div>
+          <div style="width: 20%; margin-bottom: 20px">面积(dm²)：{{ dsPart.area }}</div>
+          <div style="width: 20%; margin-bottom: 20px">材料：{{ dsPart.material }}</div>
+          <div style="width: 20%; margin-bottom: 20px">
+            生产标识：{{ rowItem.prodIdent }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">
+            镀后入库时间：{{ rowItem.putStoreTime }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">标记要求：{{ dsPart.signMemo }}</div>
+          <div style="width: 20%; margin-bottom: 20px">关键信息：{{ dsPart.cruxMemo }}</div>
+          <div style="width: 20%; margin-bottom: 20px">试验数量：{{ rowItem.testQty }}</div>
+          <div style="width: 20%; margin-bottom: 20px">消耗数量：{{ rowItem.lossQty }}</div>
+          <div style="width: 20%; margin-bottom: 20px" v-if="rowItem.yieldType != 1">
+            是否印字：{{ dsPart.lettering == 1 ? '否' : '是' }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">工艺路线：{{ rowItem.craftWay }}</div>
+          <div style="width: 20%; margin-bottom: 20px" v-if="rowItem.runStatus == 19">
+            返工单号：{{ rowItem.qcReworkCode }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px" v-if="rowItem.yieldType == 1">
+            涂色标个数：{{ dsPart.tsbNum }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px" v-if="rowItem.yieldType == 1">
+            涂色带个数：{{ dsPart.tsdNum }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px" v-if="rowItem.yieldType == 1">
+            涂箭头个数：{{ dsPart.tjtNum }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">
+            产品系列：{{ rowItem.poProdLine }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">
+            工作订单备注：{{ rowItem.poMemo }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">
+            会议要求周期：{{ rowItem.priority === 4 ? rowItem.meetCycle : '' }}
+          </div>
+          <div style="width: 20%; margin-bottom: 20px">审理单号：{{ rowItem.rsCode }}</div>
+        </div>
+      </el-collapse-item>
+      <el-collapse-item title="工序信息" name="1"> </el-collapse-item>
+    </el-collapse>
+
+    <!-- <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
         <el-button type="primary" @click="submit">确 定</el-button>
       </span>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 <script>
@@ -16,9 +95,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    rowItem: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
+      activeName:'1',
       openShow: false,
     };
   },