入厂检验单

src/views/modules/check/ibc-add-or-update.vue

@@ -64,6 +64,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="送检数量" prop="cnt">
+              <el-input v-model="dataForm.cnt" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="padding-left: 10px">
+            <el-form-item label="合格数量" prop="qualifiedCnt">
+              <el-input-number v-model="dataForm.qualifiedCnt" :step="1" :min="0" :max="Number(dataForm.cnt)"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-form-item label="检测设备" prop="detectionEquipment">
             <el-input type="textarea" v-model="dataForm.detectionEquipment"></el-input>

src/views/modules/check/ibc-detail.vue

@@ -12,9 +12,11 @@
           <e-desc-item label="规格/图号">{{dataForm.specifications}}</e-desc-item>
           <e-desc-item label="类别">{{dataForm.materialTypeName}}</e-desc-item>
           <e-desc-item label="来源">{{dataForm.source}}</e-desc-item>
-          <e-desc-item label="来料类型">{{dataForm.inspectionType}}</e-desc-item>
+          <e-desc-item label="来料类型">{{dataForm.inspectionType?optionsTypes.find(item => item.code === dataForm.inspectionType).value:''}}</e-desc-item>
           <e-desc-item label="检验依据">{{dataForm.inspectionBasis}}</e-desc-item>
           <e-desc-item label="合格证编码">{{dataForm.qualifiedCertificateCode}}</e-desc-item>
+          <e-desc-item label="送检数量">{{dataForm.cnt}}</e-desc-item>
+          <e-desc-item label="合格数量">{{dataForm.qualifiedCnt}}</e-desc-item>
           <e-desc-item label="检测设备" span="3" style="min-height: 80px">{{dataForm.detectionEquipment}}</e-desc-item>
           <e-desc-item label="检验结论" span="3" style="min-height: 80px">{{dataForm.conclusion}}</e-desc-item>
           <e-desc-item label="备注说明" span="3" style="min-height: 80px">{{dataForm.notes}}</e-desc-item>
@@ -75,7 +77,18 @@
       return {
         visible: false,
         dataForm: {},
-        checkList: []
+        checkList: [],
+        optionsTypes: [
+          {
+            code: '1', value: '原、辅材料'
+          },
+          {
+            code: '2', value: '外协件'
+          },
+          {
+            code: '3', value: '其他'
+          }
+        ]
       }
     },
     methods: {

src/views/modules/check/ibc-export.vue

@@ -9,8 +9,8 @@
         <h1 style="text-align: center">入  厂  检  验  报  告</h1>
         <h4 style="text-align: right;margin-right: 100px;margin-top: 40px">编号： {{dataForm.inspectionCode}}</h4>
         <!-- border="1" -->
-        <table align="center" border="1" cellpadding="8" cellspacing="0"
-               style="margin-top: 10px;font-family: SimSun,serif;font-size: large;text-align: center">
+        <table align="center" cellpadding="8" cellspacing="0" border="1"
+               style="margin-top: 10px;font-family: SimSun,serif;font-size: medium;text-align: center ">
           <tbody align="center">
           <el-row>
             <th style="width: 100px">供方单位</th>
@@ -29,22 +29,20 @@
             <td align="left" style="width: 750px">
               <el-checkbox-group v-model="idsMaterial">
                 <!-- :style="item.id === 1?'margin-left: 30px':''" -->
-                <el-checkbox class="my-cb"  v-for="(item,i) in optionsMaterial" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>
+                <el-checkbox disabled class="my-cb"  v-for="(item,i) in optionsMaterial" :label="item.code" :key="item.code"><span style="color: #404040">{{item.value}}</span></el-checkbox>
               </el-checkbox-group>
             </td>
           </el-row>
           <el-row>
             <th style="width: 100px">检验设备（勾选）</th>
             <td align="left" style="width: 750px">
-<!--              <el-checkbox-group v-model="idsDevice">-->
-<!--                <el-checkbox class="my-cb" :style="item.id === 1?'margin-left: 30px':''" v-for="(item,i) in optionsDevice" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>-->
-<!--              </el-checkbox-group>-->
               {{dataForm.detectionEquipment}}
             </td>
           </el-row>
           <el-table
           :data="checkList"
-          style="width: 850px">
+          border
+          style="width: 850px; padding-top: 1px">
             <el-table-column
               label="序号"
               type="index"
@@ -88,7 +86,7 @@
             </el-table-column>
           </el-table>
           <table align="center" cellpadding="8" cellspacing="0"
-                 style="margin-top: 10px;font-family: SimSun,serif;font-size: large;text-align: center">
+                 style="margin-top: 10px;font-family: SimSun,serif;font-size: medium;text-align: center">
             <tbody align="left">
             <el-row>
               <th style="width: 850px; text-align: left">检验结论：</th>
@@ -125,92 +123,19 @@
         visible: false,
         dataForm: {},
         checkList: [],
-        idsMaterial: [1, 2],
+        idsMaterial: [],
         optionsMaterial: [
           {
-            id: 1,
-            name: '原、辅材料'
+            code: '1', value: '原、辅材料'
           },
           {
-            id: 2,
-            name: '外协件'
+            code: '2', value: '外协件'
           },
           {
-            id: 3,
-            name: '其他'
+            code: '3', value: '其他'
           }
         ],
         idsDevice: [1, 2, 10],
-        optionsDevice: [
-          {
-            id: 1,
-            name: '1.游标卡尺'
-          },
-          {
-            id: 2,
-            name: '2.千分尺'
-          },
-          {
-            id: 3,
-            name: '3.高度尺'
-          },
-          {
-            id: 4,
-            name: '4.百分表'
-          },
-          {
-            id: 5,
-            name: '5.R规'
-          },
-          {
-            id: 6,
-            name: '6.塞规'
-          },
-          {
-            id: 7,
-            name: '7.游标角度尺'
-          },
-          {
-            id: 8,
-            name: '8.三坐标'
-          },
-          {
-            id: 9,
-            name: '9.模具'
-          },
-          {
-            id: 10,
-            name: '10.卷尺'
-          },
-          {
-            id: 11,
-            name: '11.夹具'
-          },
-          {
-            id: 12,
-            name: '12.目测'
-          },
-          {
-            id: 13,
-            name: '13.组合测量'
-          },
-          {
-            id: 14,
-            name: '14.精密测量'
-          },
-          {
-            id: 15,
-            name: '15.敲击'
-          },
-          {
-            id: 16,
-            name: '16.测厚仪'
-          },
-          {
-            id: 17,
-            name: '17.其他'
-          }
-        ],
         size: ''
       }
     },
