0412 新看板

3 years ago · 0c81149466
8 changed files with 124 additions and 43 deletions
--- a/src/views/modules/board/SORoutingBoardForBaoZhuang.vue
+++ b/src/views/modules/board/SORoutingBoardForBaoZhuang.vue
@ -42,7 +42,7 @@
          prop="operationDesc"
          header-align="center"
          align="left"
-          min-width="80"
+          min-width="25"
          label="工序名称">
        </el-table-column>
        <el-table-column
@ -56,7 +56,7 @@
          prop="partDesc"
          header-align="center"
          align="left"
-          min-width="100"
+          min-width="70"
          label="产品名称">
        </el-table-column>
        <el-table-column
@ -74,11 +74,25 @@
          label="报工数量">
        </el-table-column>
        <el-table-column
-          prop="qtyApprove"
+          prop="text2"
+          header-align="center"
+          align="right"
+          min-width="30"
+          label="袋装数量">
+        </el-table-column>
+        <el-table-column
+          prop="num2"
          header-align="center"
          align="right"
          min-width="30"
-          label="合格数量">
+          label="箱装数量">
+        </el-table-column>
+        <el-table-column
+          prop="text1"
+          header-align="center"
+          align="right"
+          min-width="45"
+          label="纸箱规格">
        </el-table-column>
        <el-table-column
          prop="lastApproveQty"
--- a/src/views/modules/board/SORoutingBoardForShuiZhu.vue
+++ b/src/views/modules/board/SORoutingBoardForShuiZhu.vue
@ -34,29 +34,29 @@
          prop="itemNo"
          header-align="center"
          align="left"
-          min-width="30"
+          min-width="25"
          style="font-size: 20px"
-          label="工序编号">
+          label="工序号">
        </el-table-column>
        <el-table-column
          prop="operationDesc"
          header-align="center"
          align="left"
-          min-width="80"
+          min-width="25"
          label="工序名称">
        </el-table-column>
        <el-table-column
          prop="partNo"
          header-align="center"
          align="left"
-          min-width="50"
+          min-width="45"
          label="产品编号">
        </el-table-column>
        <el-table-column
          prop="partDesc"
          header-align="center"
          align="left"
-          min-width="100"
+          min-width="70"
          label="产品名称">
        </el-table-column>
        <el-table-column
@ -74,11 +74,18 @@
          label="报工数量">
        </el-table-column>
        <el-table-column
-          prop="qtyApprove"
+          prop="text1"
          header-align="center"
-          align="right"
-          min-width="30"
-          label="合格数量">
+          align="left"
+          min-width="50"
+          label="工艺备注-水煮">
+        </el-table-column>
+        <el-table-column
+          prop="text2"
+          header-align="center"
+          align="left"
+          min-width="50"
+          label="工艺备注-烘烤">
        </el-table-column>
        <el-table-column
          prop="lastApproveQty"
--- a/src/views/modules/board/SeqNoForLiuHua.vue
+++ b/src/views/modules/board/SeqNoForLiuHua.vue
@ -26,7 +26,7 @@
          prop="seqNo"
          header-align="center"
          align="left"
-          min-width="25"
+          min-width="20"
          style="font-size: 20px"
          label="派工单号">
        </el-table-column>
@ -34,7 +34,7 @@
          prop="orderNo"
          header-align="center"
          align="left"
-          min-width="50"
+          min-width="40"
          style="font-size: 20px"
          label="生产订单号">
        </el-table-column>
@ -42,14 +42,14 @@
          prop="partNo"
          header-align="center"
          align="left"
-          min-width="35"
+          min-width="30"
          label="产品编号">
        </el-table-column>
        <el-table-column
          prop="partDesc"
          header-align="center"
          align="left"
-          min-width="90"
+          min-width="60"
          label="产品名称">
        </el-table-column>
        <el-table-column
@ -60,24 +60,38 @@
          label="需求数量">
        </el-table-column>
        <el-table-column
-          prop="qtyReported"
+          prop="text1"
          header-align="center"
-          align="right"
-          min-width="30"
-          label="报工数量">
+          align="left"
+          min-width="35"
+          label="材料规格">
        </el-table-column>
        <el-table-column
-          prop="qtyApprove"
+          prop="text2"
          header-align="center"
-          align="right"
-          min-width="30"
-          label="合格数量">
+          align="left"
+          min-width="25"
+          label="硬度">
+        </el-table-column>
+        <el-table-column
+          prop="text3"
+          header-align="center"
+          align="left"
+          min-width="20"
+          label="颜色">
+        </el-table-column>
+        <el-table-column
+          prop="num1"
+          header-align="center"
+          align="left"
+          min-width="20"
+          label="毛重">
        </el-table-column>
        <el-table-column
          prop="planStartTime"
          header-align="center"
          align="left"
