Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

廖井涛

2024-04-25 ed6f35069824d71ee6da599a328d865eb0c58550

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -5,14 +5,16 @@
import {ElDatePicker, ElMessage} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {Search} from "@element-plus/icons-vue"
import {ArrowLeftBold, Search} from "@element-plus/icons-vue"
import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
import Sortable from 'sortablejs'
import BasicTable from '@/components/basic/BasicTable.vue'
import BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
import useUserInfoStore from "@/stores/userInfo";

import { useI18n } from 'vue-i18n'
//语言获取
const { t } = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
const userStore = useUserInfoStore()
@@ -30,11 +32,11 @@
    case 'delete': {
      request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
        if (res.code == 200) {
          ElMessage.success("删除成功")
          ElMessage.success(t('workOrder.deleteOk'))
          location.reload();
        } else {
          ElMessage.warning(res.msg)
          router.push("/login")
         // router.push("/login")
        }
      })
      break
@@ -43,13 +45,14 @@
}

let flag = $ref(true)
function intoCreateProduct(){
  if(flag){

function intoCreateProduct() {
  if (flag) {
    router.push(`/main/processCard/SplittingDetails?orderId=${orderId}`)
  }else {
  } else {
    router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
  }
  flag=!flag
  flag = !flag
}

//定义时间
@@ -91,6 +94,8 @@

let orderId = route.query.orderId
let productionId = route.query.productionId


//第一次加载数据

request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {
@@ -116,7 +121,6 @@
}



/*后端返回结果多层嵌套展示*/
const hasDecimal = (value) => {
  const regex = /\./; // 定义正则表达式，查找小数点
@@ -125,7 +129,7 @@


//筛选方法
const filterChanged = ({ option, row, column }) => {
const filterChanged = ({option, row, column}) => {
  if (option.data) {
    return row[column.field].toString().toLowerCase().indexOf(option.data) > -1
  }
@@ -153,7 +157,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    //remote: true
                    //remote: true
  },
  customConfig: {
    storage: true
@@ -164,16 +168,45 @@
    showStatus: true
  },//表头参数
  columns: [
    {type: 'checkbox', fixed: "left", title: '选择'},
    {field: 'orderNumber', title: '订序', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'shape', title: '形状', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'width', title: '宽', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'height', title: '高', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'baiscQuantity', title: '待分数量', showOverflow: "ellipsis"},
    {field: 'computeGrossArea', title: '待分面积'},
    {field: 'totalThickness', title: '总厚度'},
    {field: 'thickness', title: '玻璃厚度'},
    {field: 'weight', title: '重量'}
    {type: 'checkbox', fixed: "left", title: t('basicData.check')},
    {
      field: 'orderNumber',
      title: t('order.OrderNum'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'shape',
      title: t('order.shape'),
      showOverflow: "ellipsis",
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'width',
      title: t('order.width'),
      sortable: true,
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      width: '60px'
    },
    {
      field: 'height',
      title: t('order.height'),
      sortable: true,
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      width: '60px'
    },
    {field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '60px'},
    {field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '60px'},
    {field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
    {field: 'thickness', title: t('processCard.glassThickness'), width: '60px'},
    {field: 'weight', title: t('processCard.weight')}
  ],//表头按钮

  toolbarConfig: {
@@ -189,11 +222,11 @@
  data: [],//table body实际数据
  //脚部求和
  footerMethod({columns, data}) {//页脚函数
    let footList = ['baiscQuantity', 'computeGrossArea', 'totalThickness','thickness', 'weight']
    let footList = ['', '', '', '', '']
    return [
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
@@ -204,7 +237,6 @@
  }

})


//左侧子组件接收参数
const xGridLeft = ref()
@@ -226,7 +258,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    //remote: true
                    //remote: true
  },
  customConfig: {
    storage: true
@@ -237,27 +269,40 @@
    showStatus: true
  },//表头参数
  columns: [
    {type: 'checkbox', fixed: "left", title: '选择'},
    {field: 'processId', title: '流程卡号', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 130,filterMethod:filterChanged},
    {type: 'checkbox', fixed: "left", title: t('basicData.check')},
    {
      field: 'processId',
      title: t('processCard.processId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      width: 130,
      filterMethod: filterChanged
    },
    {
      field: 'orderNumber',
      title: '订序',
      title: t('order.OrderNum'),
      showOverflow: "ellipsis",
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'}
      ,filterMethod:filterChanged
      , filterMethod: filterChanged
    },
    {field: 'landingSequence', title: '落架顺序', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'shape', title: '形状', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'width', title: '宽', showOverflow: "ellipsis"},
    {field: 'height', title: '高'},
    {field: 'quantity', title: '总数量'},
    {field: 'totalThickness', title: '总厚度'},
    {
      field: 'landingSequence',
      title: '落架顺序',
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {field: 'shape', title: t('order.shape'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'width', title: t('order.width'), showOverflow: "ellipsis"},
    {field: 'height', title: t('order.height')},
    {field: 'quantity', title: t('order.quantity')},
    {field: 'totalThickness', title: t('processCard.totalThickness')},
  ],//表头按钮

  toolbarConfig: {
    buttons: [
      {code: 'saveFlowCard', name: '保存', status: 'primary', icon: 'vxe-icon-save'},
      {code: 'saveFlowCard', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save'},
    ],
    // import: false,
    // export: true,
@@ -268,11 +313,11 @@
  data: [],//table body实际数据
  //脚部求和
  footerMethod({columns, data}) {//页脚函数
    let footList = ['总数量', '总面积', '分箱数']
    let footList = ['']
    return [
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
@@ -283,12 +328,15 @@
  }

})
//定义输入数量
let checkedNum = ref('')
//创建流程卡
const createProcessCard = () => {
  const $grid = xGrid.value
  const checkedList = $grid.getCheckboxRecords()

  if (checkedList.length === 0) {
    ElMessage.warning("请先选择右侧数据")
    ElMessage.warning(t('processCard.schedulingOk'))
    return
  }
  //productionId
@@ -299,21 +347,62 @@
    index = leftData[0].landingSequence + 1
    //index = index.toString().padStart(2, '0')
  }
  const processId = productionId + index.toString().padStart(2, '0')
  checkedList.forEach((item) => {
    item.processId = processId
    item.landingSequence = index
    item.quantity=item.baiscQuantity
  })
  checkedList.forEach((item)=>{
    delete item._X_ROW_KEY
  })
  const processId = productionId + index.toString().padStart(3, '0')
  const regex = /^(\d+|)$/;
  if (!regex.test(checkedNum.value)) {
    ElMessage.warning(t('processCard.schedulingNo'))
    return
  }
  //判断正整数
  if (/^[1-9]\d*$/.test(checkedNum.value)) {
    checkedList.forEach((item) => {
      //定义key值保持

  $gridLeft.insertAt(checkedList)
  $grid.remove(checkedList)
      //判断可用数量是否大于等于输入的数量,不满足则抛出异常
      if (item.baiscQuantity * 1 < checkedNum.value * 1) throw new Error(t('processCard.schedulingQuantity'));
      item.quantity =  checkedNum.value
      item.processId = processId
      item.landingSequence = index
      item.baiscQuantity=item.baiscQuantity - checkedNum.value
    })
    //删除key
    checkedList.forEach((item) => {
      let key = item._X_ROW_KEY
      delete item._X_ROW_KEY
      if (item.baiscQuantity===0){
        $grid.remove(checkedList)
      }
      $gridLeft.insertAt(checkedList)
      item._X_ROW_KEY = key
    })

//清除两边复选框
    $gridLeft.clearCheckboxRow()
    $grid.clearCheckboxRow()
  }
  else if (checkedNum.value === '') {//判断数量输入框无输入数字

    checkedList.forEach((item) => {
      item.processId = processId
      item.landingSequence = index
      item.quantity = item.baiscQuantity
    })
    //删除key
    checkedList.forEach((item) => {
      delete item._X_ROW_KEY
    })
    $gridLeft.insertAt(checkedList)
    $grid.remove(checkedList)
    //清除两边复选框
    $gridLeft.clearCheckboxRow()
    $grid.clearCheckboxRow()
  }



}

let checkedNum = ref('')


//向右边表格添加数据
const addRight = () => {
@@ -326,12 +415,12 @@
    const checkedList = $gridLeft.getCheckboxRecords()
    //判断左边表格是否有选中的数据
    if (checkedList.length === 0) {
      ElMessage.warning("请先选择左侧数据")
      ElMessage.warning(t('processCard.schedulingArea'))
      return
    }
    const regex = /^(\d+|)$/;
    if (!regex.test(checkedNum.value)) {
      ElMessage.warning("请输入正整数")
      ElMessage.warning(t('processCard.schedulingNo'))
      return
    }
    //判断正整数
@@ -339,7 +428,7 @@
      //对选中的左边表格数据进行循环
      checkedList.forEach((item) => {
        //判断可用数量是否大于等于输入的数量,不满足则抛出异常
        if (item.quantity < checkedNum.value) throw new Error("请输入小于等于可用数量的数字");
        if (item.quantity < checkedNum.value) throw new Error(t('processCard.schedulingQuantity'));
        //左边表格可用数量减去输入的数量
        item.quantity = item.quantity - checkedNum.value
        //右边表格数据
@@ -356,10 +445,13 @@
        } else {
          //右边表格没有此条数据则往右边表格插入数据
          item.baiscQuantity = checkedNum.value
          if (item.quantity === 0) {
            $gridLeft.remove(item)
          }
          $grid.insert(item)
        }
      })
    } else if (checkedNum.value === '') {//判断数量输入框有无输入数字
    } else if (checkedNum.value === '') {//判断数量输入框无输入数字

      checkedList.forEach((item) => {
        let rightData = $grid.getTableData().fullData
@@ -374,8 +466,12 @@

        $gridLeft.remove(item)
      })
    }


    }
    //清除两边复选框
    $gridLeft.clearCheckboxRow()
    $grid.clearCheckboxRow()
  } catch (e) {
    ElMessage.warning(e.message)
  }
@@ -392,58 +488,103 @@
    //获取左边表格checkbox选中的数据
    const checkedListLeft = $gridLeft.getCheckboxRecords()
    //判断右边表格是否有选中的数据
    if (checkedList.length === 0) {
      ElMessage.warning("请先选择右侧数据")
    if (checkedList.length * 1 === 0) {
      ElMessage.warning(t('processCard.schedulingOk'))
      return
    }
    if (checkedListLeft.length !== 1) {
      ElMessage.warning("请先选择左侧一条数据")
      ElMessage.warning(t('processCard.schedulingTime'))
      return
    }
    const regex = /^(\d+|)$/;
    if (!regex.test(checkedNum.value)) {
      ElMessage.warning("请输入正整数")
      ElMessage.warning(t('processCard.schedulingNo'))
      return
    }
    //判断正整数
    if (/^[1-9]\d*$/.test(checkedNum.value)) {
      checkedList.forEach((item) => {
        //判断可用数量是否大于等于输入的数量,不满足则抛出异常
        if (item.baiscQuantity < checkedNum.value) throw new Error("请输入小于等于可用数量的数字");
        if (item.baiscQuantity * 1 < checkedNum.value * 1) throw new Error("请输入小于等于待分数量的数字");
        item.baiscQuantity = item.baiscQuantity - checkedNum.value
        //定义key值保持
        let key = item._X_ROW_KEY
        //左边表格数据
        let leftData = $gridLeft.getTableData().fullData
        //左边表格数据中查找当前数据下标
        let filterIndex = leftData.findIndex(item1 => item1.orderNumber === item.orderNumber)
        //如果右边表格数据中存在当前数据则数量相加
        if (filterIndex >= 0) {
          leftData[filterIndex].quantity = leftData[filterIndex].quantity * 1 + checkedNum.value * 1
        //判断右侧勾选值与左侧是否相同
        if (checkedListLeft[0].orderNumber === item.orderNumber) {

          if (item.baiscQuantity === 0) {
            $grid.remove(checkedList)
          //如果右边表格数据中存在当前数据则数量相加
          if (filterIndex >= 0) {
            leftData[filterIndex].quantity = leftData[filterIndex].quantity * 1 + checkedNum.value * 1

            if (item.baiscQuantity === 0) {
              $grid.remove(checkedList)
            }
            //delete item._X_ROW_KEY
          } else {
            item.quantity = checkedNum.value
            item.processId = checkedListLeft[0].processId
            item.landingSequence = checkedListLeft[0].landingSequence
            delete item._X_ROW_KEY
            $gridLeft.insert(item)
            item._X_ROW_KEY = key
          }
        } else {

          //如果勾选两个值不同则插入同流程卡
          item.quantity = checkedNum.value
          item.processId = checkedListLeft[0].processId
          item.landingSequence = checkedListLeft[0].landingSequence
          delete item._X_ROW_KEY
          $gridLeft.insert(item)
          if (item.baiscQuantity === 0) {
            $grid.remove(checkedList)

          }
          for (let i = 0; i < leftData.length; i++) {
            if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId === item.processId) {
              leftData[i].quantity = leftData[i].quantity * 1 + checkedNum.value * 1
              break
            } else if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId !== item.processId) {

              delete item._X_ROW_KEY
              $gridLeft.insert(item)
              item._X_ROW_KEY = key
              break
            }
            else if (leftData[i].orderNumber !== item.orderNumber && leftData[i].processId !== item.processId) {

              delete item._X_ROW_KEY
              $gridLeft.insert(item)
              item._X_ROW_KEY = key
              break
            }
          }
        }

      })
    } else if (checkedNum.value === '') {//判断数量输入框有无输入数字
    } else if (checkedNum.value === '') {//判断数量输入框无输入数字
      checkedList.forEach((item) => {
        item.processId = checkedListLeft[0].processId
        item.landingSequence = checkedListLeft[0].landingSequence
        item.quantity = checkedListLeft[0].baiscQuantity
        delete item._X_ROW_KEY
      })
      $gridLeft.insertAt(checkedList)
      $grid.remove(checkedList)
    }
    //清除两边复选框
    if ($gridLeft || $grid) {
      $gridLeft.clearCheckboxRow()
      $grid.clearCheckboxRow()
    }

  } catch (e) {
    ElMessage.warning(e.message)
  }
}


//保存流程卡数据
const gridEvents = {
@@ -456,31 +597,35 @@
          const $tableRight = xGrid.value
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()
            const selectRight = $tableRight.getCheckboxRecords()
            if (selectRecords.length === 0){
          //  const selectRight = $tableRight.getCheckboxRecords()
            let leftData = $tableRight.getTableData().fullData
            if (selectRecords.length === 0) {
              ElMessage.warning("请先选择保存的数据")
              return
            }
            if (selectRight.length > 0){

            if (leftData.length > 0) {
              ElMessage.warning("请先将右侧数据全部建立流程卡后保存")
              return;
            }
            let flowCardData = ref({
              flowCard: selectRecords,
              userName:username,
              productionId:productionId
              userName: username,
              productionId: productionId
            })

            request.post("/processCard/addFlowCard", flowCardData.value).then((res) => {
              if (res.code == 200) {
                ElMessage.success("保存成功")
                //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
                router.push({path: '/main/processCard/SplittingDetails', query: {orderId: orderId}})
                router.push({
                  path: '/main/processCard/AddProcessCard',
                  query: {orderId: orderId, productionId: productionId, random: Math.random()}
                })

                //location.reload();
              } else {
                ElMessage.warning(res.msg)
                router.push("/login")
              }
            })

@@ -497,32 +642,33 @@
</script>

<template>
  <div>
  <div style="width: 100%;height: 100%">

    <div class="common-layout" style="height: 100%">
      <div class="header">
    <div class="common-layout" style="width: 100%;height: 100%">
      <div class="header" style="height: 5%;width: 100%">

        <el-button
            style="float: left"
            @click="intoCreateProduct"
            id="searchButton1"
            type="primary"
            :icon="ArrowLeftBold"
            round>
          {{ flag ? '返回' : '返回' }}
            round
            style="float: left"
            type="primary"
            @click="intoCreateProduct">
          {{ flag ? t('processCard.return') : t('processCard.return') }}
        </el-button>
        <!--      <el-button  type="primary">保存分架</el-button>-->
<!--              <el-button type="primary" :hidden="true">分架汇总</el-button>-->
        <!--              <el-button type="primary" :hidden="true">分架汇总</el-button>-->
        <div style="width: 100px;">

        </div>
      </div>
      <el-container height="600px">
        <el-aside width="44%" >
      <el-container style="height: 100%;width: 100%">
        <el-aside style="width: 44%;height: 100%">
          <vxe-grid
              max-height="100%"
              class="mytable-scrollbar"
              ref="xGridLeft"
              class="mytable-scrollbar"
              max-height="100%"
              height="650px"
              v-bind="gridLeftOptions"
              v-on="gridEvents"
          >
@@ -539,17 +685,11 @@
                </li>
              </ul>
            </template>
            <!--左边固定显示的插槽-->
            <template #button_slot="{ row }">
              <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">打印</el-button>
              <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">排版</el-button>
              <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">删除</el-button>
            </template>
            <template #num1_filter="{ column, $panel }">
              <div>
                <div v-for="(option, index) in column.filters" :key="index">
                  <input type="text"
                         v-model="option.data"
                  <input v-model="option.data"
                         type="text"
                         @input="changeFilterEvent($event, option, $panel)"/>
                </div>
              </div>
@@ -560,51 +700,58 @@

        </el-aside>

        <el-main width="12%" style="">
          <span>选中数量:<el-input type="number" v-model="checkedNum"></el-input></span><br>
          <el-button type="primary" @click="addRight"> →</el-button>
          <br>
          <br>
          <el-button type="primary" @click="addLeft"> ←</el-button>
          <br>
          <br>
          <el-button @click="createProcessCard" type="primary">建立流程卡</el-button>
        </el-main>
        <div width="12%">
          <el-main style="">
            <span>{{$t('processCard.selectedQuantity')}}:<el-input v-model="checkedNum" clearable type="number"></el-input></span><br>
            <el-button type="primary" @click="addRight"> →</el-button>
            <br>
            <br>
            <el-button type="primary" @click="addLeft"> ←</el-button>
            <br>
            <br>
            <el-button type="primary" @click="createProcessCard">{{$t('processCard.establishProcessCards')}}</el-button>
          </el-main>
        </div>

<!--        右侧-->
        <el-aside width="45%" height="500px" style="">
          <vxe-grid

              max-height="97%"
              class="mytable-scrollbar"
              ref="xGrid"
              v-bind="gridOptions"
          >
            <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
            <!--      下拉显示所有信息插槽-->
            <template #content="{ row }">
              <ul class="expand-wrapper">
                <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
                  <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
                  <span v-if="hasDecimal(item.field)">{{
                      row[item.field.split('.')[0]][item.field.split('.')[1]]
                    }}</span>
                  <span v-else>{{ row[item.field] }}</span>
                </li>
              </ul>
            </template>
        <!--        右侧-->
        <div style="height: 100%;width: 100%">

            <template #num1_filter="{ column, $panel }">
              <div>
                <div v-for="(option, index) in column.filters" :key="index">
                  <input type="text"
                         v-model="option.data"
                         @input="changeFilterEvent($event, option, $panel)"/>
          <el-aside style="width: 100%;height: 100%">
            <vxe-grid

                ref="xGrid"
                class="mytable-scrollbar"
                max-height="100%"
                height="650px"
                v-bind="gridOptions"
            >
              <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
              <!--      下拉显示所有信息插槽-->
              <template #content="{ row }">
                <ul class="expand-wrapper">
                  <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
                    <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
                    <span v-if="hasDecimal(item.field)">{{
                        row[item.field.split('.')[0]][item.field.split('.')[1]]
                      }}</span>
                    <span v-else>{{ row[item.field] }}</span>
                  </li>
                </ul>
              </template>

              <template #num1_filter="{ column, $panel }">
                <div>
                  <div v-for="(option, index) in column.filters" :key="index">
                    <input v-model="option.data"
                           type="text"
                           @input="changeFilterEvent($event, option, $panel)"/>
                  </div>
                </div>
              </div>
            </template>
          </vxe-grid>
        </el-aside>
              </template>
            </vxe-grid>
          </el-aside>
        </div>
      </el-container>
    </div>
  </div>
@@ -615,7 +762,7 @@
  height: 100%;
}

.header{
.header {
  width: 100%;
  height: 35px;
  margin-top: -20px;