Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2025-11-24 1e31f9f7fe6f04236e97f72c0df3ce051d5f867e

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

@@ -2,7 +2,7 @@
import {nextTick, onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import * as XLXS from "xlsx"
import {ElMessage, ElMessageBox} from "element-plus"
import {Action, ElMessage, ElMessageBox} from "element-plus"
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import  useUserInfoStore from '@/stores/userInfo'
@@ -12,12 +12,15 @@
import CreateCustomer from "@/views/sd/customer/CreateCustomer.vue"
import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue"
import OrderSizeCheck from "@/components/sd/order/OrderSizeCheck.vue"
import UpdateAlienEditor from "@/components/sd/order/UpdateAlienEditor.vue"
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
import downLoadFile from "@/hook/downLoadFile"
import footSum from "@/hook/footSum"
import {useI18n} from "vue-i18n"
import {multiply,multiplyAuto,divideAuto} from '@/utils/decimal'
import OrderNumberReportTransfer from "@/components/sd/order/OrderNumberReportTransfer.vue"
import UploadPicture from "@/components/sd/order/UploadPicture.vue"
const { t } = useI18n()

let dialogTableVisible = ref(false)
@@ -25,6 +28,16 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
let dialogTransferVisible = ref(false)
let uploadPictureVisible = ref(false)
let alienEditorVisible = ref(false)
let fileUploadVisible = ref(false)
const transferData = ref({
  oldOrderId:null,
  newOrderNumber:null,
  newOrderId:null,
  oldOrderNumber:null,
})
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
const userStore = useUserInfoStore()
@@ -37,7 +50,10 @@
const shapeList = ref([
    {label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
const edgingTypeList = ref([])
const newOrderId = ref([])

const orderTypeState = ref(0)

// 定义表头上传数据
const titleUploadData = ref({
@@ -77,7 +93,8 @@
  orderClassify:[],
  packType:[],
  customer:[],
  saleMan:[]
  saleMan:[],
  edgingType:[]
})
let filterData = ref({})
let rowIndex = ref(null)
@@ -99,8 +116,8 @@
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true,gt:0 },//开启虚拟滚动
  scrollX:{ enabled: true,gt:0 },//开启虚拟滚动
  virtualXConfig:{ enabled: true,gt:0 },//开启虚拟滚动
  virtualYConfig:{ enabled: true,gt:0 },//开启虚拟滚动
  showOverflow:true,
  menuConfig: {
    body: {
@@ -117,7 +134,10 @@
          { code: 'errorArea', name: t('basicData.errorSettlementArea'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
          { code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
          { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'updateOrderId', name: '修改订单号', 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: 'fileUpload', name: t('上传dwg文件'),prefixIcon: 'vxe-icon-picture-fill',  visible: true, }
        ]
      ]
    }
@@ -168,14 +188,20 @@
      filters:[{ data: '' }],
      slots: { filter: 'num1_filter',edit:'shape_edit',default:'default_shape' }, sortable: true,filterMethod:filterChanged},
    {field: 'bendRadius',width:160,  title: t('order.bendRadius'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'edgingType',width:160,  title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'edgingType',width:160,  title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],
      slots: { filter: 'num1_filter',edit:'edgingType_edit' }, sortable: true,filterMethod:filterChanged},
    {field: 'processingNote',width:200,  title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'fileName',width:200,  title: t('order.drawingNo'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'remarks',width:140,  title: t('basicData.remarks'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},


  ],
  //表单验证
  editRules: {
    edgingType: [
      { required: company.edgingType},
      { min: 0, max: 255, message: t('basicData.msg.max255') }
    ],
    buildingNumber: [
      { required: false},
      { min: 0, max: 255, message: t('basicData.msg.max255') }
@@ -295,6 +321,7 @@
          break
        }
        case 'updateMoney': {
          $grid.clearEdit()
          updateMoney()
          break
        }
@@ -315,6 +342,7 @@
          break
        }
        case 'saveOrder': {
          xGrid.value.clearEdit()
          if ($grid.getTableData().tableData.length === 0){
            ElMessage.error( t('order.msg.tableLengthNot'))
            return
@@ -364,11 +392,28 @@
              orderIdType:company.orderIdType,
              creator:userStore.user.userName,
              creatorId:userStore.user.userId,
              newOrderId:newOrderId.value
              newOrderId:newOrderId.value,
              position:company.position
            }
            const grossAreaList = $grid.getTableData().fullData.filter(
                item=>item.grossArea === 0
            )
            //判断宽高相乘与字段结算面积是否相同

            for (const i in $grid.getTableData().fullData) {
              const item = $grid.getTableData().fullData[i]
              const grossArea = multiplyAuto(countArea(item),1,2)
              const itemGrossArea = multiplyAuto(item.grossArea,1,2)
              if(itemGrossArea!== grossArea ){
                ElMessage.warning(`${t('order.OrderNum')}
                ${Number(i)+1}${t('order.area')}: ${grossArea} != ${itemGrossArea}`)
                return
              }
            }




            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>(item.width*item.height/1000000 < errorArea.value*1)
            )
@@ -548,6 +593,7 @@
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          xGrid.value.updateFooter()
          break
        }
        case 'copyAll' :{
@@ -586,6 +632,7 @@
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          xGrid.value.updateFooter()
          break
        }
        case 'clearChecked' :{
@@ -600,6 +647,7 @@
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false

          break
        }
        case 'computedMoney' :{
@@ -688,6 +736,7 @@
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          xGrid.value.updateFooter()
          break
        }
        case 'incrementalChecked' : {
@@ -749,14 +798,44 @@

              })
            }



          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled = false
          xGrid.value.updateFooter()
          break
        }
        case "reportingTransfer":{
          const row = xGrid.value.getCurrentRecord()
          if(row===null){
            ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
            return
          }
          transferData.value.oldOrderNumber = row.orderNumber
          transferData.value.oldOrderId = titleUploadData.value.orderId
          dialogTransferVisible.value = true
          break
        }
        case 'uploadPicture':{
          const row = xGrid.value.getCurrentRecord()
          if(row===null){
            ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
            return
          }
          rowIndex=row
          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
        }

      }
    }
  },
