1.外购下单：标签打印功能调整 2.人员：培训计划导入导出添加【培训大类】字段 3.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查...

zouyu

6 天以前 1210d5c10991c9f843a1770364a30fbfd3c5a5d8

 src/views/business/reportPreparation/index.vue

@@ -16,17 +16,27 @@
            <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="物料属性" prop="materialProp">
          <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">
            <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"
                       :value="dict.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="检验类别" prop="orderType">
          <el-select v-model="entity.orderType" clearable size="small" @change="refreshTable()">
            <el-option v-for="(a, i) in orderTypeList" :key="i" :label="a.label" :value="a.value"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item>
          <el-button size="mini" @click="refresh()">重置</el-button>
          <el-button size="mini" type="primary" @click="refreshTable()">查询</el-button>
          <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">批量下载</el-button>
          <el-button size="mini" @click="refresh()">重置</el-button>
        </el-form-item>
      </el-form>
    </div>
    <div style="text-align: right;margin-bottom: 10px">
      <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">批量下载</el-button>
      <el-button :loading="outExportLoading" size="mini" type="primary" @click="handleExport">报表导出</el-button>
    </div>
    <div>
      <lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
@@ -184,7 +194,7 @@
          <el-button size="small" style="height: 38px" type="primary">附件上传</el-button>
        </el-upload>
      </div>
      <lims-table :tableData="tableDataFile" :column="columnFile" height="500px"
      <lims-table :tableData="tableDataFile" :column="columnFile" height="600px"
        key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
    </el-dialog>
  </div>
@@ -200,7 +210,8 @@
  ratifyReport,
  sendBackTask,
  upReportUrl,
  writeReport
  writeReport,
  reportAllExport
} from "@/api/business/insReport";
import { mapGetters } from "vuex";
import { selectUserCondition } from "@/api/business/inspectionTask";
@@ -209,12 +220,15 @@
export default {
  name: 'ReportPreparation',
  components: { limsTable, onlyoffice },
  dicts: ['material_prop_type'],
  data() {
    return {
      entity: {
        queryStatus: null,
        code: null,
        typeSource: null,
        orderType: null,
        materialProp: null
      },
      page: {
        current: 1,
@@ -239,6 +253,7 @@
      option: null,
      mutiList: [],
      outLoading: false,
      outExportLoading: false,
      inLoading: false,
      addApproverDia: false, // 指定审批人员弹框
      approver: '', // 审批人员
@@ -248,7 +263,8 @@
      verifyUser: null, // 审核人员
      loadingVerify: false, // 审核人员
      typeSourceList: [
        { label: '成品下单', value: 0 },
        { label: '委托下单', value: -1 },
        { label: '外购下单', value: 0 },
        { label: '原材料下单', value: 1 },
      ],
      orderTypeList: [
@@ -347,11 +363,28 @@
          dataType: "tag",
          formatData: (params) => {
            if (params == 0) {
              return "成品下单";
            } else {
              return "外购下单";
            } else if(params==1) {
              return "原材料下单";
            }else{
              return "委托下单";
            }
          },
        },
        {
          label: '物料属性',
          prop: 'materialProp',
          formatData: (params) => {
            if (!params) return null

            for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
              const item = this.dict.type.material_prop_type[i]
              if (item.value == params) {
                return item.label
              }
            }
            return null
          }
        },
        {
          label: "检验类型",
@@ -519,7 +552,7 @@
    // 查询附件查看列表回调
    getFileList() {
      this.tableLoadingFile = true
      getFileList({ insOrderId: this.filesLookInfo.insOrderId }).then(res => {
      getFileList({ insOrderId: this.filesLookInfo.insOrderId,current: -1, size: -1 }).then(res => {
        this.tableLoadingFile = false
        if (res.code === 200) {
          this.tableDataFile = res.data.records
@@ -598,6 +631,17 @@
      })

    },
    // 报表导出
    handleExport() {
      this.outExportLoading = true
      reportAllExport({
        ...this.entity
      }).then(res => {
        this.outExportLoading = false
        const blob = new Blob([res], { type: 'application/octet-stream' });
        this.$download.saveAs(blob, "报告报表导出.xlsx");
      })
    },
    beforeUpload(file) {
      const isZip = file.type === 'application/zip' || file.name.endsWith('.zip');
      if (!isZip) {
@@ -662,7 +706,7 @@
        case 0:
          // 原材料
          this.$router.push({
            path: "/materialOrder/customsInspection", query: {
            path: "/materialOrder/customsInspectionView", query: {
              customsInspection: row,
              active: this.activeFace,
              currentId: row.insOrderId,
@@ -673,7 +717,7 @@
        case null:
          // 成品
          this.$router.push({
            path: "/productOrder/add", query: {
            path: "/productOrder/addView", query: {
              examine: this.examine,
              active: this.activeFace,
              currentId: row.insOrderId
@@ -683,7 +727,7 @@
        case 1:
          // 铜材
          this.$router.push({
            path: "/materialOrder/copperOrder", query: {
            path: "/materialOrder/CopperView", query: {
              active: this.activeFace,
              currentId: row.insOrderId
            }