工程打印明细新增玻璃编号显示

廖井涛

2025-11-17 fcbce36f8734813b13c8f9c5b26b4bd192274534

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -31,6 +31,7 @@
let dialogTransferVisible = ref(false)
let uploadPictureVisible = ref(false)
let alienEditorVisible = ref(false)
let fileUploadVisible = ref(false)
const transferData = ref({
  oldOrderId:null,
  newOrderNumber:null,
@@ -50,6 +51,8 @@
    {label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
const newOrderId = ref([])

const orderTypeState = ref(0)

// 定义表头上传数据
const titleUploadData = ref({
@@ -131,7 +134,8 @@
          { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'updateOrderId', name: t('searchOrder.updateOrderId'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'reportingTransfer', name: t('searchOrder.reportingTransfer'), prefixIcon: 'vxe-icon-send', visible: true, disabled: true },
          { code: 'uploadPicture', name: t('order.graphic'),prefixIcon: 'vxe-icon-picture-fill',  visible: true, }
          { code: 'uploadPicture', name: t('order.graphic'),prefixIcon: 'vxe-icon-picture-fill',  visible: true, },
          { code: 'fileUpload', name: t('上传dwg文件'),prefixIcon: 'vxe-icon-picture-fill',  visible: true, }
        ]
      ]
    }
@@ -815,7 +819,18 @@
            return
          }
          rowIndex=row
          alienEditorVisible.value= true
          alienEditorVisible.value=true
          break
        }
        case 'fileUpload':{
          const row = xGrid.value.getCurrentRecord()
          if(row===null){
            ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
            return
          }
          rowIndex=row
          fileUploadVisible.value=true
          break
        }

      }
@@ -896,6 +911,7 @@
        titleUploadData.value['verifierId'] = null
        titleUploadData.value['verifier'] = null


        const orderDetails = res.data.orderDetails
        orderDetails.forEach(item => {
          item.otherColumns = JSON.parse(item.otherColumns)
@@ -931,6 +947,11 @@
      if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
        gridOptions.toolbarConfig.buttons[2].disabled = false
        //gridOptions.menuConfig.body.options[0][8].disabled =false
      }

      //下单后工艺审核之前可以右键上传dwg文件
      if(res.data.order.createOrder === 2 && res.data.order.processReview === 0){
        orderTypeState.value=1
      }

      //按钮审核过后变为反审
@@ -1950,7 +1971,7 @@
          style="width: 100%;height: 100%" />
    </el-dialog>
<!--异形导入-->
<!--    <el-dialog v-model="alienEditorVisible"
    <el-dialog v-model="alienEditorVisible"
               :title="$t('')"
               :close-on-click-modal="false"
               :close-on-press-escape="false"
@@ -1961,7 +1982,7 @@
          :rowIndex="rowIndex"
          @getUploadPicture="getUploadPicture"
          style="width: 100%;height: 100%" />
    </el-dialog>-->
    </el-dialog>

<!--    尺寸审核窗口-->
    <el-dialog
@@ -1998,12 +2019,13 @@
    </el-dialog>

    <el-dialog id="loadDWG"
               v-model="alienEditorVisible"
               v-model="fileUploadVisible"
               :close-on-click-modal="false"
               destroy-on-close width="800px">
      <upload-picture
          :rowIndex="rowIndex"
          :orderId="titleUploadData.orderId"
          :state="orderTypeState"
      />
    </el-dialog>