@@ -797,6 +876,11 @@
  gridOptions.loading = true
  await initOrder(0)

  //异形导入
  if(!company.alienFunction){
    gridOptions.menuConfig.body.options[0][13].disabled=true
  }

  //启用表格拖动选中
  addListener(xGrid.value,gridOptions)
  let productData = route.query.produceList
@@ -819,14 +903,17 @@
      newOrderId.value=titleUploadData.value.orderId
      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
        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
        titleUploadData.value['verifierId'] = null
        titleUploadData.value['verifier'] = null


        const orderDetails = res.data.orderDetails
        orderDetails.forEach(item => {
@@ -836,9 +923,11 @@
        if(history.state.type=='copy'){
          xGrid.value.reloadData(orderDetails)
          gridOptions.menuConfig.body.options[0][11].disabled = true
          titleUploadData.value['version'] = null
        }
        if(history.state.type=='copyTitle'){
          gridOptions.menuConfig.body.options[0][11].disabled = true
          titleUploadData.value['version'] = null
        }

        gridOptions.loading = false
@@ -863,6 +952,11 @@
        //gridOptions.menuConfig.body.options[0][8].disabled =false
      }

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

      //按钮审核过后变为反审
      if(Math.abs(res.data.order.orderReview) === 2){
        gridOptions.toolbarConfig.buttons[2].disabled = false
@@ -880,9 +974,10 @@
          gridOptions.toolbarConfig.buttons[2].disabled = true
          gridOptions.toolbarConfig.buttons[3].disabled = true
          gridOptions.toolbarConfig.buttons[4].disabled = true


        }
      }
      if(res.data.order.processingCard>0 && company.connectMes){
        gridOptions.menuConfig.body.options[0][12].disabled = false
      }

      if(res.data.order.productionOrder !==0 ){
@@ -894,6 +989,12 @@
      const orderDetails = res.data.orderDetails
      orderDetails.forEach(item => {
        item.otherColumns = JSON.parse(item.otherColumns)
        if(res.data.orderFile!=null){
          res.data.orderFile.forEach(items=>{
            if(items.order_number==item.orderNumber)
            item.fileData=items.file_data
          })
        }
      })
      otherMoney.value =res.data.orderOtherMoneyList
          //加载副表数据
@@ -934,6 +1035,8 @@

    if(titleUploadData.value.calculateType===3){
      item.grossAmount=multiply(item.price,item.quantity)
    }else if(titleUploadData.value.calculateType===4){
      item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
    }else{
      item.grossAmount=multiply(item.price,item.computeGrossArea)
    }
@@ -989,6 +1092,10 @@

        })
      }
      titleSelectJson.value.edgingType.forEach(item=>{
        let type= {label:item.basicName,value:item.basicName}
        edgingTypeList.value.push(type)
      })
      //进入页面下拉框设置默认值
      titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
      titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
