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

yuan

6 小时以前 2365a272f1883143294cc36b10e62d4a240e7df6

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

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

@@ -96,7 +96,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"
@@ -112,7 +112,7 @@
                           value="丁" />
              </el-select>
            </el-form-item>
          </el-col>
          </el-col> -->
          <el-col :span="12">
            <el-form-item label="是否白名单："
                          prop="isWhite">
@@ -203,22 +203,22 @@
    {
      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: 300,
    },
    {
      label: "维护人",
@@ -228,7 +228,7 @@
    {
      label: "维护时间",
      prop: "maintainTime",
      width: 100,
      // width: 100,
    },
    {
      dataType: "action",
@@ -244,14 +244,14 @@
            openForm("edit", row);
          },
        },
        {
          //资质附件
          name: "资质文件",
          type: "text",
          clickFun: row => {
            openFileDialog(row);
          },
        },
        // {
        //   //资质附件
        //   name: "资质文件",
        //   type: "text",
        //   clickFun: row => {
        //     openFileDialog(row);
        //   },
        // },
      ],
    },
  ]);
@@ -290,9 +290,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);

 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);

 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue

@@ -22,14 +22,10 @@
        <el-row>
          <el-col :span="24">
            <el-form-item label="申请部门：">
              <el-select disabled
                         v-model="form.approveDeptId"
                         placeholder="选择部门">
                <el-option v-for="user in productOptions"
                           :key="user.deptId"
                           :label="user.deptName"
                           :value="user.deptId" />
              </el-select>
              <el-input v-model="form.approveDeptName"
                        placeholder=""
                        clearable
                        disabled />
            </el-form-item>
          </el-col>
        </el-row>
@@ -45,6 +41,18 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row v-if="Number(props.approveType) === 4">
          <el-col :span="24">
            <el-form-item label="报销金额：">
              <el-input-number v-model="form.price"
                               disabled
                               :min="0"
                               :precision="2"
                               style="width: 100%"
                               placeholder="" />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <!-- 报价审批：展示报价详情（复用销售报价"查看详情对话框"内容结构） -->
      <div v-if="isQuotationApproval"

 src/views/equipmentManagement/spareParts/index.vue

@@ -96,7 +96,7 @@
        </el-dialog>
      </el-tab-pane>

      <el-tab-pane label="备件领用记录" name="usage">
      <el-tab-pane label="备件使用记录" name="usage">
        <div class="search_form">
          <el-form :inline="true" :model="usageQuery" class="search-form">
            <el-form-item label="备件名称">

 src/views/procurementManagement/procurementLedger/index.vue

@@ -161,7 +161,7 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="录入人：" prop="recorderId">
              <el-select v-model="form.recorderId" placeholder="请选择" clearable filterable>
              <el-select v-model="form.recorderId" placeholder="请选择" clearable filterable disabled>
                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
              </el-select>
            </el-form-item>
@@ -1026,6 +1026,7 @@
    );

    form.value.entryDate = getCurrentDate();
    form.value.recorderId = userStore.id;

    if (type === "add") {
      // 新增时生成采购合同号

 src/views/salesManagement/salesLedger/index.vue

@@ -379,7 +379,7 @@
                         :reserve-keyword="false"
                         placeholder="请选择"
                         clearable
                         :disabled="operationType === 'view'"
                         disabled
                         @change="changs">
                <el-option v-for="item in userList"
                           :key="item.userId"