订单明细报表新增楼层编号跟其他列

廖井涛

4 天以前 2f44fc75c78e9291f07a0864199235cde689fa8d

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

@@ -4,7 +4,7 @@
import {computed, onMounted, reactive, ref} from "vue"
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElMessage} from "element-plus"
import {ElMessage, ElMessageBox} from "element-plus"
import { VXETable} from "vxe-table"
import  useUserInfoStore from '@/stores/userInfo'
import companyInfo from "@/stores/sd/companyInfo"
@@ -21,6 +21,7 @@
import PrintSheet3 from "@/components/sd/order/PrintSheet3.vue"
import PrintSheet4 from "@/components/sd/order/PrintSheet4.vue"
import PrintSheet5 from "@/components/sd/order/PrintSheet5.vue"
import OrderProcessCollect from "@/components/sd/order/OrderProcessCollect.vue";
  const { t } = useI18n()
  const orderInfo = useOrderInfoStore()
  const userStore = useUserInfoStore()
@@ -34,9 +35,13 @@
  let sheetIndex = ref(-1)
  let orderType = ref("2")
  let filterData = ref({})
  let sortData = ref({
    field:'id',
    order:null
  })
  let orderList = ref([])
  let pageNum=ref(1)
  let total = reactive({
  let total = ref({
    pageTotal : 0,
    dataTotal : 0,
    pageSize : 50
@@ -64,6 +69,9 @@
    filterConfig: {   //筛选配置项
      remote: true
    },
    sortConfig: {   //排序配置项
      remote: true//是否服务端排序
    },
    customConfig: {
      storage: true
    },
@@ -83,10 +91,22 @@
              name: t('order.processingOrder'),
              children: [
                // { code: 'sheet1', name: '横版-普通' },
                { code: 'sheet2', name: t('order.sheet2') },
                { code: 'sheet4', name: t('order.sheet4') },
                { code: 'sheet3', name: t('order.sheet3') },
                { code: 'sheet5', name: t('order.sheet5')},
                { code: 'sheet2', name: t('order.sheet2') },//加工单横版
                { code: 'sheet4', name: t('order.sheet4') },//加工单-竖版
                { code: 'sheet3', name: t('order.sheet3') },//发货确认单
                { code: 'sheet5', name: t('order.sheet5')},//加工单 竖版单片

              ]
            },
            {
              prefixIcon: 'vxe-icon-repeat',
              name: t('order.oneClickReturn'),
              children: [
                // { code: 'sheet1', name: '横版-普通' },
                { code: 'back1', name: t('searchOrder.createOrder'),disabled:true },
                { code: 'back2', name: t('order.technology'),disabled:true  },
                { code: 'back3', name: t('basicData.review'),disabled:true  },
                { code: 'back4', name: t('searchOrder.production'),disabled:true },

              ]
            },
@@ -120,15 +140,15 @@
      {field: 'goodsQuantity',width:120,  title: t('searchOrder.inventoryNum'), sortable: true},
      {field: 'area',width:120,  title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'money',width:120,  title: t('order.money'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'createTime',width:120,   title: t('basicData.reportData'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'updateTime',width:120,   title: t('productStock.approvedDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'createTime',width:120,filters:[{ data: '' }],slots: { filter: 'num1_filter' },   title: t('basicData.reportData'), sortable: true},
      {field: 'updateTime',width:120,   title: t('productStock.approvedDate'), sortable: true},
      {field: 'packType',width:120,  title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'orderType',width:120,  title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'salesman',width:120,  title: t('order.salesman'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'creator',width:120,  title: t('product.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'verifier',width:120,  title: t('basicData.review'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'perimeter',width:120,  title: t('searchOrder.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'deliveryDate',width:120,  title: t('order.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'deliveryDate',width:120,  title: t('order.deliveryDate'), sortable: true},
      {field: 'customerBatch',width:120,  title: t('order.customerBatch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

      //{field: '14',width:120,  title: '备注',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -164,7 +184,8 @@
          }
          const List = ["quantity",'goodsQuantity','area','perimeter','money']
          if (List.includes(column.field)) {
            return footSum(data, column.field)
            //return footSum(data, column.field)
            return total.value[column.field]
          }
          return ''
        })
@@ -254,6 +275,22 @@
            }
            break
          }
          case 'back1': {
            backProcess(1)
            break
          }
          case 'back2': {
            backProcess(2)
            break
          }
          case 'back3': {
            backProcess(3)
            break
          }
          case 'back4': {
            backProcess(4)
            break
          }

          case 'copy': {
            if(rowClickIndex.value===null){
@@ -288,11 +325,11 @@
              ElMessage.warning(t('order.orderNotApproved'))
              return
            }
            if(rowClickIndex.value.warehousing>0){
            if(rowClickIndex.value.warehousing==2){
              ElMessage.warning(t('order.orderHasBeenReceived'))
              return
            }
            request.post(`/FinishedGoodsInventory/oneClickStorage/${rowClickIndex.value.orderId}/${userStore.user.userName}`).then((res) => {
            request.post(`/finishedGoodsInventory/oneClickStorage/${rowClickIndex.value.orderId}/${userStore.user.userName}`).then((res) => {
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.receivedSuccessfully'))
                router.push({path:'/main/order/selectOrder',query:{random:Math.random()}})
@@ -308,15 +345,74 @@
    },
    cellClick({ row }){
      rowClickIndex.value = row
      xGrid.value.menuConfig.body.options[0][3].children.forEach((item)=>{
        item.disabled=true
      })
      //判断是否入库
      if(row.warehousing>0){
        return
      }
      if(row.processReview===2){
        xGrid.value.menuConfig.body.options[0][3].children[0].disabled=false
      }
      if(row.orderReview===2){
        xGrid.value.menuConfig.body.options[0][3].children[1].disabled=false
      }
      if(row.productionOrder>0){
        xGrid.value.menuConfig.body.options[0][3].children[2].disabled=false
      }
      if(row.processingCard>0){
        xGrid.value.menuConfig.body.options[0][3].children[3].disabled=false
      }
    },
    sortChange ({ field, order }) {
      sortData.value = {field,order}
      selectOrderList()
    }
  }
  const backProcess = (status) => {
    if(rowClickIndex.value===null){
      ElMessage.warning(t('searchOrder.msgList.checkOrder'))
      return
    }

  const getOrderList = () => {
    ElMessageBox.confirm(
        t('searchOrder.msgList.BackSure'),
        'Warning',
        {
          confirmButtonText: t('basicData.confirmButtonText'),
          cancelButtonText: t('basicData.cancelButtonText'),
          type: 'warning',
        }
    )
        .then(() => {
          request.post(`/order/processBack/${rowClickIndex.value.orderId}/${status}`).then((res) => {
            if(res.code==='200' && res.data===true){
              ElMessage.success(t('product.msg.operateSuccess')+'!')
              selectOrderList()
            }else if(res.data==='false1'){
              ElMessage.warning(t('searchOrder.msgList.isOptimize'))
            }else if(res.data==='false2'){
              ElMessage.warning(t('searchOrder.msgList.isReportingWork'))
            }else if(res.data==='false3'){
              ElMessage.warning(t('searchOrder.msgList.isStorage'))
            }
          })
        })
  }


  const getOrderList = async () => {
    //加载请求
    request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData).then((res) => {
    const config = {
      filter: filterData.value,
      sort: sortData.value
    }
    await request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal= res.data.total.pageTotal
        total.value = res.data.total
        /*total.dataTotal = res.data.total.dataTotal*1
        total.pageTotal= res.data.total.pageTotal*/
        orderInfo.selectDate = res.data.selectDate
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
@@ -325,8 +421,12 @@
      }
    })
  }
  onMounted(() => {
    getOrderList()
  onMounted(async () => {
    filterData.value = orderInfo.searchOrderFilter.data
    await getOrderList()
    orderInfo.searchOrderFilter.list.forEach(item =>{
      xGrid.value.getColumnByField(item.field).filters = item.column.filters
    })
  })

  const changeFilterEvent = (event, option, $panel) => {
@@ -348,28 +448,46 @@
    }else{
      filterData.value[column.property] = value
    }
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData.value).then((res) => {
    const config = {
      filter: filterData.value,
      sort: sortData.value
    }
    request.post(`/order/getOrderList/${pageNum.value}/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal=parseInt(res.data.total)
        total.value = res.data.total
        /*total.dataTotal = res.data.total.total*1
        total.pageTotal=parseInt(res.data.total)*/
        pageNum.value=1
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
        gridOptions.loading=false

        orderInfo.searchOrderFilter.list = xGrid.value.getCheckedFilters()
        orderInfo.searchOrderFilter.data = filterData.value
      }else{
        ElMessage.warning(res.msg)
      }
    }).catch(e => {
      xGrid.value.clearFilter()
      orderInfo.searchOrderFilter.data = {}
      ElMessage.error(t('searchOrder.msgList.filterError'))
    }).finally(()=>{
      gridOptions.loading=false
    })
  }

  //双击表格行

  const selectOrderList = ()=>{
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`
        ,filterData.value).then((res) => {
    const config = {
      filter: filterData.value,
      sort: sortData.value
    }
    request.post(`/order/getOrderList/${pageNum.value}/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`
        ,config).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal = res.data.total.pageTotal
        total.value = res.data.total
        /*total.dataTotal = res.data.total.total*1
        total.pageTotal = res.data.total.pageTotal*/
        orderInfo.selectDate=res.data.selectDate
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
@@ -486,6 +604,12 @@

  }
}
//订单距离小于三天则改变checkbox class 改变颜色
const timeOutChangeColor =(row)=>{
  if(company.timeOut){
    return row.timeOut
  }
}

</script>

@@ -531,12 +655,14 @@

        <template #state="{ row,column}">
          <el-checkbox
              :class="timeOutChangeColor(row)"
              v-if="row[column.field] === 2"
              @click.native.prevent
              :indeterminate="row[column.field]===1"
              :checked="true"/>
          <el-checkbox
              v-else
              :class="timeOutChangeColor(row)"
              @click.native.prevent
              :indeterminate="row[column.field]===1"
              :checked="false"/>
@@ -551,7 +677,10 @@
                     size="small">
            {{ $t('basicData.edit') }}
          </el-button>
          <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
          <el-popconfirm
              v-if="userStore.user.permissions.indexOf('selectOrder.edit') > -1"
              @confirm="getTableRow(row,'delete')"
                         :title="$t('searchOrder.deleteConfirm')">
            <template #reference>
              <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
            </template>
@@ -561,14 +690,20 @@
        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
              <input
                  v-model="option.data"
                  @keyup.enter.native="$panel.confirmFilter()"
                  @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </template>
        <template #num2_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <vxe-select v-model="option.data"  @change="changeFilterEvent($event, option, $panel)" :placeholder="$t('processCard.pleaseSelect')">
              <vxe-select
                  v-model="option.data"
                  @change="changeFilterEvent($event, option, $panel)"
                  :placeholder="$t('processCard.pleaseSelect')">
                <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
                <vxe-option value="1" :label="$t('basicData.partiallySelected')"></vxe-option>
                <vxe-option value="2" :label="$t('basicData.selected')"></vxe-option>
@@ -609,19 +744,29 @@
        <el-tab-pane :label="$t('order.details')" name="1" >
          <order-detail
              v-if="tabsValue==='1'"
            :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
              :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
              :row="rowClickIndex===null?{}:rowClickIndex"
          />
        </el-tab-pane>
        <el-tab-pane :label="$t('order.workmanship')" name="2">
          <order-craft-detail
              v-if="tabsValue==='2'"
              :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
              :row="rowClickIndex===null?{}:rowClickIndex"
          />
        </el-tab-pane>
        <el-tab-pane :label="$t('order.processCard')" name="3">
          <order-process
              v-if="tabsValue==='3'"
              :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
              :row="rowClickIndex===null?{}:rowClickIndex"
          />
        </el-tab-pane>
        <el-tab-pane :label="$t('order.processCardCollect')" name="4">
          <order-process-collect
              v-if="tabsValue==='4'"
              :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
              :row="rowClickIndex===null?{}:rowClickIndex"
          />
        </el-tab-pane>
      </el-tabs>
@@ -676,7 +821,10 @@
  height: 100%;
}


:deep(.timeOut.is-checked .el-checkbox__inner) {
  background-color: orangered;
  border-color: orangered;
}


</style>