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

廖井涛

2024-09-05 8b2c74fb6842e8af60f70e7df6eef8837d74be07

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue

@@ -1,25 +1,52 @@
<script setup>

import {reactive} from "vue";
import {reactive, ref} from "vue";
import {useRouter} from  'vue-router'
import request from "@/utils/request";
import deepClone from "@/utils/deepClone";
import {ElDatePicker, ElMessage} from "element-plus";
import {Search} from "@element-plus/icons-vue";
import { useI18n } from 'vue-i18n'
import SelectProduct from "@/views/sd/product/SelectProduct.vue";
import useUserInfoStore from "@/stores/userInfo";
import footSum from "@/hook/footSum"
import userInfo from "@/stores/userInfo"

//语言获取
const { t } = useI18n()
const userStore = useUserInfoStore()
let router=useRouter()
const user=userInfo()
const getTableRow = (row,type) =>{
  switch (type) {
    case 'edit' :{
      //alert('我接收到子组件传送的编辑信息')
      router.push({path: '/main/reportingWorks/AddReportingWork', query: { id: row.id }})
      router.push({path: '/main/reportingWorks/AddReportingWork', query: { reportingWorkId: row.reportingWorkId }})
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType':{
      alert('我接收到子组件传送的反审状态')
      let userId=user.user.userId;
      let userName=user.user.userName;
      const str=row.processId
      let processId=str.split('/')[0];
      request.post(`/reportingWork/deleteWork/${row.reportingWorkId}/${processId}/${row.thisProcess}/${userId}/${userName}`).then((res) => {
        if (res.code == 200 && res.data===true) {
          ElMessage.success(t('workOrder.deleteOk'))
          router.push({path: '/main/reportingWorks/SelectReportingWorks', query: {random:Math.random()}})
        } else {
          ElMessage.warning(t('processCard.deleteNoProcedure'))
        }
      })
      break
    }
  }
}

//提交的表单
const form = reactive({
  date1: '',
  orderId: ''
})

//表尾求和
const sumNum = (list, field) => {
@@ -30,15 +57,247 @@
  return count.toFixed(2)
}

//子组件接收参数
//定义滚动条高度
let scrollTop = ref(null)
let scrollHeight = ref(null)
let clientHeight = ref(null)
const scrollEvnt = (row) => {
  // 内容高度
  scrollTop.value = row.$event.target.scrollTop
  scrollHeight.value = row.$event.target.scrollHeight
  clientHeight.value = row.$event.target.clientHeight
}
//筛选条件，有外键需要先定义明细里面的数据
let filterData = ref({
  order: {
    project: '',
    batch:''
  },
  orderGlassDetail: {
    completedArea:'',
    wornArea:''
  }

})
//定义页面总页数
let pageTotal = ref('')
//定义数据返回结果
let produceList = ref([])
//定义当前页数
let pageNum=ref(1)
let pageState = null

//获取七天前到当前时间
function getNowTime() {
  const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 3)
      .toISOString()
      .replace('T', ' ')
      .slice(0,10) //默认开始时间7天前
  const end = new Date(new Date().getTime()+3600 * 1000 * 24)
      .toISOString()
      .replace('T', ' ')
      .slice(0,10)//默认结束时间当前时间
  return [start, end]
}


//第一次加载获取近七天时间和默认状态
form.date1=getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
let inputVal = form.orderId
if (inputVal == '') {
  inputVal = null
}
let total = reactive({
  pageTotal : 0,
  dataTotal : 0,
  pageSize : 100
})
//第一次加载数据
request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {

  if (res.code == 200) {
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal
    pageTotal.value = res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    // 使用map方法来处理每个对象
    let modifiedCollection = produceList.map(item => {
      if (item.reviewedState === 1) {
        return { ...item, reviewedState: "已审核" };
      }
      else if (item.reviewedState === 0) {
        return { ...item, reviewedState: "未审核" };
      }
      else if (item.reviewedState === 2){
        return { ...item, reviewedState: "审核不通过" };
      }
      else {
        // 其他情况保持不变
        return item;
      }
    });
    xGrid.value.reloadData(modifiedCollection)
    gridOptions.loading = false
  } else {
    ElMessage.warning(res.msg)
  }
})