-          min-width="50"
+          min-width="45"
          label="生产日期">
        </el-table-column>
        <el-table-column
--- a/src/views/modules/production/dailyPlanReport.vue
+++ b/src/views/modules/production/dailyPlanReport.vue
@ -276,6 +276,7 @@

      search(){
        getHunlianTaskData(this.searchData).then(({data}) => {
+
          this.tableData = data.rows;
        })
      },
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@ -295,7 +295,7 @@
        <el-button type="primary" @click="continueModalFlag = false">关闭</el-button>
      </el-footer>
    </el-dialog>
-    <el-dialog @close="closeDialog" :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="报告信息" :visible.sync="setUp.reviewFlag" width="615px">
+    <el-dialog class="big" @close="closeDialog" :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="报告信息" :visible.sync="setUp.reviewFlag" width="615px">
      <el-form :inline="true" label-position="top">
        <el-form-item label="派工单号">
          <el-input style="width: 130px;" :disabled="setUp.disabled"  onkeyup="this.value = this.value.toUpperCase()"  v-model="saveHeaderData.seqNo"></el-input>
@ -392,6 +392,14 @@
 <!--          <el-input type="number" style="width: 178px;"  v-model="KGRework" :disabled="factorFlag"  @blur="KGReworkBlur()"></el-input>-->
 <!--        </el-form-item>-->
      </el-form>
+      <el-form :inline="true" label-position="top">
+        <el-form-item label="框重(KG)">
+          <el-input  type="number"  class="input_left" style="width: 178px;"   v-model="saveHeaderData.boxWeight" ></el-input>
+        </el-form-item>
+        <el-form-item label="停机原因">
+          <el-input style="width: 370px;"  v-model="saveHeaderData.shutdownReason"></el-input>
+        </el-form-item>
+      </el-form>
      <fieldset class="customer-fieldset" style="width: 597px;margin-left: -10px;">
        <legend class="customer-legend">不良品分析</legend>
        <el-form :inline="true" label-position="top">
@ -422,11 +430,6 @@
 <!--          <el-input-number style="width: 178px;text-align: right;"  v-model="saveHeaderData.cleaningTime" size="medium" :min="0" :controls="false"></el-input-number>-->
        </el-form-item>
      </el-form>
-      <el-form :inline="true" label-position="top">
-        <el-form-item label="停机原因">
-          <el-input style="width: 560px;"  v-model="saveHeaderData.shutdownReason"></el-input>
-        </el-form-item>
-      </el-form>
      <el-form :inline="true" label-position="top">
        <el-form-item label="备注">
          <el-input style="width: 560px;"  v-model="saveHeaderData.remark"></el-input>
@ -438,6 +441,7 @@
      <el-button type="primary" :disabled="setUp.saveButton" @click="saveReport()">确定</el-button>
    </span>
    </el-dialog>
+
    <el-dialog  :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="查看SOP" :visible.sync="sopFlag" width="80%">
       <el-row>
         <el-col :span="8">
@ -522,6 +526,7 @@
        KGApprove:'',
        KGRework:'',
        saveHeaderData: {
+          boxWeight:0,
          qtyRequire:'',
          qtyUnApprove:'',
          site: '',
@ -682,6 +687,12 @@
          })
          return
        }
