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

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
     ENV_CONFIG: '"dev"',
-    BASE_API: '"http://cjxc-dev.wanwudezhi.com/admin"'
+    BASE_API: '"http://cjxc.wanwudezhi.com/admin"'
     // BASE_API: '"http://10.10.56.84:8085/admin"'
 }

src/api/business/order.js

@@ -51,6 +51,14 @@ export function requestIdentify(data) {
   })
 }
 
+export function exchangeApplyOrdercheck(data) {
+  return request({
+    url: '/exchangeApplyOrder/handleExchangeOrderOfOfficialItem',
+    method: 'post',
+    data
+  })
+}
+
 export function exchangeApplyOrderIdentify(data) {
   return request({
     url: '/exchangeApplyOrder/handleApplyOrder',

src/views/order/ChangeOrderView.vue

@@ -139,22 +139,28 @@
         </template>
       </el-table-column>
        <!--  中转单状态 (12, "待平台收货"), (13, "平台鉴定中"), (14, "待平台发货"), (15, "待平台退回"), (16, "平台已发货"), (17, "退回待收货"), (18, "退回已收货"),-->
-       <!-- <el-table-column align="center" label="操作" width="300">
+       <el-table-column align="center" label="操作" width="300">
         <template slot-scope="scope">
           <el-button
+            v-if="(scope.row.state === 8)"
             type="primary"
             size="mini"
-            @click="handleToOrderDetail(scope.row)">详情
+            @click="handlePass(scope.row)">通过
           </el-button>
           <el-button
+            v-if="(scope.row.state === 8)"
+            type="danger"
+            size="mini"
+            @click="handleNoPass(scope.row)">不通过
+          </el-button>
+          <el-button
+            v-if="(scope.row.state === 10)"
             type="primary"
             size="mini"
-            @click="handleToOrderDetail(scope.row)">订单
+            @click="handleSend(scope.row, 3)">去发货
           </el-button>
         </template>
-      </el-table-column> -->
-
-     
+      </el-table-column>
 
     </el-table>
 
@@ -165,24 +171,48 @@
       :limit.sync="listQuery.limit"
       @pagination="getList" />
 
+      <NoPassIdentifyDialog
+      :show-no-pass-identify-dialog-show="showNoPassIdentifyDialog"
+      :distribution-order-id="distributionOrderId"
+      @refreshItem="handleRefreshItem"
+      @cancelDialog="handleCancelNoPassDialog"
+    />
+
+     <ExchangeLogisticIdentifyDialog
+      v-if="logisticDialogShow"
+      :logistic-dialog-show="logisticDialogShow"
+      :distribution-order-id="distributionOrderId"
+      :type="logisticType"
+      @cancelDialog="handleCancelLogisticDialog"
+      @refreshDelivery="handleRefreshLogisticItem"
+      @refreshSendBack="handleRefreshLogisticItem"/>
+
   </div>
 </template>
 
 <script>
 import Line2Hidden from '@/components/line2Hidden'
 import Pagination from '@/components/Pagination'
-import { requestOrderList } from '@/api/business/order'
+import { requestOrderList,exchangeApplyOrdercheck } from '@/api/business/order'
+import NoPassIdentifyDialog from './components/NoPassIdentifyDialog'
+import ReturnLogisticIdentifyDialog from './components/ReturnLogisticIdentifyDialog'
+import ExchangeLogisticIdentifyDialog from './components/ExchangeLogisticIdentifyDialog'
 
 export default {
   name: 'ChangeOrderView',
   components: {
+    ReturnLogisticIdentifyDialog,
+    NoPassIdentifyDialog,
     Pagination,
-    Line2Hidden
+    Line2Hidden,
+    ExchangeLogisticIdentifyDialog
   },
   data() {
     return {
       activeIndex: '1',
       itemKey: 0,
+      logisticType: 1,
+      logisticDialogShow: false,
       options: [{
         value: 1,
         label: '待付款'
@@ -292,7 +322,120 @@ export default {
         this.total = 0
         this.listLoading = false
       })
-    }
+    },
+    /**
+     * 通过
+     * @param item
+     */
+    handlePass(row) {
+      this.$confirm('该藏品确定通过平台鉴定？', '平台鉴定结果', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'message'
+      }).then(() => {
+        const params = {
+          distributionOrderId: row.distributionOrderId,
+          approved: 1
+        }
+        exchangeApplyOrdercheck(params).then(response => {
+          this.list = this.list.filter((item) => {
+            if (item.distributionOrderId === row.distributionOrderId) {
+              item.stateName = '待发货'
+              item.state = 10
+              return item
+            }
+            return item
+          })
+          this.$notify.success({
+            message: '操作成功'
+          })
+        }).catch((e) => {
+          console.log('===报错=', e)
+          this.$message.error(e.data && e.data.errmsg || '请求失败， 请重试')
+        })
+      })
+    },
+    handleNoPass(row) {
+      this.$confirm('该藏品确定不通过平台鉴定？', '平台鉴定结果', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'message'
+      }).then(() => {
+        const params = {
+          distributionOrderId: row.distributionOrderId,
+          approved: 2
+        }
+        exchangeApplyOrdercheck(params).then(response => {
+          this.list = this.list.filter((item) => {
+            if (item.distributionOrderId === row.distributionOrderId) {
+              item.stateName = '已取消'
+              item.state = 101
+              return item
+            }
+            return item
+          })
+          this.$notify.success({
+            message: '操作成功'
+          })
+        }).catch((e) => {
+          console.log('===报错=', e)
+          this.$message.error(e.data && e.data.errmsg || '请求失败， 请重试')
+        })
+      })
+    },
+  
+    /**
+     * 不通过操作成功，刷新列表
+     */
+    handleRefreshItem() {
+      if (this.identifyOrderId) {
+        this.list = this.list.filter((item) => {
+          if (item.identifyOrderId === this.identifyOrderId) {
+            item.transferStateName = '已取消'
+            item.transferState = 101
+            return item
+          }
+          return item
+        })
+      }
+      this.handleCancelNoPassDialog()
+    },
+    
+    handleSend(row, type) {
+      this.distributionOrderId = row.distributionOrderId
+      this.logisticDialogShow = true
+      this.logisticType = type
+    },
+
+    handleRefreshLogisticItem(type) {
+      if (this.identifyOrderId) {
+        this.list = this.list.filter((item) => {
+          if (type === 3) {
+              item.transferStateName = '平台已发货'
+              item.transferState = 20
+            } else {
+              item.transferStateName = '退回待收货'
+              item.transferState = 17
+            }
+        })
+      }
+      this.handleCancelLogisticDialog()
+    },
+    handleCancelLogisticDialog() {
+      this.logisticDialogShow = false
+      this.identifyOrderId = ''
+      this.distributionOrderId = ''
+      this.logisticType = 0
+    },
+    /**
+     * 不通过操作取消
+     */
+    handleCancelNoPassDialog() {
+      this.showNoPassIdentifyDialog = false
+      this.identifyOrderId = ''
+      this.distributionOrderId = ''
+    },
+
   }
 }
 </script>