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

chenlu

2024-08-27 5df5dba2a321098fd0fc7e18b71549f5c2312049

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

@@ -5,7 +5,7 @@
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElMessage} from "element-plus"
import {Edit, VXETable} from "vxe-table"
import { VXETable} from "vxe-table"
import  useUserInfoStore from '@/stores/userInfo'
import companyInfo from "@/stores/sd/companyInfo"
import footSum from "@/hook/footSum"
@@ -15,11 +15,14 @@
import PrintSheet1 from "@/components/sd/order/PrintSheet1.vue"
import PrintSheet2 from "@/components/sd/order/PrintSheet2.vue"
import {useI18n} from "vue-i18n"
import useOrderInfoStore from "@/stores/sd/order/orderInfo"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global"
import { saveAs } from "file-saver"
import PrintSheet3 from "@/components/sd/order/PrintSheet3.vue";
import PrintSheet4 from "@/components/sd/order/PrintSheet4.vue";
import PrintSheet3 from "@/components/sd/order/PrintSheet3.vue"
import PrintSheet4 from "@/components/sd/order/PrintSheet4.vue"
import PrintSheet5 from "@/components/sd/order/PrintSheet5.vue"
  const { t } = useI18n()
  const orderInfo = useOrderInfoStore()
  const userStore = useUserInfoStore()
  const company = companyInfo()
  const tabsValue=ref('1')
@@ -30,14 +33,13 @@
  let dialogKey = ref(0)
  let sheetIndex = ref(-1)
  let orderType = ref("2")
  let selectDate = ref(["",""])
  let filterData = ref({})
  let orderList = ref([])
  let pageNum=ref(1)
  let total = reactive({
    pageTotal : 0,
    dataTotal : 0,
    pageSize : 100
    pageSize : 50
  })


@@ -78,16 +80,17 @@
            { code: 'copyTitle', name: t('searchOrder.copyTitle'), prefixIcon: 'vxe-icon-copy', visible: true},
            {
              prefixIcon: 'vxe-icon-print',
              name: '加工单',
              name: t('order.processingOrder'),
              children: [
                { code: 'sheet1', name: '横版-普通' },
                { code: 'sheet2', name: '横版-多层明细' },
                { code: 'sheet4', name: '生产加工单纵版' },
                { code: 'sheet3', name: '浏览发货信息' }
                // { 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: 'oneClickStorage', name: "一键完工", prefixIcon: 'vxe-icon-copy', visible: true},
            { code: 'oneClickStorage', name: t('order.oneClickStorage'), prefixIcon: 'vxe-icon-copy', visible: true},
           // { code: 'getProcessList', name: t('searchOrder.processFlows'), prefixIcon: 'vxe-icon-file-txt', visible: true}
          ]
        ]