@@ -1055,6 +1162,17 @@
    }else {
      ElMessage.error(res.msg)
    }
  }).catch(()=>{
    if(titleUploadData.value.orderId.trim()!==""){
      ElMessageBox.alert(t('order.msg.updateOrderError'), 'Title', {
        confirmButtonText: 'OK',
        callback: (action: Action) => {
          router.push({path:'/main/order/createOrder',query:{
              orderId:titleUploadData.value.orderId,
              random:Math.random()}})
        },
      })
    }
  })
}

@@ -1087,17 +1205,17 @@
          orderId:newOrderId.value,
          random:Math.random()}})
    }else if(res.data==="false1"){
      ElMessage.warning("输入订单号不能大于最大订单号")
      ElMessage.warning(t('order.msg.updateOrderIdErrorGtMaxId'))
    }else if(res.data==="false2"){
      ElMessage.warning("输入订单号已存在")
      ElMessage.warning(t('order.msg.updateOrderIdErrorIsExist'))
    }else if(res.data==="false3"){
      ElMessage.warning("输入订单号相同")
      ElMessage.warning(t('order.msg.updateOrderIdErrorIsSame'))
    }else if(res.data==="false4"){
      ElMessage.warning("输入订单号长度不符")
      ElMessage.warning(t('order.msg.updateOrderIdErrorDiscrepancyInLength'))
    }else if(res.data==="false5"){
      ElMessage.warning("请输入数字")
      ElMessage.warning(t('order.msg.updateOrderIdErrorInputNumber'))
    }else if(res.data==="false6"){
      ElMessage.warning("不能修改第一个单子")
      ElMessage.warning(t('order.msg.updateOrderIdErrorNotNo1'))
    }
  })
}
@@ -1140,8 +1258,7 @@
  await  ElMessageBox.confirm(
        t('order.msg.differentSize'),
        t('order.msg.warning'),
        {
          confirmButtonText: t('basicData.confirmButtonText'),
        {confirmButtonText: t('basicData.confirmButtonText'),
          cancelButtonText: t('basicData.cancelButtonText'),
          type: 'warning',
        }
@@ -1287,6 +1404,8 @@
      }
      if(titleUploadData.value.calculateType===3){
        item.grossAmount=multiply(item.price , item.quantity)
      }else if(titleUploadData.value.calculateType===4){
        item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
      }else{
        item.grossAmount=multiply(item.price * 1 , item.computeGrossArea)
      }
@@ -1379,6 +1498,7 @@
   //   }
   // }
  titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
  xGrid.value.updateFooter()

}

@@ -1438,6 +1558,15 @@
    titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
  }
}

