Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!524

src/components/PopDialog/index.vue

@@ -30,6 +30,12 @@
               <el-table-column prop="name" header-align="center" align="center" sortable="custom" min-width="90"
                 label="物料名称">
               </el-table-column>
+              <el-table-column prop="specification" header-align="center" align="center" sortable="custom" min-width="90"
+                label="规格">
+              </el-table-column>
+              <el-table-column prop="model" header-align="center" align="center" sortable="custom" min-width="90"
+                label="型号">
+              </el-table-column>
             </el-table>
 
             <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"