//页脚翻页查询
const selectPageList = ()=>{
  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let inputVal = form.orderId
  if (inputVal == '') {
    inputVal = null
  }
  request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`,filterData.value).then((res) => {
    if(res.code==200){


      produceList = deepClone(res.data.data)
      // 使用map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {
        if (item.reviewedState === 1) {
          return { ...item, reviewedState: "已审核" };
        }
        else if (item.reviewedState === 0) {
          return { ...item, reviewedState: "未审核" };
        }
        else if (item.reviewedState === 2){
          return { ...item, reviewedState: "审核不通过" };
        }
        else {
          // 其他情况保持不变
          return item;
        }
      });
      xGrid.value.reloadData(modifiedCollection)
    }else{
      ElMessage.warning(res.msg)
    }
  })
}

//点击查询
const getWorkOrder = () => {

  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let inputVal = form.orderId
  if (inputVal == '') {
    inputVal = null
  }
  request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
    if (res.code == 200) {
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal
      pageTotal.value = res.data.total
      produceList=res.data.data
      // 使用map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {
        if (item.reviewedState === 1) {
          return { ...item, reviewedState: "已审核" };
        }
        else if (item.reviewedState === 0) {
          return { ...item, reviewedState: "未审核" };
        }
        else if (item.reviewedState === 2){
          return { ...item, reviewedState: "审核不通过" };
        }
        else {
          // 其他情况保持不变
          return item;
        }
      });
      xGrid.value.reloadData(modifiedCollection)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
    }
  })
}

//页脚跳转
const handlePageChange = ({ currentPage, pageSize }) => {
  pageNum.value=currentPage
  total.pageTotal    = pageSize
  selectPageList()
}

/*使用筛选，后端获取数据*/
const changeFilterEvent = (event, option, $panel,) => {
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}

function filterChanged(column) {
  gridOptions.loading=true
  //筛选条件发生变化条件发生变化
  let value = column.datas[0]!=undefined?column.datas[0]:''
  value = value.trim()
  //判断是否存在外键
  if (column.property.indexOf('.')>-1){
    const  columnArr = column.property.split('.')
    filterData.value[columnArr[0]] = {
      [columnArr[1]]:value
    }
  }else{
    filterData.value[column.property] = value
  }

//获取选中时间
  let startTime = form.date1[0]
  let endTime = form.date1[1]

  request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
    if(res.code==200){
      total.dataTotal = res.data.total.total*1
      total.pageTotal=parseInt(res.data.total)
      pageNum.value=1
      produceList = deepClone(res.data.data)
      // 使用map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {
        if (item.reviewedState === 1) {
          return { ...item, reviewedState: "已审核" };
        }
        else if (item.reviewedState === 0) {
          return { ...item, reviewedState: "未审核" };
        }
        else if (item.reviewedState === 2){
          return { ...item, reviewedState: "审核不通过" };
        }
        else {
          // 其他情况保持不变
          return item;
        }
      });
      xGrid.value.reloadData(modifiedCollection)
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)
    }
  })
}

/*后端返回结果多层嵌套展示*/
const hasDecimal = (value) => {
  const regex = /\./; // 定义正则表达式，查找小数点
  return regex.test(value); // 返回true/false
}

//子组件接收参数
const xGrid = ref()
const gridOptions = reactive({
  loading: true,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'SelectReportingWorks',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -62,128 +321,48 @@
  },//表头参数
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {title: '操作', width: 140, slots: { default: 'button_slot' },fixed:"left"},
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
    {field: 'reportingWorkNo', width: 120, title: '报工编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: 'reportingWorkTime',width: 120, title: '报工时间', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'processCard', width: 130,title: '流程卡号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'entryName',width: 120, title: '项目名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'batch', width: 100,title: '批次', sortable: true,showOverflow:"ellipsis"},
    {field: 'device', width: 100,title: '设备', sortable: true},
    {field: 'thisProcess',width: 100, title: '本工序', sortable: true},
    {field: 'finishedNumber',width: 120, title: '本工序完工', sortable: true,showOverflow:"ellipsis"},
    {field: 'finishedArea', width: 120,title: '完工面积', sortable: true},
    {field: 'wornNumber',width: 120, title: '本工序次破', sortable: true},
    {field: 'wornArea',width: 120, title: '次破面积', sortable: true},
    {field: 'teamName',width: 120, title: '班组名称', sortable: true}
    {title: t('basicData.operate'), width: 140, slots: { default: 'button_slot' },fixed:"left"},
    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
    {field: 'reportingWorkId', width: 120, title: t('reportingWorks.reportingWorkId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
    {field: 'reportingWorkTime',width: 120, title: t('reportingWorks.reportingWorkTime') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderId', width: 130,title:  t('order.orderId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'processId', width: 160,title: t('processCard.processId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.project',width: 150, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
    {field: 'order.batch', width: 100,title: t('order.batch') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'thisProcess',width: 100, title: t('reportingWorks.thisProcess'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'thisCompletedQuantity',width: 120, title: t('reportingWorks.thisCompletedQuantity') },
    {field: 'completedArea', width: 120,title: t('reportingWorks.completedArea'), },
    {field: 'thisWornQuantity',width: 120, title: t('reportingWorks.thisWornQuantity'), },
    {field: 'wornArea',width: 120, title: t('reportingWorks.wornArea'), },
    {field: 'deviceName', width: 100,title: t('reportingWorks.deviceType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'teamsGroupsName',width: 120, title: t('reportingWorks.teamsType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'reviewedState',width: 120, title: t('processCard.reviewedState'), },
    {field: 'reviewed',width: 120, title: '审核人', },
    {field: 'notes',width: 120, title: t('basicData.remarks'), },

  ],//表头按钮

  toolbarConfig: {
    // buttons: [{
    //
    // }],
    import: false,
    export: true,
    print: true,
    // import: false,
    // export: true,
    // print: true,
    zoom: true,
    custom: true
  },
  data:  [
    {
      reportingWorkNo: 'BG2312080011',
      reportingWorkTime: '2023-12-08 09:05:58',
      processCard: 'NG23120801A01',
      entryName: '信合春天里',
      batch: '四批二',
      device:'大海利宁',
      thisProcess: '切割',
      finishedNumber: '13',
      finishedArea: '44.22',
      wornNumber: '',
      wornArea: '',
      teamName:'切割一班'
    },
    {
      reportingWorkNo: 'BG2312080013',
      reportingWorkTime: '2023-12-08 09:05:58',
      processCard: 'NG23120801A01',
      entryName: '信合春天里',
      batch: '一批二',
      device:'大海利宁',
      thisProcess: '切割',
      finishedNumber: '13',
      finishedArea: '44.22',
      wornNumber: '',
      wornArea: '',
      teamName:'切割一班'
    },
    {
      reportingWorkNo: 'BG2311080025',
      reportingWorkTime: '2023-12-08 09:05:58',
      processCard: 'NG23120801A01',
      entryName: '信合春天里',
      batch: '一批二',
      device:'大海利宁',
      thisProcess: '切割',
      finishedNumber: '13',
      finishedArea: '44.22',
      wornNumber: '',
      wornArea: '',
      teamName:'切割一班'
    },
    {
      reportingWorkNo: 'BG2303080025',
      reportingWorkTime: '2023-12-08 09:05:58',
      processCard: 'NG23120801A01',
      entryName: '信合春天里',
      batch: '一批二',
      device:'大海利宁',
      thisProcess: '切割',
      finishedNumber: '13',
      finishedArea: '44.22',
      wornNumber: '',
      wornArea: '',
      teamName:'切割一班'
    },
    {
      reportingWorkNo: 'BG2312080001',
      reportingWorkTime: '2023-12-08 09:05:58',
      processCard: 'NG23120801A01',
      entryName: '信合春天里',
      batch: '一批二',
      device:'大海利宁',
      thisProcess: '切割',
      finishedNumber: '13',
      finishedArea: '44.22',
      wornNumber: '',
      wornArea: '',
      teamName:'切割一班'
    },
    {
      reportingWorkNo: 'BG2312080015',
      reportingWorkTime: '2023-12-08 09:05:58',
      processCard: 'NG23120801A01',
      entryName: '信合春天里',
      batch: '一批二',
      device:'大海利宁',
      thisProcess: '切割',
      finishedNumber: '13',
      finishedArea: '44.22',
      wornNumber: '',
      wornArea: '',
      teamName:'切割一班'
    },
  ],//table body实际数据
  data:  [],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['finishedNumber','finishedArea','wornNumber','wornArea']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
        const List = ["thisCompletedQuantity",'completedArea','thisWornQuantity','wornArea']
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }
        return ''
      })
@@ -193,16 +372,6 @@
})


const form = reactive({
  name: '',
  region: '',
  date1: '',
  date2: '',
  delivery: false,
  type: [],
  resource: '',
  desc: '',
})
</script>

<template>
@@ -212,17 +381,27 @@
        <el-date-picker
            v-model="form.date1"
            type="daterange"
            start-placeholder="开始时间"
            end-placeholder="结束时间"
            format="YYYY/MM/DD"
            value-format="YYYY-MM-DD"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            :default-time="defaultTime"

        />
        &nbsp;&nbsp;
        <el-button type="primary">查询</el-button>
        <el-input v-model="form.orderId" clearable :placeholder="$t('order.orderId')" style="width: 130px"></el-input>
        &nbsp;
        <el-button
            @click="getWorkOrder"
            id="select"
            type="primary" :icon="Search">{{$t('basicData.search')}}

        </el-button>
      </el-row>

    </div>
    <vxe-grid
        max-height="100%"
        height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
@@ -233,18 +412,42 @@
      <!--      下拉显示所有信息插槽-->
      <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>{{ row[item.field] }}</span>
          <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 #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>
<!--        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">编辑</el-button>-->
        <el-button @click="getTableRow(row,'edit')"
                   v-if="userStore.user.permissions.indexOf('SelectReportingWorks.edit') > -1"
                   link
                   type="primary"
                   size="small">
          {{ $t('basicData.edit') }}
        </el-button>
<!--        <el-button @click="getTableRow(row,'delete')"-->
<!--                   v-if="userStore.user.permissions.indexOf('basicData.delete') > -1"-->
<!--                   link-->
<!--                   type="primary"-->
<!--                   size="small">-->
<!--          {{ $t('basicData.delete') }}-->
<!--        </el-button>-->
        <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">
          <template #reference>
            <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>
          </template>
        </el-popconfirm>
<!--        <el-popconfirm   @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">-->
<!--          <template #reference>-->
<!--            <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>-->
<!--          </template>-->
<!--        </el-popconfirm>-->
      </template>

      <template #num1_filter="{ column, $panel }">
@@ -254,19 +457,34 @@
          </div>
        </div>
      </template>

      <template #pager>
        <!--使用 pager 插槽-->
        <!--        'PrevJump','NextJump', -->
        <vxe-pager
            @page-change="handlePageChange"
            :layouts="[  'PrevPage', 'Jump','PageCount', 'NextPage',  'Total']"
            v-model:current-page="pageNum"
            v-model:page-size="total.pageSize"
            v-model:pager-count="total.pageTotal"
            :total="total.dataTotal"
        >
        </vxe-pager>
      </template>

    </vxe-grid>
<!--    <el-dialog v-model="updateWork"  style="width: 80%;height:75% ">-->
<!--      <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />-->
<!--    </el-dialog>-->
  </div>
</template>

<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
  height: 96%;
}
#selectForm {
  width: 40%;
  width: 45%;
  text-align: center;
}
</style>