@@ -243,4 +168,18 @@
     font-family: SimSun,serif;
     font-size: large;
   }
+  /*.my-table table, .my-table table tr, .my-table table th, .my-table table td{*/
+  /*  border: 1px solid black;*/
+  /*  !*border-collapse: collapse;*!*/
+  /*}*/
+  /*.el-table td, .el-table th.is-leaf,.el-table--border, .el-table--group{*/
+  /*  border-color: black;*/
+  /*}*/
+  /*.el-table--border::after, .el-table--group::after, .el-table::before{*/
+  /*  background-color: #8a979e;*/
+  /*}*/
+
+  .el-table{
+    border-collapse: collapse;
+  }
 </style>

src/views/modules/check/in-bound-check.vue

@@ -91,6 +91,13 @@
         align="center"
         label="申请人">
       </el-table-column>
+      <el-table-column
+        prop="state"
+        header-align="center"
+        align="center"
+        :formatter="formatState"
+        label="状态">
+      </el-table-column>
       <el-table-column
         prop="notes"
         header-align="center"
@@ -107,8 +114,8 @@
         label="操作">
         <template slot-scope="scope">
           <el-button v-if="isAuth('quality:inspection:info')" type="text" size="small" @click="details(scope.row.inspectionId)">查看</el-button>
-          <el-button v-if="isAuth('quality:inspection:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.inspectionId)">处理</el-button>
-          <el-button v-if="isAuth('quality:inspection:info:report')" type="text" size="small" @click="exportPdf(scope.row.inspectionId)">导出</el-button>
+          <el-button v-if="isAuth('quality:inspection:update') && scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.inspectionId)">处理</el-button>
+          <el-button v-if="isAuth('quality:inspection:info:report') && scope.row.state === '1'" type="text" size="small" @click="exportPdf(scope.row.inspectionId)">导出</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -147,7 +154,15 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        dataListSelections: []
+        dataListSelections: [],
+        optionsState: [
+          {
+            code: '0', value: '未处理'
+          },
+          {
+            code: '1', value: '处理'
+          }
+        ]
       }
     },
     created () {
@@ -211,6 +226,12 @@
         this.$nextTick(() => {
           this.$refs.details.init(id)
         })
+      },
+      // 转换属性“状态”
+      formatState (row) {
+        if (!row.state) return ''
+        const item1 = this.optionsState.find((item) => item.code === row.state.toString())
+        return item1 ? item1.value : ''
       }
     }
   }

src/views/modules/common/e-desc.vue

@@ -90,7 +90,9 @@
       }
     },
     beforeDestroy () {
-      this.observer.disconnect()
+      if (this.observe) {
+        this.observer.disconnect()
+      }
     }
   }
 </script>