shish il y a 9 mois
Parent
commit
55b9e88f6d
3 fichiers modifiés avec 35 ajouts et 19 suppressions
  1. 14 0
      hdApp/src/admin/home/order.vue
  2. 17 19
      hdApp/src/admin/order/detail.vue
  3. 4 0
      hdApp/src/api/work/index.js

+ 14 - 0
hdApp/src/admin/home/order.vue

@@ -67,6 +67,9 @@
         </view>
             <view class="list-button">
 
+              <view class="admin-button-com middle" v-if="item.payStatus == 1 && (item.hasWork == 0 || item.hasWork == 2)" @click.stop="sendWork(item)">通知制作</view>
+              <view class="admin-button-com default" v-else>通知制作</view>
+
               <block v-if="item.status == 2">
                 <view class="admin-button-com middle" v-if="item.sendType == 1" @click.stop="getOrderFn(item)">确认取货</view>
                 <view class="admin-button-com middle" v-else @click.stop="sendOrderFn(item)">确认发货</view>
@@ -175,6 +178,7 @@ import AppSearchModule from "@/components/module/app-search"
 import { cancelExpressOrder } from '@/api/shop-express'
 import DateSelect from "@/components/module/dateSelect";
 import { getList } from "@/api/member";
+import { needWork } from "@/api/work"
 export default {
   name: "order",
   components: {
@@ -345,6 +349,16 @@ export default {
         this.getOrderList()
       }
     },
+    sendWork(item){
+      let that = this
+      that.$util.confirmModal({content:'确认通知制作?'},() => {
+        needWork({id:item.id}).then(res=>{
+          if(res.code == 1){
+            that.$msg(res.msg)
+          }
+        })
+      })
+    },
     getOrderFn(item){
       let that = this
       that.$util.confirmModal({content:'确认取货?'},() => {

+ 17 - 19
hdApp/src/admin/order/detail.vue

@@ -363,25 +363,13 @@
     <view class="page-btn app-footer">
       <view class="flex-center"></view>
       <view class="operate-btn-wrap">
-        <button 
-          class="admin-button-com middle" 
-          @click.stop="cancelFn(orderInfo)" 
-          v-if="orderInfo.status == 1">
-          取消
-        </button>
-        <button 
-          class="admin-button-com middle" 
-          @click.stop="goScan(orderInfo)" 
-          v-if="orderInfo.status == 1">
-          扫码收款
-        </button>
+
+        <button class="admin-button-com middle" @click.stop="sendWork(orderInfo)" v-if="orderInfo.payStatus == 1 && (orderInfo.hasWork == 0 || orderInfo.hasWork == 2)">通知制作</button>
+
+        <button class="admin-button-com middle" @click.stop="cancelFn(orderInfo)" v-if="orderInfo.status == 1"> 取消 </button>
+        <button class="admin-button-com middle" @click.stop="goScan(orderInfo)" v-if="orderInfo.status == 1"> 扫码收款 </button>
         <button class="admin-button-com middle" v-if="orderInfo.sendStatus == '-2' && orderInfo.payStatus == 1" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
-        <button 
-          class="admin-button-com middle" 
-          @click.stop="printOrder(orderInfo)" 
-          v-if="orderInfo.payStatus == 1">
-          打印
-        </button>
+        <button class="admin-button-com middle" @click.stop="printOrder(orderInfo)" v-if="orderInfo.payStatus == 1"> 打印 </button>
       </view>
     </view>
 
@@ -426,6 +414,7 @@ import { confirmSettle } from "@/api/settle/index"
 import { refundAmount } from "@/api/refund";
 import { expressDetail } from "@/api/express";
 import { cancelExpressOrder,mockNotify } from '@/api/shop-express'
+import { needWork } from "@/api/work"
 export default {
   name: "detail",
   components: { 
@@ -543,7 +532,16 @@ export default {
         type: 2
       })
     },
-    
+    sendWork(item){
+      let that = this
+      that.$util.confirmModal({content:'确认通知制作?'},() => {
+        needWork({id:item.id}).then(res=>{
+          if(res.code == 1){
+            that.$msg(res.msg)
+          }
+        })
+      })
+    },
     cancelFn(item) {
       this.$util.confirmModal({content: '确认取消?'}, () => {
         cancelOrder({id: item.id}).then(res => {

+ 4 - 0
hdApp/src/api/work/index.js

@@ -27,4 +27,8 @@ export const goodsCreateFn = data =>{
 
 export const getInfoByOrderId = data =>{
 	return https.get('/work/get-info-by-order-id', data)
+}
+
+export const needWork = data =>{
+	return https.get('/work/need-work', data)
 }