lilei 2 lat temu
rodzic
commit
34d81b12f5

+ 8 - 0
src/api/salesReturn.js

@@ -25,6 +25,14 @@ export const salesReturnDel = (params) => {
   })
 }
 
+//  销售退货 取消
+export const salesReturnCancelBill = (params) => {
+  return axios({
+    url: `/salesReturn/cancelBill/${params.salesReturnBillSn}`,
+    method: 'get'
+  })
+}
+
 // 再次编辑
 export const updateAgain = (params) => {
   return axios({

+ 1 - 1
src/views/salesManagement/sendOutOrder/detailModal.vue

@@ -62,7 +62,7 @@
             问题反馈:
             <div style="padding:0 10px;">
               <div v-if="showEditQus" style="width:400px;">
-                <a-textarea @blur="saveIssue" v-model="detail.issueRemark" placeholder="请输入问题反馈(最多100字符)" :maxLength="100" auto-size />
+                <a-textarea @blur="saveIssue" allowClear v-model="detail.issueRemark" placeholder="请输入问题反馈(最多100字符)" :maxLength="100" auto-size />
               </div>
               <div v-else>{{ detail.issueRemark||'--' }}</div>
             </div>

+ 2 - 2
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -27,7 +27,7 @@
                   ref="billStatus"
                   id="receiveCheck-billStatus"
                   code="SALES_RETURN_BILL_STATUS"
-                  :notIn="['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT', 'CANCEL']"
+                  :notIn="['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT']"
                   placeholder="请选择业务状态"
                   allowClear></v-select>
               </a-form-item>
@@ -149,7 +149,7 @@ export default {
         this.disabled = true
         this.spinning = true
         return takeQueryPage(Object.assign(parameter, this.queryParam, {
-          'excludeBillStatusList': ['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT', 'CANCEL']
+          'excludeBillStatusList': ['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT']
         })).then(res => {
           let data
           if (res.status == 200) {

+ 29 - 1
src/views/salesReturnManagement/salesReturn/list.vue

@@ -181,6 +181,13 @@
               v-if="record.billStatus == 'WAIT_RECEIVE'&& $hasPermissions('B_newPickUp')"
               @click="handlePickUp(record)"
               id="salesReturn-edit-btn">申请提货</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              v-if="record.billStatus == 'WAIT_RECEIVE'&&record.salesReturnBillSource=='PURCHASE'"
+              @click="handleCansel(record)"
+              id="salesReturn-cansel-btn">取消</a-button>
             <a-button
               size="small"
               type="link"
@@ -212,7 +219,7 @@ import verifyModal from './verifyModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
-import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnSubmit } from '@/api/salesReturn'
+import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnCancelBill, salesReturnSubmit } from '@/api/salesReturn'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 export default {
@@ -359,6 +366,27 @@ export default {
         this.$router.push({ name: 'billOfLadingList', query: { billNo: row.salesReturnBillNo } })
       }
     },
+    // 取消
+    handleCansel(row){
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确认要取消吗?',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          salesReturnCancelBill({ salesReturnBillSn: row.salesReturnBillSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
     // 删除
     handleDel (row) {
       const _this = this