Merge remote-tracking branch 'origin/master'

src/view/key-person/key_dm_inventory/index.vue

@@ -391,8 +391,10 @@
         <Row class="mt8"><Col span="24"><p><strong>预计归还日期：</strong>{{ formatDate(detailModal.data.expected_return_date) }}</p></Col></Row>
         <Row class="mt8"><Col span="24"><h4>明细</h4></Col></Row>
         <Table :data="detailModal.details" :columns="detailDetailColumns" size="small" border />
-        <Row class="mt8"><Col span="24"><h4>审批记录</h4></Col></Row>
-        <Table :data="detailModal.logs" :columns="detailLogsColumns" size="small" border />
+        <Row class="mt8"><Col span="24"><h3><strong>审批详情</strong></h3></Col></Row><br>
+        <!-- <Table :data="detailModal.logs" :columns="detailLogsColumns" size="small" border /> -->
+        <Row :gutter="16"><Col span="12"><p><strong>审批人：</strong>{{ detailModal.data.approver_name }}</p></Col><Col span="12"><p><strong>审批结果：</strong>{{ approvalStatusMap[detailModal.data.approval_status] }}</p></Col></Row>
+        <Row class="mt8"><Col span="24"><p><strong>审批意见：</strong>{{ detailModal.data.approval_opinion }}</p></Col></Row>
       </div>
       <div slot="footer"><Button type="primary" @click="detailModal.visible=false">关闭</Button></div>
     </Modal>
@@ -1293,6 +1295,7 @@ export default {
             this.$Message.success('保存成功')
             this.applyModal.visible = false
             this.fetchList('apply')
+            console.log(this.applyModal.saving)
           } else {
             this.$Notice.error({ title: '保存失败', desc: ret.data && ret.data.errmsg })
           }
@@ -1362,15 +1365,30 @@ export default {
     },
     confirmApprove () {
       this.approveModal.submitting = true
-      approveBorrow({ id: this.approveModal.record.id }).then(ret => {
-        if (ret.data && ret.data.errcode === 0) { this.$Message.success('已通过，已生成出库并更新库存'); this.approveModal.visible = false; this.fetchList('pending'); this.fetchList('apply') } else this.$Notice.error({ title: '操作失败', desc: ret.data && ret.data.errmsg })
+      approveBorrow({ id: this.approveModal.record.id, comment: this.approveModal.opinion }).then(ret => {
+        if (ret.data && ret.data.errcode === 0) {
+          this.$Message.success('已通过，已生成出库并更新库存')
+          this.approveModal.visible = false; this.fetchList('pending')
+          this.fetchList('apply')
+        } else {
+          this.$Notice.error({ title: '操作失败', desc: ret.data && ret.data.errmsg })
+        }
       }).finally(() => { this.approveModal.submitting = false })
     },
     confirmReject () {
-      if (!this.approveModal.opinion || !this.approveModal.opinion.trim()) { this.$Message.warning('请输入驳回原因'); return }
+      if (!this.approveModal.opinion || !this.approveModal.opinion.trim()) {
+        this.$Message.warning('请输入驳回原因')
+        return
+      }
       this.approveModal.submitting = true
       rejectBorrow({ id: this.approveModal.record.id, comment: this.approveModal.opinion }).then(ret => {
-        if (ret.data && ret.data.errcode === 0) { this.$Message.success('已驳回'); this.approveModal.visible = false; this.fetchList('pending') } else this.$Notice.error({ title: '驳回失败', desc: ret.data && ret.data.errmsg })
+        if (ret.data && ret.data.errcode === 0) {
+          this.$Message.success('已驳回')
+          this.approveModal.visible = false
+          this.fetchList('pending')
+        } else {
+          this.$Notice.error({ title: '驳回失败', desc: ret.data && ret.data.errmsg })
+        }
       }).finally(() => { this.approveModal.submitting = false })
     },