buhuazhen
2026-05-20 9f9e2afa3a8ad8fccb9bc804516e07b5c7772039
feat 调整信息
已修改2个文件
100 ■■■■ 文件已修改
src/views/productionManagement/productionReporting/index.vue 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/workOrder/index.vue 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionReporting/index.vue
@@ -250,30 +250,30 @@
      prop: "deviceName",
      width: 120,
    },
    {
      label: "审核人",
      prop: "auditUserName",
      width: 120,
    },
     {
      label: "审核状态",
      prop: "auditStatus",
      width: 120,
      dataType: "tag",
      formatData: val => {
        const statusMap = { 0: "未审核", 1: "通过", 2: "不通过" };
        return statusMap[val] ?? "未知";
      },
      formatType: val => {
        const typeMap = { 0: "info", 1: "success", 2: "danger" };
        return typeMap[val] ?? "";
      },
    },
    {
      label: "最终审核人",
      prop: "sureAuditUserName",
      width: 120,
    },
    // {
    //   label: "审核人",
    //   prop: "auditUserName",
    //   width: 120,
    // },
    //  {
    //   label: "审核状态",
    //   prop: "auditStatus",
    //   width: 120,
    //   dataType: "tag",
    //   formatData: val => {
    //     const statusMap = { 0: "未审核", 1: "通过", 2: "不通过" };
    //     return statusMap[val] ?? "未知";
    //   },
    //   formatType: val => {
    //     const typeMap = { 0: "info", 1: "success", 2: "danger" };
    //     return typeMap[val] ?? "";
    //   },
    // },
    // {
    //   label: "最终审核人",
    //   prop: "sureAuditUserName",
    //   width: 120,
    // },
    {
      label: "产品名称",
      prop: "productName",
@@ -330,13 +330,13 @@
            deleteReport(row);
          },
        },
        {
          name:"审核",
          clickFun: row => {
            handleAudit(row);
          },
          disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
        },
        // {
        //   name:"审核",
        //   clickFun: row => {
        //     handleAudit(row);
        //   },
        //   disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
        // },
      ],
    },
  ]);
src/views/productionManagement/workOrder/index.vue
@@ -263,24 +263,24 @@
<!--            </el-form-item>-->
<!--          </el-col>-->
          <el-col :span="12">
            <el-form-item label="审核人" prop="auditUserId">
              <el-select
                  v-model="reportForm.auditUserId"
                  placeholder="请选择审核人"
                  clearable
                  filterable
                  @change="handleReviewerIdChange"
              >
                <el-option
                    v-for="user in userOptions"
                    :key="user.userId"
                    :label="user.nickName"
                    :value="user.userId"
                />
              </el-select>
            </el-form-item>
          </el-col>
<!--          <el-col :span="12">-->
<!--            <el-form-item label="审核人" prop="auditUserId">-->
<!--              <el-select-->
<!--                  v-model="reportForm.auditUserId"-->
<!--                  placeholder="请选择审核人"-->
<!--                  clearable-->
<!--                  filterable-->
<!--                  @change="handleReviewerIdChange"-->
<!--              >-->
<!--                <el-option-->
<!--                    v-for="user in userOptions"-->
<!--                    :key="user.userId"-->
<!--                    :label="user.nickName"-->
<!--                    :value="user.userId"-->
<!--                />-->
<!--              </el-select>-->
<!--            </el-form-item>-->
<!--          </el-col>-->
        </el-row>
      </el-form>
@@ -1228,7 +1228,7 @@
  scrapQty: [{validator: validateScrapQty, trigger: "blur"}],
  startTime: [{required: true, message: "请选择开始时间", trigger: "change"}],
  endTime: [{required: true, message: "请选择结束时间", trigger: "change"}],
  auditUserId: [{required: true, message: "请选择审核人", trigger: "change"}],
  // auditUserId: [{required: true, message: "请选择审核人", trigger: "change"}],
  teamList: [{required: true, message: "请选择班组", trigger: "change"}],
  deviceId: [{required: true, message: "请选择设备", trigger: "change"}],
};