Merge branch 'dev' into pre-production

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@@ -188,8 +188,7 @@
     </template>
   </el-dialog>
   <!-- 上架 -->
-
-  <el-dialog
+   <el-dialog
     v-model="isshowupt"
     :title="
       '请选择' +
@@ -315,6 +314,20 @@
       </span>
     </template> -->
   </el-dialog>
+
+   <el-dialog
+    v-model="isshowConfirmedListing"
+    :title="
+      '确定上架'
+    "
+    width="50%"
+    center
+  >
+    <div style="text-align: center;">
+      <el-button type="primary" @click="confirmedListing">确定</el-button>
+      <el-button @click="isshowConfirmedListing = false">取消</el-button>
+    </div>
+  </el-dialog>
   <!-- 下架 -->
   <el-dialog
     v-model="isshowdow"
@@ -494,6 +507,8 @@ let details = reactive({
   contenarr: [],
   isshowcon: false,
   isshowupt: false,
+  isshowConfirmedListing: false,
+  addhuojData: {},
   checkite: {},
   loading: false,
   currentPage: 1,
@@ -1994,10 +2009,16 @@ const showdown = async value => {
   searchbutdown();
 };
 const addhuoj = async scope => {
+  details.addhuojData = scope
+  details.isshowConfirmedListing = true
   console.log(scope.row);
+};
+// 确定上架
+const confirmedListing = async () => {
   let data = {
     allocationId: details.checkite.id,
   };
+  const scope = details.addhuojData
   let url = '';
   switch (details.isshowupt) {
     case 1:
@@ -2035,6 +2056,8 @@ const addhuoj = async scope => {
       break;
   }
   let response = await posturl(url, data);
+  // 关闭弹窗
+  details.isshowConfirmedListing = false
   if (response.data.code == 200) {
     console.log(response.data);
     proxy.$message({
@@ -2050,7 +2073,7 @@ const addhuoj = async scope => {
       message: response.data.msg,
     });
   }
-};
+}
 async function allup() {
   // console.log(scope.row);
   let data = {
@@ -2194,6 +2217,7 @@ const {
   loading,
   checkregionse,
   isshowupt,
+  isshowConfirmedListing,
   columnList,
   isshowcon,
   arrlist,