Merge remote-tracking branch 'origin/master'

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

@@ -263,12 +263,14 @@ import {
 } from '@/api/key-dm-inbound'
 import MaterialSelector from '@/view/key-person/key_dm_conf/materialSelector.vue'
 import { normalizeVisitTimeValue } from '@/view/key-person/key_dm_conf/dates.js'
+import axios from 'axios'
 
 export default {
   name: 'key-dm-inbound-index',
   components: { MaterialSelector },
   data () {
     return {
+      // 表单验证规则
       importShow: false,
       impBtnDisabled: false,
       // 时间范围数组
@@ -505,11 +507,12 @@ export default {
   created () { this.fetchList('inbound') },
   methods: {
     showImport () {
-      // 简单权限控制：可根据需要替换
-      const info = this.$store.state.user.otherUserInfo || {}
-      const areaId = info.area_id || ''
-      if (areaId && areaId.startsWith('2201')) return true
-      return false
+      // // 简单权限控制：可根据需要替换
+      // const info = this.$store.state.user.otherUserInfo || {}
+      // const areaId = info.area_id || ''
+      // if (areaId && areaId.startsWith('2201')) return true
+      // return false
+      return true
     },
     async tplDownload () {
       // 下载入库导入模板
@@ -726,6 +729,10 @@ export default {
         this.inboundModal.saving = false
         return
       }
+      if (this.inboundModal.details === null || this.inboundModal.details.length < 1) {
+        this.$Message.warning('请至少入库一条用品')
+        return
+      }
       // 2. 验证明细数据
       const invalidDetails = this.inboundModal.details.filter(detail => {
         return !detail.inbound_quantity || detail.inbound_quantity <= 0

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

@@ -506,8 +506,7 @@ export default {
             }
           }
         },
-        { title: '单位', key: 'unit' },
-        { title: '备注', key: 'issue_remark' }
+        { title: '单位', key: 'unit' }
       ],
       approveDetailColumns: [
         { title: '物料名称', key: 'material_name' },
@@ -540,7 +539,7 @@ export default {
             return h('span', this.formatDateTime(row.create_time) || row.create_time || '-')
           }
         },
-        { title: '操作人', key: 'create_by' }
+        { title: '操作人', key: 'name' }
       ],
       // 选择器控制与已选明细
       showMaterialSelector: false,