chris пре 3 година
родитељ
комит
6dffd438e6

+ 102 - 11
src/views/modules/check/ibc-export.vue

@@ -5,21 +5,110 @@
       width="70%"
       :close-on-click-modal="false"
       :visible.sync="visible">
-      <div class="row" id="pdfDom" style="padding-top: 55px;background-color:#fff;">
-        <h1 align="center">入  厂  检  验  报  告</h1>
-        <table border="1" align="center" cellpadding="8" cellspacing="0" style="margin-top: 60px;font-family: SimSun,serif;font-size: large">
+      <div class="my-table" id="pdfDom" style="padding-top: 55px;background-color:#fff;">
+        <h1 style="text-align: center">入  厂  检  验  报  告</h1>
+        <!-- border="1" -->
+        <table align="center" border="1" cellpadding="8" cellspacing="0"
+               style="margin-top: 60px;font-family: SimSun,serif;font-size: large;text-align: center">
           <tbody align="center">
           <el-row>
             <th style="width: 100px">供方单位</th>
             <td style="width: 250px" colspan="1" rowspan="1">重庆木之科技有限公司</td>
             <th style="width: 100px">批次号</th>
-            <td style="width: 380px" colspan="1" rowspan="1">S100-078</td>
+            <td style="width: 400px" colspan="1" rowspan="1">S100-078</td>
           </el-row>
           <el-row>
             <th style="width: 100px">产品名称</th>
             <td style="width: 250px" colspan="1" rowspan="1"></td>
             <th style="width: 100px">产品图号</th>
-            <td style="width: 380px" colspan="1" rowspan="1"></td>
+            <td style="width: 400px" colspan="1" rowspan="1"></td>
+          </el-row>
+          <el-row>
+            <th style="width: 100px">来料类型</th>
+            <td align="left" style="width: 750px">
+              <el-checkbox class="my-cb" label="原、辅材料" style="margin-left: 30px"></el-checkbox>
+              <el-checkbox class="my-cb" label="外协件"></el-checkbox>
+              <el-checkbox class="my-cb" label="其他"></el-checkbox>
+            </td>
+          </el-row>
+          <el-row>
+            <th style="width: 100px">检验设备(勾选)</th>
+            <td align="left" style="width: 750px">
+              <el-checkbox class="my-cb" label="1.游标卡尺" style="margin-left: 30px"></el-checkbox>
+              <el-checkbox class="my-cb" label="2.千分尺"></el-checkbox>
+              <el-checkbox class="my-cb" label="3.高度尺"></el-checkbox>
+              <el-checkbox class="my-cb" label="4.百分表"></el-checkbox>
+              <el-checkbox class="my-cb" label="5.R规"></el-checkbox>
+              <el-checkbox class="my-cb" label="6.塞规"></el-checkbox>
+              <el-checkbox class="my-cb" label="7.游标角度尺"></el-checkbox>
+              <el-checkbox class="my-cb" label="8.三坐标"></el-checkbox>
+              <el-checkbox class="my-cb" label="9.模具"></el-checkbox>
+              <el-checkbox class="my-cb" label="10.卷尺"></el-checkbox>
+              <el-checkbox class="my-cb" label="11.夹具"></el-checkbox>
+              <el-checkbox class="my-cb" label="12.目测"></el-checkbox>
+              <el-checkbox class="my-cb" label="13.组合测量"></el-checkbox>
+              <el-checkbox class="my-cb" label="14.精密测量"></el-checkbox>
+              <el-checkbox class="my-cb" label="15.敲击"></el-checkbox>
+              <el-checkbox class="my-cb" label="16.测厚仪"></el-checkbox>
+              <el-checkbox class="my-cb" label="17.其他"></el-checkbox>
+            </td>
+          </el-row>
+          <el-table
+          :data="checkList"
+          style="width: 850px">
+            <el-table-column
+              label="序号"
+              type="index"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              prop="-"
+              header-align="center"
+              align="center"
+              label="检验项目">
+            </el-table-column>
+            <el-table-column
+              prop="-"
+              header-align="center"
+              align="center"
+              label="技术指标">
+            </el-table-column>
+            <el-table-column
+              prop="-"
+              header-align="center"
+              align="center"
+              label="实测记录">
+            </el-table-column>
+            <el-table-column
+              prop="-"
+              header-align="center"
+              align="center"
+              label="交检数">
+            </el-table-column>
+            <el-table-column
+              prop="-"
+              header-align="center"
+              align="center"
+              label="合格数">
+            </el-table-column>
+            <el-table-column
+              prop="-"
+              header-align="center"
+              align="center"
+              label="备注">
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <th style="width: 850px; text-align: left">检验结论:</th>
+          </el-row>
+          <el-row style="height: 200px">
+
+          </el-row>
+          <el-row>
+            <th style="width: 100px">检验员:</th>
+            <td style="width: 400px"></td>
+            <th style="width: 100px">审核:</th>
+            <td style="width: 250px"></td>
           </el-row>
           </tbody>
         </table>
@@ -37,25 +126,27 @@
     name: 'ibc-export',
     data () {
       return {
-        htmlTitle: '测试',
+        htmlTitle: '入厂检验报告',
         visible: false,
         dataForm: {},
+        checkList: [],
         size: ''
       }
     },
     methods: {
       async init (dataForm) {
-        console.log('dataForm = ' + JSON.stringify(dataForm))
+        // console.log('dataForm = ' + JSON.stringify(dataForm))
         this.dataForm = dataForm
         this.visible = true
-      },
-      exportPdf () {
-        // todo
       }
     }
   }
 </script>
 
 <style scoped>
-
+  .my-cb{
+    width: 100px;
+    font-family: SimSun,serif;
+    font-size: large;
+  }
 </style>

+ 2 - 2
src/views/modules/cus/contract-add-or-update.vue

@@ -6,8 +6,8 @@
       :close-on-click-modal="false"
       :visible.sync="visible">
       <!-- 工作流 -->
-      <div v-show="display">
-        <el-steps :active="dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2" align-center style="margin-bottom: 20px">
+      <div v-show="display && dataForm.workFlowBusinessExt">
+        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
           <template v-for="(item, i) in stepList">
             <el-step :icon="item.icon" :title="item.title" :description="item.description"></el-step>
           </template>

+ 2 - 2
src/views/modules/order/order-add-or-update.vue

@@ -6,8 +6,8 @@
       :close-on-click-modal="false"
       :visible.sync="visible">
       <!-- 工作流 -->
-      <div v-show="display">
-        <el-steps :active="dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2" align-center style="margin-bottom: 20px">
+      <div v-show="display && dataForm.workFlowBusinessExt">
+        <el-steps :active="dataForm.workFlowBusinessExt?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
           <template v-for="(item, i) in stepList">
             <el-step :icon="item.icon" :title="item.title" :description="item.description"></el-step>
           </template>