廖井涛
2024-06-04 2f0300262d41b2fc3669b93c2e03cfc2586d2b9e
Merge branch 'master' of http://bore.pub:10439/r/ERP_override
1个文件已修改
35 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -2,7 +2,7 @@
import {onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import * as XLXS from "xlsx"
import {ElMessage} from "element-plus"
import {ElMessage, ElMessageBox} from "element-plus"
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import  useUserInfoStore from '@/stores/userInfo'
@@ -93,7 +93,7 @@
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true,gt:13 },//开启虚拟滚动
  //scrollX:{ enabled: true,gt:15 },//开启虚拟滚动
  scrollX:{ enabled: true,gt:7 },//开启虚拟滚动
  showOverflow:true,
  menuConfig: {
    body: {
@@ -327,12 +327,40 @@
              ElMessage.error(t('basicData.msg.checkoutLose'))
              return
            }
            let order ={
              title:titleUploadData.value,
              detail:$grid.getTableData().tableData,
              detail:$grid.getTableData().fullData,
              otherMoney:otherMoney.value
            }
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>item.computeArea*1 < errorArea.value*1
            )
            if(errorAreaList.length){
              ElMessageBox.confirm(
                  `存在
                  ${errorAreaList.length}
                  条结算单片面积小于
                  ${errorArea.value}是否按照${errorArea.value}计算`,
                  'Warning',
                  {
                    confirmButtonText: '确定',
                    cancelButtonText: '取消',
                    type: 'warning',
                  }
              ).then(()=>{
                errorAreaComputed()
            saveOrder(order)
              }).catch(()=>{
                saveOrder(order)
              })
            }
          }
          break
        }
@@ -1096,7 +1124,6 @@
        id="sizeCheck"
        v-model="sizeCheckVisible"
       :title="'尺寸校验'"
       destroy-on-close
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       style="width: 614px;height:445px "