|
@@ -36,6 +36,18 @@
|
|
|
<dealerSubareaScopeList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="pickUp-senderSn" @change="custChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.state"
|
|
|
+ ref="state"
|
|
|
+ id="pickUp-state"
|
|
|
+ code="PICK_UP_STATE"
|
|
|
+ :notIn="['WAIT_SUBMIT','WAIT_AUDIT','AUDIT_REJECT']"
|
|
|
+ placeholder="请选择状态"
|
|
|
+ ></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
</template>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<span class="table-page-search-submitButtons">
|
|
@@ -80,9 +92,16 @@
|
|
|
size="small"
|
|
|
type="link"
|
|
|
class="button-info"
|
|
|
- v-if="record.state == 'AUDIT_PASS'&&$hasPermissions('M_detailPickUp')"
|
|
|
+ v-if="(record.state == 'AUDIT_PASS'||record.state == 'FINISH')&&$hasPermissions('M_detailPickUp')"
|
|
|
@click="handleDetail(record)"
|
|
|
id="pickUp-detail-btn">详情</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ class="button-error"
|
|
|
+ v-if="record.state == 'AUDIT_PASS'&&$hasPermissions('M_detailPickUp')"
|
|
|
+ @click="handlePickUp(record)"
|
|
|
+ id="pickUp-detail-btn">提货</a-button>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-spin>
|
|
@@ -96,7 +115,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
|
import employee from '../../expenseManagement/expenseReimbursement/employee.js'
|
|
|
import logisticsPoint from '../billOfLading/logisticsPoint'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
-import { pickUpQueryPage } from '@/api/pickUp'
|
|
|
+import { pickUpQueryPage, pickUpFinish } from '@/api/pickUp'
|
|
|
export default {
|
|
|
name: 'PickUpList',
|
|
|
mixins: [commonMixin],
|
|
@@ -181,6 +200,17 @@ export default {
|
|
|
handleDetail (row) {
|
|
|
this.$router.push({ name: 'billOfLadingDetail', params: { sn: row.pickUpSn } })
|
|
|
},
|
|
|
+ // 提货
|
|
|
+ handlePickUp (row) {
|
|
|
+ this.spinning = true
|
|
|
+ pickUpFinish({ pickUpSn: row.pickUpSn }).then(res => {
|
|
|
+ this.spinning = false
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.$message.info(res.message)
|
|
|
+ this.$refs.table.refresh()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
resetSearchForm () {
|
|
|
if (this.advanced) {
|
|
|
this.$refs.rangeExamineDate.resetDate()
|