@@ -100,12 +103,13 @@
      {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left",},

      {field:'createOrder',title: t('searchOrder.createOrder'), width: 40, slots: { default: 'state' }},
      {field:'processReview',title: t('order.technology'), width: 40, slots: { default: 'state' }},
      {field:'orderReview',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
      {field:'productionOrder',title: t('searchOrder.production'), width: 40, slots: { default: 'state' }},
      {field:'processingCard',title: t('searchOrder.process'), width: 40, slots: { default: 'state' }},
      {field:'warehousing',title: t('searchOrder.storage'), width: 40, slots: { default: 'state' }},
      {field:'delivery',title: t('searchOrder.delivery'), width: 40, slots: { default: 'state' }},
      {field:'processReview',title: t('order.technology'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'orderReview',title: t('basicData.review'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'productionOrder',title: t('searchOrder.production'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'processingCard',title: t('searchOrder.process'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'warehousing',title: t('searchOrder.storage'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
      {field:'delivery',title: t('searchOrder.delivery'), width: 40,filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},


      {field: 'orderId',width:120,  title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'customerId',width:120,  title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -115,19 +119,27 @@
      {field: 'quantity',width:120,  title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {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: '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: '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},
      {field: 'deliveryAddress',width:120,  title: t('order.deliveryAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
      {field: 'deliveryAddress',width:120,  title: t('order.deliveryAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'processingNote',width:120,  title: t('order.processingNote'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}

    ],

    mouseConfig:{selected: true},//鼠标选中
    keyboardConfig:{
      isArrow: true
    },
    //表头按钮
    toolbarConfig: {
      buttons: [
@@ -150,7 +162,7 @@
          if (columnIndex === 0) {
            return t('basicData.total')
          }
          const List = ["quantity",'goodsQuantity','area','perimeter']
          const List = ["quantity",'goodsQuantity','area','perimeter','money']
          if (List.includes(column.field)) {
            return footSum(data, column.field)
          }
@@ -229,6 +241,19 @@
            }
            break
          }
          case 'sheet5': {
            if(rowClickIndex.value===null){
              ElMessage.warning(t('searchOrder.msgList.checkOrder'))
              return
            }
            ElMessage.warning(t('order.printingNumber')+rowClickIndex.value.printingNumber)
            dialogTableVisible.value = true
            sheetIndex.value=5
            if(rowClickIndex.value.processReview===2 && rowClickIndex.value.orderReview===0){
              reviewDisabled.value=false
            }
            break
          }

          case 'copy': {
            if(rowClickIndex.value===null){
@@ -288,11 +313,11 @@

  const getOrderList = () => {
    //加载请求
    request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
    request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal= res.data.total.pageTotal
        selectDate.value = res.data.selectDate
        orderInfo.selectDate = res.data.selectDate
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
      }else{
@@ -323,7 +348,7 @@
    }else{
      filterData.value[column.property] = value
    }
    request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData.value).then((res) => {
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData.value).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal=parseInt(res.data.total)
@@ -340,12 +365,12 @@
  //双击表格行

  const selectOrderList = ()=>{
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${selectDate.value}`
        ,filterData).then((res) => {
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`
        ,filterData.value).then((res) => {
      if(res.code==200){
        total.dataTotal = res.data.total.total*1
        total.pageTotal = res.data.total.pageTotal
        selectDate.value=res.data.selectDate
        orderInfo.selectDate=res.data.selectDate
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)

@@ -410,7 +435,7 @@
const exportFile = ()=>{
  const html = document.getElementById("child").innerHTML // 获取需要导出的HTML内容
  const blob = new Blob([html], { type: 'application/vnd.ms-excel' }) // 创建Blob对象
  saveAs(blob, rowClickIndex.value.orderId+".xlsx");
  saveAs(blob, rowClickIndex.value.orderId+".xls");
}

const reviewOrder = ()=>{
@@ -428,13 +453,38 @@
}

const printingNumber = ()=>{
  request.post(`/order/updateOrderPrintNumber/${rowClickIndex.value.orderId}`).then(res =>{
  if(sheetIndex.value===4){
    request.post(`/order/updateOrderPrintNumber/${rowClickIndex.value.orderId}`).then(res =>{

  })
    })
  }

}

const closeDialog = ()=>{
  selectOrderList()
  /*selectOrderList()
  console.log(xGrid.value.getTableData())*/

}

const handleKeyDown = (evnt) =>{

  if(evnt.$event.keyCode === 38 ){
    let nextRowIndex = xGrid.value.getRowIndex(xGrid.value.getCurrentRecord()) - 1;
    if (nextRowIndex < xGrid.value.getTableData().fullData.length && nextRowIndex>=0) {
      xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
      rowClickIndex.value = xGrid.value.getCurrentRecord()
    }

  }
  if(evnt.$event.keyCode === 40 ){
    let nextRowIndex = xGrid.value.getRowIndex(xGrid.value.getCurrentRecord()) + 1;
    if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
      xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
      rowClickIndex.value = xGrid.value.getCurrentRecord()
    }

  }
}

</script>
@@ -443,7 +493,7 @@
  <div  style="width: 100%;height: 100% ;">
    <div style="width: 100%;height: 55%">
      <el-date-picker
          v-model="selectDate"
          v-model="orderInfo.selectDate"
          type="daterange"
          :start-placeholder="$t('basicData.startDate')"
          :end-placeholder="$t('basicData.startDate')"
@@ -466,6 +516,7 @@
          ref="xGrid"
          v-bind="gridOptions"
          v-on="gridEvents"
          @keydown="handleKeyDown"

      >
        <!--      下拉显示所有信息插槽-->
@@ -511,6 +562,17 @@
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input type="type" v-model="option.data" @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-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>
              </vxe-select>
            </div>
          </div>
        </template>
@@ -572,7 +634,9 @@
        v-model="dialogTableVisible"
        @close="closeDialog"
        destroy-on-close
        style="width: 75%;height:75% "
        style="width: 90%;height:90%;margin-top: 3vh "
        :close-on-click-modal="false"
        :close-on-press-escape="false"
    >
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle />
@@ -584,6 +648,7 @@
      <print-sheet2 id="child" v-else-if="sheetIndex===2" :orderId="rowClickIndex.orderId" />
      <print-sheet3 id="child" v-else-if="sheetIndex===3" :orderId="rowClickIndex.orderId" />
      <print-sheet4 id="child" v-else-if="sheetIndex===4" :orderId="rowClickIndex.orderId" />
      <print-sheet5 id="child" v-else-if="sheetIndex===5" :orderId="rowClickIndex.orderId" />

    </el-dialog>