|
@@ -16,7 +16,7 @@
|
|
</view>
|
|
</view>
|
|
<button type="primary" @click="handleSearch" class="search-button">搜 索</button>
|
|
<button type="primary" @click="handleSearch" class="search-button">搜 索</button>
|
|
<button type="primary" v-if="s=='1'" :disabled="workStatus==='1'?false:true" @click="handleRefresh" :class="workStatus==='1'?'refresh':'refresh active'">{{ccc}}</button>
|
|
<button type="primary" v-if="s=='1'" :disabled="workStatus==='1'?false:true" @click="handleRefresh" :class="workStatus==='1'?'refresh':'refresh active'">{{ccc}}</button>
|
|
- <button type="primary" v-else @click="handleRelease" :class="'refresh'">完成</button>
|
|
|
|
|
|
+ <button type="primary" v-else @click="handleRelease" :class="'refresh'">完成释放</button>
|
|
</view>
|
|
</view>
|
|
<view v-else class="history">
|
|
<view v-else class="history">
|
|
<view class="searchchoice">
|
|
<view class="searchchoice">
|
|
@@ -105,7 +105,7 @@
|
|
import NavBar from "@/components/nav-bar/nav-bar.vue"
|
|
import NavBar from "@/components/nav-bar/nav-bar.vue"
|
|
import OrderCard from "@/components/order-card/order-card.vue"
|
|
import OrderCard from "@/components/order-card/order-card.vue"
|
|
import { onMounted,ref, getCurrentInstance } from 'vue'
|
|
import { onMounted,ref, getCurrentInstance } from 'vue'
|
|
-import { onLoad } from "@dcloudio/uni-app"
|
|
|
|
|
|
+import { onLoad, onPullDownRefresh } from "@dcloudio/uni-app"
|
|
import {receiveOrderList, selectDepartment } from "@/static/js/api.js"
|
|
import {receiveOrderList, selectDepartment } from "@/static/js/api.js"
|
|
import {releaseOrder} from "@/static/js/request.js"
|
|
import {releaseOrder} from "@/static/js/request.js"
|
|
import debounce from 'lodash.debounce'
|
|
import debounce from 'lodash.debounce'
|
|
@@ -368,7 +368,10 @@ const handleRelease = debounce(async()=>{
|
|
}
|
|
}
|
|
})
|
|
})
|
|
ids.value = []
|
|
ids.value = []
|
|
|
|
+ uni.$showMsg(res.msg, 2000)
|
|
}
|
|
}
|
|
|
|
+ } else {
|
|
|
|
+ uni.$showMsg(res.msg, 2000)
|
|
}
|
|
}
|
|
s.value = '1'
|
|
s.value = '1'
|
|
console.log('after handleRelease ids.value', ids.value)
|
|
console.log('after handleRelease ids.value', ids.value)
|
|
@@ -596,6 +599,7 @@ const loadMoreList = debounce(async()=>{
|
|
}
|
|
}
|
|
},500)
|
|
},500)
|
|
|
|
|
|
|
|
+
|
|
const loadPreList = debounce(async()=>{
|
|
const loadPreList = debounce(async()=>{
|
|
console.log('loadPreList>>>')
|
|
console.log('loadPreList>>>')
|
|
page.value = 1
|
|
page.value = 1
|