|
@@ -132,8 +132,8 @@
|
|
|
size="small"
|
|
|
type="link"
|
|
|
class="button-warning"
|
|
|
- v-if="record.billStatus == 'WAIT_SUBMIT'"
|
|
|
- @click="handleSubmit(record)"
|
|
|
+ v-if="record.salesReturnBillSource != 'SALES'&&record.billStatus == 'WAIT_SUBMIT'"
|
|
|
+ @click="beforeSubmit(record)"
|
|
|
id="salesReturn-eexamine-btn">提交</a-button>
|
|
|
<a-button
|
|
|
size="small"
|
|
@@ -161,7 +161,7 @@
|
|
|
type="link"
|
|
|
class="button-info"
|
|
|
v-if="record.billStatus == 'WAIT_RECEIVE'"
|
|
|
- @click="handleEdit(record)"
|
|
|
+ @click="handlePickUp(record)"
|
|
|
id="salesReturn-edit-btn">申请提货</a-button>
|
|
|
<a-button
|
|
|
size="small"
|
|
@@ -178,6 +178,8 @@
|
|
|
<choose-custom-modal :show="openModal" @ok="handleEdit" @cancel="openModal=false"></choose-custom-modal>
|
|
|
<!-- 审核进度 -->
|
|
|
<verifyModal :openModal="visibleAudit" :itemSn="auditInfo&&auditInfo.salesReturnBillSn" @close="visibleAudit=false"></verifyModal>
|
|
|
+ <!-- 选择审核人员 -->
|
|
|
+ <chooseDepartUserModal :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -189,8 +191,9 @@ import { getArea } from '@/api/data'
|
|
|
import chooseCustomModal from './chooseCustomModal.vue'
|
|
|
import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
|
import verifyModal from './verifyModal.vue'
|
|
|
+import chooseDepartUserModal from './chooseDepartUserModal.vue'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
-import { salesReturnList, updateAgain, salesReturnDel } from '@/api/salesReturn'
|
|
|
+import { salesReturnList, updateAgain, salesReturnDel, salesReturnSubmit } from '@/api/salesReturn'
|
|
|
import moment from 'moment'
|
|
|
import getDate from '@/libs/getDate.js'
|
|
|
export default {
|
|
@@ -203,6 +206,7 @@ export default {
|
|
|
dealerSubareaScopeList,
|
|
|
rangeDate,
|
|
|
verifyModal,
|
|
|
+ chooseDepartUserModal,
|
|
|
subarea
|
|
|
},
|
|
|
data () {
|
|
@@ -217,6 +221,7 @@ export default {
|
|
|
moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
|
], // 创建时间
|
|
|
openModal: false, // 选择客户弹框是否显示
|
|
|
+ openDepartUserModal: false,
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
beginDate: getDate.getThreeMonthDays().starttime,
|
|
@@ -296,6 +301,11 @@ export default {
|
|
|
handleConfirm (row) {
|
|
|
this.$router.push({ name: 'custConfirm', params: { sn: row.salesReturnBillSn } })
|
|
|
},
|
|
|
+ // 申请提货
|
|
|
+ handlePickUp (row) {
|
|
|
+ this.$store.state.app.tempBillOfData = row
|
|
|
+ this.$router.push({ name: 'billOfLadingAdd' })
|
|
|
+ },
|
|
|
// 编辑
|
|
|
handleEdit (row) {
|
|
|
this.$router.push({ name: 'salesReturnEdit', params: { sn: row.salesReturnBillSn, buyerSn: row.buyerSn } })
|
|
@@ -351,9 +361,20 @@ export default {
|
|
|
this.auditInfo = row
|
|
|
this.visibleAudit = true
|
|
|
},
|
|
|
+ beforeSubmit (row) {
|
|
|
+ this.auditInfo = row
|
|
|
+ this.openDepartUserModal = true
|
|
|
+ },
|
|
|
// 提交
|
|
|
- handleSubmit (row) {
|
|
|
-
|
|
|
+ handleSubmit (data) {
|
|
|
+ this.spinning = true
|
|
|
+ salesReturnSubmit({ salesReturnBillSn: this.auditInfo.salesReturnBillSn, ...data }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.$refs.table.refresh()
|
|
|
+ this.$message.success(res.message)
|
|
|
+ }
|
|
|
+ this.spinning = false
|
|
|
+ })
|
|
|
},
|
|
|
resetSearchForm () {
|
|
|
this.$refs.rangeCreateDate.resetDate()
|