Merge branch 'dev_v2' of ssh://gogs.zfire.top:2222/zfire-front/supply-front into dev_v2

src/views/deposit_home/refund_list.vue

@@ -218,6 +218,10 @@ export default {
                   <el-popconfirm
                     title="批量审核吗？"
                     onOnConfirm={() => {
+                      if (!this.selectData.length) {
+                        this.$errorMsg('请选择')
+                        return
+                      }
                       this.batchExamine()
                     }}
                   >

src/views/sales_control/adjust_warehouse.vue

@@ -11,8 +11,8 @@
     >
     </template-page>
     <warehouse-form v-if="pageType == 1" :pageType="pageType" @close="handleClose" />
-    <warehouse-examine v-else-if="pageType == 2" :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
-    <warehouse-details v-else-if="pageType" :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
+    <warehouse-examine v-if="pageType == 2" :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
+    <warehouse-details v-if="pageType == 3" :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
   </div>
 </template>
 

src/views/sales_control/sales_management/customer_sales_list.vue

@@ -16,7 +16,7 @@
       :pageType="pageType"
       @close="handleClose"
     />
-    <customer_sales_details :detailsId="detailsId" v-else :pageType="pageType" @close="handleClose" />
+    <customer_sales_details  v-if="pageType==3" :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
   </div>
 </template>
 

src/views/sales_control/sales_management/return_sales_list.vue

@@ -11,7 +11,7 @@
     >
     </template-page>
     <return_sales_form v-if="pageType === 1 || pageType === 2" :details-id="detailsId" :pageType="pageType" @close="handleClose"/>
-    <return_sales_details v-else :details-id="detailsId" :pageType="pageType" @close="handleClose"/>
+    <return_sales_details v-if="pageType === 3" :details-id="detailsId" :pageType="pageType" @close="handleClose"/>
   </div>
 </template>
 

src/views/stock_control/adjust_warehouse.vue

@@ -11,8 +11,8 @@
     >
     </template-page>
     <warehouse-form v-if="pageType == 1" :pageType="pageType" @close="handleClose" />
-    <warehouse-examine v-else-if="pageType == 2" :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
-    <warehouse-details v-else :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
+    <warehouse-examine v-if="pageType == 2" :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
+    <warehouse-details v-if="pageType === 3" :detailsId="detailsId" :pageType="pageType" @close="handleClose" />
   </div>
 </template>
 

src/views/stock_control/sales_management/customer_sales_list.vue

@@ -11,7 +11,7 @@
     >
     </template-page>
     <customer_sales_form :detailsId="detailsId" v-if="pageType === 1 || pageType === 2" :pageType="pageType" @close="handleClose"/>
-    <customer_sales_details :detailsId="detailsId" v-else :pageType="pageType" @close="handleClose"/>
+    <customer_sales_details :detailsId="detailsId" v-if="pageType === 3" :pageType="pageType" @close="handleClose"/>
   </div>
 </template>
 

src/views/stock_control/sales_management/return_sales_list.vue

@@ -16,7 +16,7 @@
       :pageType="pageType"
       @close="handleClose"
     />
-    <return_sales_details v-else :details-id="detailsId" :pageType="pageType" @close="handleClose" />
+    <return_sales_details v-if="pageType === 3" :details-id="detailsId" :pageType="pageType" @close="handleClose" />
   </div>
 </template>