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

廖井涛

2024-07-25 15fa56463061f1e94140e23e98987aa3131714bf

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

@@ -105,7 +105,7 @@

//获取七天前到当前时间
function getNowTime() {
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
      .toISOString()
      .replace('T', ' ')
      .slice(0, 10) //默认开始时间7天前
@@ -176,7 +176,19 @@
      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 = deepClone(res.data.data)
      produceList.forEach(item => {
        if (item.damageDetails.qualityInsStatus === 2) {
          item.damageDetails.qualityInsStatus = '已质检';
        }
        else if (item.damageDetails.qualityInsStatus === 1){
          item.damageDetails.qualityInsStatus = '待质检';
        }
        else if (item.damageDetails.qualityInsStatus === 0){
          item.damageDetails.qualityInsStatus = '无需质检';
        }
      });
      xGrid.value.reloadData(produceList)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
@@ -250,7 +262,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'QualityInspectionReview',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -365,7 +377,7 @@

    </div>
    <vxe-grid
        max-height="100%"
        height="100%"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
@@ -395,8 +407,8 @@
                   size="small">
          {{ $t('basicData.edit') }}
        </el-button>
        <el-button v-if="row.damageDetails.qualityInsStatus===1" @click="getTableRow(row,'setType')" link type="primary" size="small">{{ $t('basicData.review') }}</el-button>
        <el-button v-else disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{ $t('basicData.review') }}</el-button>
        <el-button v-if="row.damageDetails.qualityInsStatus==='已质检'||row.damageDetails.qualityInsStatus==='无需质检'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{ $t('basicData.review') }}</el-button>
        <el-button v-else  @click="getTableRow(row,'setType')" link type="primary" size="small">{{ $t('basicData.review') }}</el-button>
      </template>

      <template #num1_filter="{ column, $panel }">
@@ -427,7 +439,7 @@
<style scoped>
.main-div-customer{
  width: 99%;
  height: 100%;
  height: 95%;
}
#selectForm {
  width: 60%;