Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

klp-ui/src/views/wms/coil/do/warehousing.vue

@@ -180,6 +180,7 @@
                 <!-- <el-tag type="info" size="small">{{ scope.row.currentCoilNo }}</el-tag> -->
               </template>
             </el-table-column>
+            <el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" />
 
             <el-table-column label="新增时间" align="center" prop="createTime" width="150" :show-overflow-tooltip="true">
               <template slot-scope="scope">

klp-ui/src/views/wms/coil/panels/base.vue

@@ -119,11 +119,11 @@
         </template>
       </el-table-column>
       <el-table-column label="更新人" v-if="!showExportTime" align="center" prop="updateByName" />
-      <el-table-column label="二维码" v-if="qrcode">
+      <!-- <el-table-column label="二维码">
         <template slot-scope="scope">
           <QRCode :content="scope.row.qrcodeRecordId" :size="50" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="关联信息" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.parentCoilNos && scope.row.hasMergeSplit === 1 && scope.row.dataType === 1">
@@ -146,6 +146,7 @@
           </el-select>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
       <!-- <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">