lilei 2 years ago
parent
commit
42d33b99d7

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

@@ -58,6 +58,18 @@
             <a-textarea v-model="form.transportRemark" placeholder="请输入备注" v-if="type==0"/>
             <span v-else>{{ detail.transportRemark||'--' }}</span>
           </div>
+          <div style="flex-basis:60%;display:flex;" v-if="detail.receiveFlag == 1 && type!=0">
+            问题反馈:
+            <div style="padding:0 10px;">
+              <div v-if="showEditQus" style="width:400px;">
+                <a-textarea ref="issue" @blur="saveIssue" allowClear v-model="detail.issueRemark" placeholder="请输入问题反馈(最多100字符)" :maxLength="100" auto-size />
+              </div>
+              <div v-else>{{ detail.issueRemark||'--' }}</div>
+            </div>
+            <div v-if="!showEditQus">
+              <a-icon @click="editIssue" style="color:#00aaff;font-size:16px;cursor:pointer;" type="form" />
+            </div>
+          </div>
         </div>
         <div>
           <a-table class="sTable" :columns="columns" :pagination="false" :data-source="tableData" bordered></a-table>
@@ -81,7 +93,7 @@ import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import printModel from './printModel.vue'
 import commonModal from '@/views/common/commonModal.vue'
-import { updateTransportInfo, sendBillFindBySn } from '@/api/sendBill'
+import { updateTransportInfo, sendBillFindBySn, updateIssueRemark } from '@/api/sendBill'
 export default {
   name: 'SendOutDetailModal',
   mixins: [commonMixin],
@@ -163,6 +175,19 @@ export default {
         this.showTipModal = false
       }
     },
+    editIssue(){
+      this.showEditQus = !this.showEditQus
+      this.$nextTick(()=>{
+        this.$refs.issue.focus()
+      })
+    },
+    saveIssue(){
+      updateIssueRemark({issueRemark: this.detail.issueRemark, sendBillSn: this.sendBillSn}).then(res => {
+        this.showEditQus = false
+      }).catch(res => {
+        this.$refs.issue.focus()
+      })
+    },
     // 编辑
     getDetail (data, type, title) {
       this.type = type // 0 是物流跟踪,1是详情
@@ -176,6 +201,7 @@ export default {
         if (res.data) {
           this.detail = res.data
           this.detail.receiveFlag = res.data.receiveFlag == 1
+          this.detail.issueRemark = this.detail.issueRemark || ''
           this.form.receiveFlag = false
           this.form.receiveDate = ''
           this.form.transportState = res.data.transportState

+ 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