//关闭异形编辑界面
const refAlienEditor = ref()
const closeAlienEditorDialog = async (done) => {
  const flag = await refAlienEditor.value.validate()
  if(flag){
    done()
  }
}
//改变计算方式
const changeCalculateType = ()=>{
  const fullData = xGrid.value.getTableData().fullData
@@ -1450,13 +1579,23 @@
      if(titleUploadData.value.calculateType===3){
        item.grossAmount=parseFloat(multiply(item.price , item.quantity))
      }else if(titleUploadData.value.calculateType===4){
        item.grossArea = countArea(item)
        item.computeGrossArea = item.grossArea
        item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
        if(titleUploadData.value?.orderReview!==2){
          item.grossArea = countArea(item)
          item.computeGrossArea = item.grossArea
          item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
        }else{
          item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
        }

      }else{
        item.grossArea = countArea(item)
        item.computeGrossArea = item.grossArea
        item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
        if(titleUploadData.value?.orderReview!==2){
          item.grossArea = countArea(item)
          item.computeGrossArea = item.grossArea
          item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
        }else{
          item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
        }

      }
    }
  })
@@ -1477,7 +1616,7 @@
  }
  if(evnt.$event.keyCode === 13 ){
    const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
    let nextRowIndex = xGrid.value.getRowIndex(row) + 1
    let nextRowIndex = xGrid.value.getVTRowIndex(row) + 1


    switch (column.field){
@@ -1565,6 +1704,34 @@
  await initOrder(1)
  createCustomerVisible.value = false
}
const orderNumberTransfer = () => {
  router.push({
    path:'/main/order/createOrder',
    query:{
      orderId:titleUploadData.value.orderId,
      random:Math.random()}})
}

//图片上传名称
const getUploadPicture = async (name, fileData,fileJson) => {
  const row = xGrid.value.getCurrentRecord()
  row.fileName = name
  row.fileData = fileData
  row.fileJson = fileJson
  row.shape=2
  ElMessage.success(t('basicData.msg.saveSuccess'))
  alienEditorVisible.value=false

}

const fileToBase64 = (file) => {
  return new Promise((resolve, reject) => {
    const reader = new FileReader();
    reader.onload = () => resolve(reader.result);
    reader.onerror = reject;
    reader.readAsDataURL(file);
  });
};

</script>

@@ -1684,7 +1851,7 @@
                       :value="item.id"/>
          </el-select>
        </el-col>
        <el-col  :span="2"><el-text>{{$t('order.alType')}}</el-text></el-col>
        <el-col  :span="2"><el-text style="white-space: nowrap;">{{$t('order.alType')}}</el-text></el-col>
        <el-col  :span="2">
          <el-select v-model="titleUploadData.alType" clearable placeholder=" " >
            <el-option v-for="item in titleSelectJson['alType']"
@@ -1747,6 +1914,9 @@
        </template>
        <template #shape_edit="{ row }">
          <vxe-select v-model="row.shape" transfer :options="shapeList"  placeholder=" "/>
        </template>
        <template #edgingType_edit="{ row }">
          <vxe-select v-model="row.edgingType" transfer :options="edgingTypeList"  placeholder=" "/>
        </template>


@@ -1811,6 +1981,19 @@
          :otherMoney="otherMoney"
          style="width: 100%;height: 100%" />
    </el-dialog>
<!--异形导入-->
    <el-dialog v-model="alienEditorVisible"
               :title="$t('')"
               :close-on-click-modal="false"
               :close-on-press-escape="false"
               destroy-on-close
               style="width: 1114px;height:600px ">
      <update-alien-editor
          ref="refAlienEditor"
          :rowIndex="rowIndex"
          @getUploadPicture="getUploadPicture"
          style="width: 100%;height: 100%" />
    </el-dialog>

<!--    尺寸审核窗口-->
    <el-dialog
@@ -1836,6 +2019,25 @@
        style="width: 700px;height:445px;text-align: left "
    >
      <create-customer :getOrderPage="'order'" @getOrderFunction="createCustomerSuccess" />
    </el-dialog>

<!--    订单报工转移-->
    <el-dialog v-model="dialogTransferVisible"
               :close-on-click-modal="false"
               :title="$t('order.orderTransfer')"
               destroy-on-close width="500">
      <order-number-report-transfer :transferData="transferData" @orderNumberTransfer="orderNumberTransfer"/>
    </el-dialog>

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


@@ -1886,4 +2088,9 @@
    /*flex-direction : row;
    justify-content: space-between;*/
  }

  :deep(#loadDWG .el-dialog__body){
    height: 70vh;
    overflow-y: auto;
  }
</style>