Merge remote-tracking branch 'origin/feature/20240918_1005_091801' into release_pre_20241031143540

src/views/shop/components/NoPassIdentifyDialog.vue

@@ -31,7 +31,7 @@
 
 <script>
 import { MessageBox } from 'element-ui'
-import { shopManagerCheck} from '@/api/business/shop'
+import { shopManagerCheck } from '@/api/business/shop'
 export default {
   name: 'NoPassIdentifyDialog',
   props: {
@@ -42,10 +42,6 @@ export default {
     openShopApplyOrderId: {
       type: String,
       default: ''
-    },
-    identifyOrderId: {
-      type: String,
-      default: ''
     }
   },
   data() {
@@ -69,7 +65,7 @@ export default {
      */
     handleCancelValue() {
       if (this.openShopApplyOrderId) {
-        const params = { ...this.cancelForm, openShopApplyOrderId: this.openShopApplyOrderId,  state: 30 }
+        const params = { ...this.cancelForm, openShopApplyOrderId: this.openShopApplyOrderId, state: 30 }
         this.$refs.cancel.validate((valid) => {
           if (valid) {
             shopManagerCheck(params)
@@ -78,7 +74,7 @@ export default {
                   message: '操作成功'
                 })
                 this.cancelForm = {}
-                this.$emit('refreshItem', this.shopManagerCheck)
+                this.$emit('refreshItem', this.openShopApplyOrderId)
               })
               .catch(response => {
                 MessageBox.alert('业务错误：' + response.data.errmsg, '警告', {

src/views/shop/shopManagerList.vue

@@ -41,7 +41,7 @@
         <el-button class="filter-item" @click="resetSearchForm">重置</el-button>
       </div>
     </div>
-  
+
     <el-table
       v-loading="listLoading"
       :data="list"
@@ -114,9 +114,8 @@
             v-if="(scope.row.state === 10)"
             type="danger"
             size="mini"
-            @click="handleNoPass()">不通过
+            @click="handleNoPass(scope.row)">不通过
           </el-button>
-          
         </template>
       </el-table-column>
     </el-table>
@@ -127,8 +126,8 @@
       :page.sync="listQuery.page"
       :limit.sync="listQuery.limit"
       @pagination="getList" />
-      
-    <el-dialog :visible.sync="sendDialogVisible" title="发货">
+
+    <!--    <el-dialog :visible.sync="sendDialogVisible" title="发货">
       <el-form
         ref="sendFormRef"
         :model="sendForm"
@@ -156,23 +155,25 @@
         <el-button @click="sendDialogVisible = false">取消</el-button>
         <el-button type="primary" @click="handleShowSendDialog">确定</el-button>
       </div>
-    </el-dialog>
+    </el-dialog>-->
     <NoPassIdentifyDialog
       :show-no-pass-identify-dialog-show="showNoPassIdentifyDialog"
+      :open-shop-apply-order-id="currentApplyId"
       @cancelDialog="showNoPassIdentifyDialog = false"
+      @refreshItem="handleRefreshItem"
     />
   </div>
 </template>
-  
+
 <script>
 import Line2Hidden from '@/components/line2Hidden'
 import Pagination from '@/components/Pagination'
 import NoPassIdentifyDialog from './components/NoPassIdentifyDialog'
-import { shopManagerList,shopManagerCheck} from '@/api/business/shop'
+import { shopManagerList, shopManagerCheck } from '@/api/business/shop'
 import { requestLogisticsList, requestDelivery } from '@/api/business/order'
 
 export default {
-  name: 'shopManagerList',
+  name: 'ShopManagerList',
   components: {
     Pagination,
     Line2Hidden,
@@ -271,7 +272,8 @@ export default {
       rules: {
         waybill: [{ required: true, message: '请输入物流单号', trigger: 'blur' }],
         logisticsCode: [{ required: true, message: '请选择快递公司', trigger: 'blur' }]
-      }
+      },
+      currentApplyId: ''
     }
   },
   created() {
@@ -313,6 +315,19 @@ export default {
         })
       })
     },
+
+    handleRefreshItem(applyId) {
+      if (this.list) {
+        this.list = this.list.filter((item) => {
+          if (item.openShopApplyOrderId === applyId) {
+            item.state = 30
+            return item
+          }
+          return item
+        })
+      }
+      this.showNoPassIdentifyDialog = false
+    },
     // handleNoPass(row) {
     //   this.$confirm('确定不通过藏家的开店申请？', '平台开店结果', {
     //     confirmButtonText: '确定',
@@ -364,7 +379,6 @@ export default {
       this.getList()
     },
 
-
     handlerGetList() {
       this.listQuery.page = 1
       this.getList()
@@ -429,14 +443,14 @@ export default {
      * 详情
      * @param item
      */
-     handleToDetail(item) {
+    handleToDetail(item) {
       this.$router.push({ path: '/shop/shopManagerDetail', query: { openShopApplyOrderId: item.openShopApplyOrderId }})
     },
-       /**
+    /**
      * 订单状态切换
      * @param value
      */
-     handleMenuSelect(value) {
+    handleMenuSelect(value) {
       console.log('=====tab切换=', value)
       this.activeIndex = value
       this.handleReset()
@@ -444,16 +458,10 @@ export default {
     /**
      * 不通过
      */
-    handleNoPass() {
+    handleNoPass(item) {
+      this.currentApplyId = item.openShopApplyOrderId
       this.showNoPassIdentifyDialog = true
     },
-    /**
-     * 不通过操作成功，刷新列表
-     */
-    handleRefreshItem() {
-      this.handleGetDetail()
-      this.showNoPassIdentifyDialog = false
-    },
     /**
      * 发货
      */