+        if (this.saveHeaderData.boxWeight == null || this.saveHeaderData.boxWeight === '') {
+          this.$alert('请输入框重！', '错误信息', {
+            confirmButtonText: '确定'
+          })
+          return
+        }
        saveGenerateReportForSchedule(this.saveHeaderData).then(({data}) => {
          if (data.code == 0) {
            this.$message.success(data.msg)
@ -922,6 +933,7 @@
            this.saveHeaderData.operatorName=currentData.operatorName;
            this.saveHeaderData.qtyRequire=currentData.qtyRequired;
            this.saveHeaderData.userId=this.$store.state.user.name;
+            this.saveHeaderData.boxWeight=0;
            this.qty1='';
            this.qty2 ='';
            this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
@ -1108,5 +1120,17 @@
  input[type='number'] {
    -moz-appearance: textfield !important;
  }
+  .big /deep/ .el-form-item__label {
+    font-size: 17px;
+  }
+
+  .big /deep/ .el-input__inner {
+    height: 22px !important;
+    font-size: 17px;
+  }

+  .big /deep/ .el-dialog__title {
+    font-size: 17px;
+    font-weight: bold;
+  }
 </style>
--- a/src/views/modules/production/inspect.vue
+++ b/src/views/modules/production/inspect.vue
@ -95,7 +95,7 @@
          <a v-if="scope.row.inspectedFlag=='Y'" type="text" size="small" @click="toPrint(scope.row)">补打结果</a>
          <a v-if="scope.row.inspectedFlag=='Y'" type="text" size="small" @click="cancelInspectResult(scope.row)">取消检验结果</a>
          <a v-if="scope.row.toTypeFlag=='混炼胶入库'" type="text" size="small" @click="detailModal(scope.row)">混炼明细</a>
-          <a v-if="scope.row.toTypeFlag=='硫化检验单'&&scope.row.inspectedFlag=='N'" type="text" size="small" @click="cancelInspect(scope.row)">删除检验单</a>
+          <a v-if="scope.row.toTypeFlagDb=='I'&&scope.row.inspectedFlag=='N'" type="text" size="small" @click="cancelInspect(scope.row)">删除检验单</a>
        </template>
      </el-table-column>
      <el-table-column
@ -109,7 +109,7 @@
        prop="transNo"
        header-align="center"
        align="left"
-        min-width="100"
+        min-width="130"
        label="检验单号">
      </el-table-column>
      <el-table-column
@ -119,6 +119,13 @@
        min-width="130"
        label="生成日期">
      </el-table-column>
+      <el-table-column
+        prop="shiftNo"
+        header-align="center"
+        align="left"
+        min-width="60"
+        label="班次">
+      </el-table-column>
      <el-table-column
        prop="orderNo"
        header-align="center"
@ -143,8 +150,8 @@
      <el-table-column
        prop="toTypeFlag"
        header-align="center"
-        align="right"
-        min-width="80"
+        align="left"
+        min-width="90"
        label="检验单类型">
      </el-table-column>
      <el-table-column
@ -370,6 +377,7 @@
          partDescSpec:'',
          site:'',
          toTypeFlag:'',
+          toTypeFlagDb:'',
          inspectResult:'',
          inspectRemark:'',
          operatorName:'',
@ -443,6 +451,7 @@
        this.inspectData.partDescSpec=row.partDescSpec;
        this.inspectData.site=row.site;
        this.inspectData.toTypeFlag=row.toTypeFlag;
+        this.inspectData.toTypeFlagDb=row.toTypeFlagDb;
        this.inspectData.transDate=row.transDate;
        this.inspectData.transQty=row.transQty;
        this.inspectData.operatorName=row.operatorName;
@ -463,6 +472,7 @@
          if (data && data.code === 0) {
            this.search ();
            let printData=data.row
+            printData.userId=this.$store.state.user.name
            if(printData.toTypeFlag=='混炼胶入库'){
              printData.seqNo=printData.orderNo
            }
@ -539,6 +549,7 @@
        inspectPrint(row).then(({data}) => {
          if (data && data.code === 0) {
            let printData=data.row
+            printData.userId=this.$store.state.user.name
            if(printData.toTypeFlag=='混炼胶入库'){
              printData.seqNo=printData.orderNo
            }
--- a/src/views/modules/production/print_inspect_label.js
+++ b/src/views/modules/production/print_inspect_label.js
@ -15,7 +15,7 @@ export function printInspectLabel(printList) {
      LODOP.ADD_PRINT_TEXT(88,8,108,25,"Part:");
      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(88,50,200,50,printData.partNo+'|'+printData.partDesc);
+      LODOP.ADD_PRINT_TEXT(88,50,190,50,printData.partNo+'|'+printData.partDesc);
      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
      LODOP.ADD_PRINT_TEXT(153,8,128,24,"Operator:");
@ -70,18 +70,23 @@ export function printInspectLabel(printList) {
      LODOP.ADD_PRINT_TEXT(175,265,110,20,"工序:"+printData.itemDesc);
      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(63,259,100,25,"检验结果：");
+      LODOP.ADD_PRINT_TEXT(63,259,100,25,"检验结果:");
      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
      LODOP.SET_PRINT_STYLEA(0,"Bold",0);
-      LODOP.ADD_PRINT_TEXT(85,249,123,69,printData.remark);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",27);
+      LODOP.ADD_PRINT_TEXT(95,233,148,66,printData.remark);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",33);
      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
+      LODOP.ADD_PRINT_TEXT(42,249,93,25,"Inspector:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(42,329,59,25,printData.userId);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
    }
    // LODOP.PRINT_DESIGN();
-    // LODOP.PREVIEW();
-    LODOP.PRINT();
+    LODOP.PREVIEW();
+    // LODOP.PRINT();
    console.log("操作成功！")
  }
 }
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@ -425,6 +425,11 @@

      search () {
        getSOScheduleRoutingData(this.searchData).then(({data}) => {
+          if( data.rows){
+            for (let i = 0; i <data.rows.length ; i++) {
+              data.rows[i].weight= Number(data.rows[i].weight.toFixed(2))
+            }
+          }
          this.tableData = data.rows
        })
      },