入库检验单

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

@@ -6,23 +6,23 @@
       :close-on-click-modal="false"
       :visible.sync="visible">
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
-<!--        <el-row class="my-row">-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="编码" prop="code">-->
-<!--              <el-input v-model="dataForm.code" :disabled="display || !id" placeholder="系统自动生成，无需填写"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8" style="padding-left: 10px">-->
-<!--            <el-form-item label="名称" prop="name">-->
-<!--              <el-input v-model="dataForm.name" :disabled="display" placeholder="名称"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8" style="padding-left: 10px">-->
-<!--            <el-form-item label="型号规格" prop="specifications">-->
-<!--              <el-input v-model="dataForm.specifications" :disabled="display" placeholder="型号规格"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <el-row class="my-row">
+          <el-col :span="8">
+            <el-form-item label="编码" prop="inspectionCode">
+              <el-input v-model="dataForm.inspectionCode" :disabled="display || !id" placeholder="系统自动生成，无需填写"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="padding-left: 10px">
+            <el-form-item label="名称" prop="materialName">
+              <el-input v-model="dataForm.materialName" :disabled="display" placeholder="名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="padding-left: 10px">
+            <el-form-item label="类别" prop="materialTypeName">
+              <el-input v-model="dataForm.materialTypeName" :disabled="display" placeholder="类别"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 <!--        <el-row class="my-row">-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="制造商" prop="manufacturers">-->
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-  import { getEquipmentDetail } from '@/api/production'
+  import { getIncomingInspectionDetail } from '@/api/check'
   export default {
     name: 'ibc-add-or-update',
     data () {
@@ -104,20 +104,10 @@
         this.id = id || 0
         this.display = display
         if (!id) return
-        await getEquipmentDetail(this.id).then(({data}) => {
+        await getIncomingInspectionDetail(this.id).then(({data}) => {
           if (data && data.code === '200') {
             this.dataForm = data.data
-            // 文件列表
-            this.fileList = []
-            if (data.data.attachList) {
-              data.data.attachList.forEach((item) => {
-                this.fileList.push({
-                  name: item.fileName,
-                  url: item.url,
-                  id: item.url
-                })
-              })
-            }
+            console.log('data = ' + JSON.stringify(data.data))
           }
         })
       },

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

@@ -33,10 +33,10 @@
         align="center"
         width="120"
         :show-tooltip-when-overflow="true"
-        label="名称">
+        label="物品名称">
       </el-table-column>
       <el-table-column
-        prop="materialTypeId"
+        prop="materialTypeName"
         header-align="center"
         align="center"
         label="类别">
@@ -80,7 +80,7 @@
         label="检验结论">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="creatorName"
         header-align="center"
         align="center"
         label="检验员">