打印加工单修改，新增用户登录日志

廖井涛

8 天以前 79b057e22e97e7db70faf25b33a5977b06771810

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue

@@ -1,7 +1,7 @@
<script setup>
import {Search} from "@element-plus/icons-vue"
import {useRouter} from "vue-router"
import {reactive, ref} from "vue";
import {onMounted, reactive, ref} from "vue";
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import VXETable from "vxe-table";
@@ -18,6 +18,15 @@
const username = userStore.user.userName
const userid = userStore.user.userId
let produceList = ref([])


const props = defineProps({
  customerId: null,
  project: null,
  excludeOrderIds: null
})

const emit = defineEmits(['selectOrders'])

const getTableRow = (row,type) =>{
  switch (type) {
@@ -56,6 +65,9 @@
    quantityAvailable:'',

  },
  customerId: null,  // 新增
  project: null,     // 新增
  excludeOrderIds: []  // 新增

})
let selectDate = ref(["",""])
@@ -68,23 +80,38 @@
})


//第一次调用
request.post(`/delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal
    orderInfo.selectOrderListDate = res.data.selectDate
    pageNum.value=1
    produceList = deepClone(res.data.data)
    xGrid.value.loadData(produceList)
    gridOptions.loading=false
// 第一次调用，修改为带筛选条件
const fetchOrders = () => {
  // 新增：从props获取筛选条件
  if(props.customerId!==undefined){
    filterData.value.customerId = props.customerId
    filterData.value.project = props.project
    filterData.value.excludeOrderIds = props.excludeOrderIds
    gridOptions.toolbarConfig.buttons[0].visible  = false
  }else{
    ElMessage.warning(res.msg)
    router.push("/login")
    gridOptions.toolbarConfig.buttons[1].visible  = false
  }
})

  request.post(`/delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${orderInfo.selectOrderListDate}`, filterData.value).then((res) => {
    if(res.code==200){
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal
      orderInfo.selectOrderListDate = res.data.selectDate
      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)
      router.push("/login")
    }
  })
}


onMounted(() => {
  fetchOrders()
})

const changeFilterEvent = (event, option, $panel,) => {
  // 手动触发筛选
@@ -104,6 +131,16 @@
  }else{
    filterData.value[column.property] = value
  }

  if(props.customerId!==undefined){
    filterData.value.customerId = props.customerId
    filterData.value.project = props.project
    filterData.value.excludeOrderIds = props.excludeOrderIds
    gridOptions.toolbarConfig.buttons[0].visible  = false
  }else{
    gridOptions.toolbarConfig.buttons[1].visible  = false
  }

  request.post(`/delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {

    if(res.code==200){
@@ -142,7 +179,7 @@

const changeDate =  ()=>{
  pageNum.value=1
  selectOrderList()
  fetchOrders()
}

//页脚跳转
@@ -150,7 +187,7 @@
  total.pageTotal = pageSize
  pageNum.value=currentPage

  selectOrderList()
  fetchOrders()
}


@@ -215,7 +252,8 @@
  ],//表头按钮
  toolbarConfig: {
    buttons: [
      {'code': 'add', 'name': t('delivery.delivery'),status: 'primary',icon: 'vxe-icon-add'}
      {'code': 'add', 'name': t('delivery.delivery'),status: 'primary',icon: 'vxe-icon-add'},
      {'code': 'update', 'name': t('delivery.delivery'),status: 'primary',icon: 'vxe-icon-add'}
    ],
    /*import: false,
   export: true,
@@ -282,6 +320,37 @@
          router.push({path: '/main/delivery/createDelivery', query: { orderId: order_id }})
          break
        }
        case 'update': {
          const selectRecords = $grid.getCheckboxRecords()
          if (selectRecords.length === 0) {
            ElMessage.warning(t('productStock.unselectedData'))
            return
          }

          // 验证所选订单是否符合条件（虽然已筛选，但二次验证更安全）
          const customerIdArray = selectRecords.map(item => item.customerId)
          const projectArray = selectRecords.map(item => item.project?.trim() || '')

          if(!isAllEqual(customerIdArray)){
            ElMessage.warning(t('delivery.pleaseSelectTheSameCustomerOrder'))
            return
          }
          if(!isAllEqual(projectArray)){
            ElMessage.warning(t('delivery.pleaseSelectTheSameCustomerProject'))
            return
          }

          const simpleOrders = selectRecords.map(order => ({
            orderId: order.orderId,
            customerId: order.customerId,
            project: order.project,
            // 可补充其他需要的主订单字段
          }));

          // 通过事件返回给父组件
          emit('select-orders', simpleOrders);
          break
        }
      }
    }
  }