Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/views/bpm/handleTask/components/inoutBound/detailDialog.vue

@@ -357,6 +357,21 @@
               </template>
             </el-table-column>
 
+            <el-table-column label="质检结果" prop="result" width="120">
+              <template slot-scope="{ row }">
+                <span v-if="row.result == 0">合格</span>
+                <span v-else-if="row.result == 1">不合格</span>
+                <span v-else>让步接收</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="质检状态" prop="status" width="120">
+              <template slot-scope="{ row }">
+                <span v-if="row.status == 0">未检</span>
+                <span v-else-if="row.status == 1">已检</span>
+                <span v-else>-</span>
+              </template>
+            </el-table-column>
+
             <el-table-column label="日期" prop="createTime" width="200">
               <template slot="header" slot-scope="scope">
                 {{ dateTypes == 1 ? '采购日期' : '生产日期' }}
@@ -443,6 +458,16 @@
                 {{ row.weightUnit }}
               </template>
             </el-table-column>
+            <el-table-column label="质检结果" prop="result" width="120">
+              <template slot-scope="{ row }">
+                {{ row.result }}
+              </template>
+            </el-table-column>
+            <el-table-column label="质检状态" prop="status" width="120">
+              <template slot-scope="{ row }">
+                {{ row.status }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>