Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-09-26 8c29a327707574f1e04cd25218e05ba9b4c8e4a8

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

@@ -10,11 +10,13 @@
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' :{
@@ -23,7 +25,11 @@
      break
    }
    case 'delete':{
      request.post(`/reportingWork/deleteWork/${row.reportingWorkId}/${row.processId}/${row.thisProcess}`).then((res) => {
      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()}})
@@ -83,7 +89,7 @@

//获取七天前到当前时间
function getNowTime() {
  const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
  const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 3)
      .toISOString()
      .replace('T', ' ')
      .slice(0,10) //默认开始时间7天前
@@ -116,7 +122,23 @@
    total.pageTotal= res.data.total.pageTotal
    pageTotal.value = res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    xGrid.value.reloadData(produceList)
    // 使用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)
@@ -136,7 +158,23 @@


      produceList = deepClone(res.data.data)
      xGrid.value.reloadData(produceList)
      // 使用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)
    }
@@ -157,7 +195,24 @@
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal
      pageTotal.value = res.data.total
      xGrid.value.loadData(res.data.data)
      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)
@@ -203,7 +258,23 @@
      total.pageTotal=parseInt(res.data.total)
      pageNum.value=1
      produceList = deepClone(res.data.data)
      xGrid.value.reloadData(produceList)
      // 使用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)
@@ -226,7 +297,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'SelectReportingWorks',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -255,18 +326,19 @@
    {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: 130,title: t('processCard.processId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.project',width: 120, title: t('order.project'),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'), },
    {field: 'teamsGroupsName',width: 120, title: t('reportingWorks.teamsType'), },
    {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'), },

  ],//表头按钮

@@ -329,7 +401,7 @@

    </div>
    <vxe-grid
        max-height="100%"
        height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
@@ -359,11 +431,23 @@
                   size="small">
          {{ $t('basicData.edit') }}
        </el-button>
        <el-popconfirm   @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
<!--        <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 type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
            <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 }">
@@ -397,7 +481,7 @@
<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
  height: 96%;
}
#selectForm {
  width: 45%;