Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

5 小时以前 2365a272f1883143294cc36b10e62d4a240e7df6

 src/views/basicData/supplierManage/components/HomeTab.vue

@@ -102,7 +102,7 @@
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
          <!-- <el-col :span="12">
            <el-form-item label="供应商类型："
                          prop="supplierType">
              <el-select v-model="form.supplierType"
@@ -118,7 +118,7 @@
                           value="丁" />
              </el-select>
            </el-form-item>
          </el-col>
          </el-col> -->
          <el-col :span="12">
            <el-form-item label="是否白名单："
                          prop="isWhite">
@@ -209,26 +209,27 @@
    {
      label: "供应商名称",
      prop: "supplierName",
      width: 250,
      // width: 250,
    },
    {
      label: "供应商类型",
      prop: "supplierType",
      width: 120,
    },
    // {
    //   label: "供应商类型",
    //   prop: "supplierType",
    //   width: 120,
    // },
    {
      label: "纳税人识别号",
      prop: "taxpayerIdentificationNum",
      width: 230,
      // width: 230,
    },
    {
      label: "公司地址",
      prop: "companyAddress",
      width: 220,
      // width: 220,
    },
    {
      label: "维护人",
      prop: "maintainUserName",
      // width: 220,
    },

    {
@@ -250,14 +251,14 @@
            openForm("edit", row);
          },
        },
        {
          //资质附件
          name: "资质文件",
          type: "text",
          clickFun: row => {
            openFileDialog(row);
          },
        },
        // {
        //   //资质附件
        //   name: "资质文件",
        //   type: "text",
        //   clickFun: row => {
        //     openFileDialog(row);
        //   },
        // },
      ],
    },
  ]);
@@ -296,9 +297,9 @@
      companyAddress: [{ required: true, message: "请输入", trigger: "blur" }],
      maintainUserId: [{ required: false, message: "请选择", trigger: "change" }],
      maintainTime: [{ required: false, message: "请选择", trigger: "change" }],
      supplierType: [
        { required: true, message: "请选择供应商类型", trigger: "change" },
      ],
      // supplierType: [
      //   { required: true, message: "请选择供应商类型", trigger: "change" },
      // ],
    },
  });
  const { searchForm, form, rules } = toRefs(data);