不合格处理调整&合格率统计调整

zouyu

2 天以前 72780bc3f7a4b47ebba49f28f4ffe219c14349ba

不合格处理调整&合格率统计调整

 src/views/business/unpass/components/OAProcess.vue

@@ -67,6 +67,7 @@
        {
          id: 1,
          name: "1检验员",
          classType: '-1',
          info: "",
          infoTitle:"不合格情况描述:",
          time: "",
@@ -77,6 +78,7 @@
        {
          id: 2,
          name: "2检测主管确认",
          classType: '-1',
          infoTitle:"处理意见:",
          info: "",
          time: "",
@@ -87,6 +89,7 @@
        {
          id: 3,
          name: "3物流部确认",
          classType: '-1',
          infoTitle:"处理意见:",
          info: "",
          time: "",
@@ -97,6 +100,7 @@
        {
          id: 4,
          name: "4产品工程师处理意见",
          classType: '-1',
          infoTitle:"处理意见:",
          info: "",
          time: "",
@@ -107,6 +111,7 @@
        {
          id: 5,
          name: "5.总工或者副经理的处理意见",
          classType: '-1',
          infoTitle:"处理意见:",
          info: "",
          time: "",
@@ -117,6 +122,7 @@
        {
          id: 6,
          name: "6质量部处理意见",
          classType: '-1',
          infoTitle:"处理意见:",
          info: "",
          time: "",
@@ -127,6 +133,7 @@
        {
          id: 7,
          name: "7质量部经理",
          classType: '-1',
          infoTitle:"处理意见:",
          info: "",
          time: "",
@@ -137,6 +144,7 @@
        {
          id: 8,
          name: "8核算员",
          classType: '-1',
          infoTitle:"处理意见:",
          info: "",
          time: "",
@@ -147,6 +155,7 @@
        {
          id: 9,
          name: "9物流部索赔结果",
          classType: '-1',
          infoTitle:"处理意见:",
          info: "",
          time: "",
@@ -245,17 +254,17 @@
          operation: "",
          hasData: false,
        },
        {
          id: 9,
          classType: "0",
          name: "6归档（一类不合格）",
          info: "",
          infoTitle:"处理意见:",
          time: "",
          operator: "",
          operation: "",
          hasData: false,
        },
        // {
        //   id: 9,
        //   classType: "0",
        //   name: "6归档（一类不合格）",
        //   info: "",
        //   infoTitle:"处理意见:",
        //   time: "",
        //   operator: "",
        //   operation: "",
        //   hasData: false,
        // },
        {
          id: 10,
          classType: "1",
@@ -267,17 +276,17 @@
          operation: "",
          hasData: false,
        },
        {
          id: 11,
          classType: "1",
          name: "7归档（二类不合格）",
          info: "",
          infoTitle:"处理意见:",
          time: "",
          operator: "",
          operation: "",
          hasData: false,
        },
        // {
        //   id: 11,
        //   classType: "1",
        //   name: "7归档（二类不合格）",
        //   info: "",
        //   infoTitle:"处理意见:",
        //   time: "",
        //   operator: "",
        //   operation: "",
        //   hasData: false,
        // },
      ],
      classType:null,
    };

 src/views/business/unpass/components/unPassDialog.vue

@@ -70,7 +70,7 @@
          <el-row >
            <el-col :span="12">
              <el-form-item label="分类" prop="classification">
                <el-select style="width:100%" v-model="unPassForm.classification" :disabled="type === 'view' || !unPassForm.id" size="small" placeholder="请选择">
                <el-select style="width:100%" v-model="unPassForm.classification" disabled size="small" placeholder="请选择">
                  <el-option v-for="item in classificationOptions" :key="item.value" :label="item.label"
                             :value="item.value"></el-option>
                </el-select>
@@ -247,6 +247,9 @@
              this.$emit('resetForm')
            }
            this.handlunPassLoading = false
          }).catch(error => {
            console.error(error)
            this.handlunPassLoading = false
          })
        } else {
          console.log('error submit!!');

 src/views/business/unpass/index-manage.vue

@@ -69,11 +69,11 @@
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="OA审核状态" prop="operation">
          <el-form-item label="OA审核状态" prop="oaState">
            <el-select
              clearable
              size="small"
              v-model="entity.operation"
              v-model="entity.oaState"
              style="width: 100%"
              @change="refreshTable()"
            >
@@ -159,7 +159,6 @@
      :close-on-click-modal="false"
      :visible.sync="insOrderVisible"
      @closed="resetInsOrderForm"
      @open="getListData"
      width="50%"
    >
      <el-row :gutter="20" style="margin-bottom: 10px">
@@ -185,9 +184,7 @@
            :tableData="insOrderDataList"
            :column="insOrderTableDataColumn"
            :isSelection="true"
            :selectionSelectable="insOrderSelectable"
            :handleSelectionChange="handlerSelection"
            :rowClassName="insOrderRowClassName"
            @pagination="insOrderPageination"
            :height="500"
            :page="insOrderPage"
@@ -202,9 +199,7 @@
            :tableData="wgInsOrderDataList"
            :column="wgInsOrderTableDataColumn"
            :isSelection="true"
            :selectionSelectable="insOrderSelectable"
            :handleSelectionChange="handlerSelection"
            :rowClassName="insOrderRowClassName"
            @pagination="wgInsOrderPageination"
            :height="500"
            :page="wgInsOrderPage"
@@ -248,8 +243,7 @@
  deleteUnqualifiedHandler,
  page,
  pushOA,
  exportUnqualifiedHandler,
  getList
  exportUnqualifiedHandler
} from "@/api/business/unqualifiedHandler";
import { transformExcel } from "@/utils/file";
export default {
@@ -546,7 +540,7 @@
        supplierName: null,
        feedbackDateTime: [],
        materialProp: null,
        operation: null,
        oaState: null,
      },
      tableData: [],
      tableLoading: false,
@@ -572,16 +566,23 @@
        { label: "编号", prop: "no", width: "160px" },
        {
          label: "OA审核状态",
          prop: "operation",
          prop: "oaState",
          width: "100px",
          dataType: "tag",
          formatData: (params) => {
            if (params) {
              this.dict.type.oa_workflow_state.forEach((item) => {
                if (item.value == params) {
                  params = item.raw.dictLabel;
                }
              });
            }
            return params;
          },
          formatType: (params) => {
            if (params) {
              this.dict.type.oa_workflow_state.forEach((item) => {
                if (item.value === params) {
                if (item.value == params) {
                  params = item.raw.listClass;
                }
              });
@@ -684,7 +685,7 @@
          operation: [
            {
              name: (row) => {
                return row.requestId !== null && row.operation === "退回"
                return row.requestId !== null && row.oaState === 4
                  ? "重新提交"
                  : "提交OA";
              },
@@ -693,7 +694,7 @@
                this.openOA(row);
              },
              disabled: (row, index) => {
                return row.requestId !== null && row.operation !== "退回"; // 有requestId说明已经提交过OA，不可再次提交
                return row.requestId !== null && row.oaState !== 4; // 有requestId说明已经提交过OA，不可再次提交
              },
            },
            {
@@ -710,7 +711,7 @@
                this.deleteOA(row);
              },
              disabled: (row, index) => {
                return row.requestId !== null && row.operation !== "退回"; // 有requestId说明已经提交过OA，不可再次提交
                return row.requestId !== null && row.oaState !== 4; // 有requestId说明已经提交过OA，不可再次提交
              },
            },
          ],
@@ -738,28 +739,6 @@
    this.refreshTable();
  },
  methods: {
    getListData(){
      getList().then(res => {
        this.insOrderIds = [];
        if(res.code === 200){
          this.insOrderIds = res.data;
        }
      }).catch(err => {
        console.error(err)
      })
    },
    insOrderSelectable(row) {
      const existsInMain = this.insOrderIds.some(
        (id) => id === row.enterOrderId
      );
      return !existsInMain;
    },
    insOrderRowClassName({ row }) {
      const existsInMain = this.insOrderIds.some(
        (id) => id === row.enterOrderId
      );
      return existsInMain ? "disabled-selection-row" : "";
    },
    resetInsOrderForm() {
      this.activeName = "raw";
      this.insOrderDataList = [];