guoyuji
2024-03-25 64719dbf90ca93b9bf64c71c3e0f7d8685549e99
订单查询筛选界面添加功能 表头复制以及订单复制
4个文件已修改
49 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/lang/en.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/zh.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/en.js
@@ -128,6 +128,8 @@
        deleteConfirm:'Confirm order deletion?',
        orderType:'Order Type',
        processFlows:'Process flows:',
        copy:'Copy',
        copyTitle:'Copy Title',
        msgList:{
            checkOrder:'No order information is found. Please click Order first'
        }
north-glass-erp/northglass-erp/src/lang/zh.js
@@ -183,6 +183,8 @@
        deleteConfirm:'确认删除订单?',
        orderType:'订单类型',
        processFlows:'流程卡进度',
        copy:'复制订单',
        copyTitle:'复制表头',
        msgList:{
            checkOrder:'未查询到订单信息,请先单击订单'
        }
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -412,18 +412,35 @@
onMounted(()=>{
  //启用表格拖动选中
  addListener(xGrid.value,gridOptions)
  const str = route.query.orderId
  const str = route.query.orderId || history.state.orderId
  if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
    return
  }
  request.post(`/order/getOrderById/${str}`).then((res) => {
    if(res.code==200){
      titleUploadData.value = res.data.order
      if(history.state.orderId!=null){
        titleUploadData.value.orderId=''
        titleUploadData.value.id=null
        titleUploadData.value.processReview=null
        titleUploadData.value.orderReview=null
        titleUploadData.value.productionOrder=null
        titleUploadData.value.processingCard=null
        titleUploadData.value.warehousing=null
        titleUploadData.value.delivery=null
        titleUploadData.value.createTime=null
        if(history.state.type=='copy'){
          xGrid.value.reloadData(res.data.orderDetails)
        }
        return
      }
      //取消工艺按钮禁用
      gridOptions.toolbarConfig.buttons[1].disabled = false
      //工艺审核后保存按钮禁用
      if(res.data.order.processReview === 2){
        gridOptions.toolbarConfig.buttons[4].disabled = true
      }
      //取消审核按钮禁用
      if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -57,6 +57,8 @@
      body: {
        options: [
          [
            { code: 'copy', name: t('searchOrder.copy'), prefixIcon: 'vxe-icon-copy', visible: true},
            { code: 'copyTitle', name: t('searchOrder.copyTitle'), prefixIcon: 'vxe-icon-copy', visible: true},
            { code: 'getProcessList', name: t('searchOrder.processFlows'), prefixIcon: 'vxe-icon-file-txt', visible: true}
          ]
        ]
@@ -156,6 +158,30 @@
            dialogTableVisible.value = true
            break
          }
          case 'copy': {
            if(rowClickIndex.value===null){
              ElMessage.warning(t('searchOrder.msgList.checkOrder'))
              return
            }
            router.push({path:'/main/order/createOrder',
              state:{
                orderId:rowClickIndex.value.orderId,
                type:'copy'
              }})
            break
          }
          case 'copyTitle': {
            if(rowClickIndex.value===null){
              ElMessage.warning(t('searchOrder.msgList.checkOrder'))
              return
            }
            router.push({path:'/main/order/createOrder',
              state:{
                orderId:rowClickIndex.value.orderId,
                type:'copyTitle'
              }})
            break
          }
        }
      }