Merge remote-tracking branch 'origin/dev_新疆_新聚' into dev_新疆_新聚

gaoluyang

2026-09-16 fcadf16afa65a8a5ca53a33c4b8f4bf2efe2ea03

 src/views/business/inspectionTask/index.vue

@@ -13,6 +13,13 @@
                         :value="a.value"></el-option>
            </el-select>
          </el-form-item>
<!--          <el-form-item label="物料属性" prop="materialProp">-->
<!--            <el-select clearable size="small" v-model="queryParams.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>
            <el-button size="mini" type="primary" @click="refreshTable()">查询</el-button>
            <el-button size="mini" @click="refresh()">重置</el-button>
@@ -22,7 +29,7 @@
      <div class="center" v-loading="tableLoading">
        <div class="center-options">
          <div style="display: flex; align-items: center">
            <span style="font-size: 14px">试验室种类:</span>
            <span style="font-size: 14px">试验室:</span>
            <ul class="tab">
              <li v-for="(m, i) in tabList" :key="i" :class="{ active: i == tabIndex }" @click="handleTab(m, i)">
                {{ m.label.replace("试验室", "") }}
@@ -251,7 +258,7 @@
    viewManHourDia,
    UnPassRetestResult
  },
  dicts: ["urgency_level", "inspection_task_state"],
  dicts: ["urgency_level", "inspection_task_state","material_prop_type"],
  computed: {
    ...mapGetters(["nickName", "userId"]),
  },
@@ -279,8 +286,8 @@
      claimVisible: false,
      tabList: [
        { label: "委托", value: -1 },
        { label: "原材料", value: 1 },
        { label: "外购", value: 0 },
        // { label: "原材料", value: 1 },
        // { label: "外购", value: 0 },
      ],
      active: 1,
      tabIndex: 0,
@@ -367,30 +374,29 @@
            }
          },
        },
        { label: "样品型号", prop: "sampleModel", width: "120px" },
        {
          label: "紧急程度",
          prop: "type",
          dataType: "tag",
          formatData: (params) => {
            if (params == 0) {
              return '普通'
            } else if (params == 1) {
              return '优先'
            } else {
              return '紧急'
            }
          },
          formatType: (params) => {
            if (params == 0) {
              return 'success'
            } else if (params == 1) {
              return 'warning'
            } else {
              return 'danger'
            }
          }
        },
        // {
        //   label: "紧急程度",
        //   prop: "type",
        //   dataType: "tag",
        //   formatData: (params) => {
        //     if (params == 0) {
        //       return '普通'
        //     } else if (params == 1) {
        //       return '优先'
        //     } else {
        //       return '紧急'
        //     }
        //   },
        //   formatType: (params) => {
        //     if (params == 0) {
        //       return 'success'
        //     } else if (params == 1) {
        //       return 'warning'
        //     } else {
        //       return 'danger'
        //     }
        //   }
        // },
        {
          label: "检验类型",
          prop: "orderType",
@@ -801,8 +807,7 @@
          sonLaboratory: this.sonLaboratory,
          state: this.state,
          typeSource: this.typeSource,
          orderId: this.orderId,
          isSplit: row.isSplitOrder
          orderId: this.orderId
        },
      });
    },