Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into test

src/views/product/index.vue

@@ -173,7 +173,7 @@
           </template>
         </el-table-column>
         <el-table-column label="单位" prop="conUnit">
-          <!-- <template v-slot="scope">
+          <template v-slot="scope">
             <el-select v-model="scope.row.conUnit" reserve-keyword placeholder="请输入关键词">
               <el-option
                 v-for="item in returnConUnits(scope.row.consInfoId)"
@@ -182,7 +182,7 @@
                 :value="item"
               ></el-option>
             </el-select>
-          </template> -->
+          </template>
         </el-table-column>
         <el-table-column label="使用数量" prop="surplusStock" min-width="150px">
           <template v-slot="scope">