Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

chenhaozhe

6 天以前 723793a0aa8d69cbbb463830a3344dbd6655cee5

 src/views/basic/gyCar/gyCarEdit.vue

@@ -7,9 +7,9 @@
      <el-button type="primary" @click="submitForm" :disabled="subDisabled"
        >保 存</el-button
      >
      <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="checkDisabled"
      <!-- <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="checkDisabled"
        >审 核</el-button
      >
      > -->
      <el-button type="primary" @click="close">退 出</el-button>
      <!-- <el-button @click="cancel">取 消</el-button> -->
    </div>
@@ -64,7 +64,7 @@
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="16">
            <!-- <el-col :span="16">
              <el-form-item label="车辆行驶证照片" prop="HCarCardIDPic" label-width="8em">
                <div
                  class="image-input-outer"
@@ -104,7 +104,7 @@
                  >
                </el-upload>
              </el-form-item>
            </el-col>
            </el-col> -->
            <el-col :span="8">
              <el-form-item label="车辆年检日期" prop="HCarCheckDate" label-width="7em">
                <el-date-picker
@@ -116,7 +116,7 @@
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="16">
            <!-- <el-col :span="16">
              <el-form-item label="车辆照片" prop="HCarPric" label-width="8em">
                <div class="image-input-outer" @click="openImagePreview('HCarPric')">
                  <el-input v-model="form.HCarPric"> </el-input>
@@ -153,7 +153,7 @@
                  >
                </el-upload>
              </el-form-item>
            </el-col>
            </el-col> -->
            <el-col :span="8">
              <el-form-item label="车型" prop="HCarTypeName">
                <el-input v-model="form.HCarTypeName" placeholder="请选择车型" disabled>
@@ -169,8 +169,8 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="所属公司" prop="HCompName">
                <el-input v-model="form.HCompName" placeholder="请选择所属公司" disabled>
              <el-form-item label="所属供应商" prop="HCompName">
                <el-input v-model="form.HCompName" placeholder="请选择所属供应商" disabled>
                  <el-button
                    slot="append"
                    icon="el-icon-search"
@@ -440,6 +440,7 @@
      rules: {
        HNumber: [{ required: true, message: "车牌号不能为空", trigger: "blur" }],
        HName: [{ required: true, message: "车辆名称不能为空", trigger: "blur" }],
        HCarTypeName:[{required: true, message: "车型请选择", trigger: "blur"}],
      },
      preUploadFiles: {
        HCarPric: [], // 车辆照片 文件缓存(只保存一张)
@@ -814,6 +815,8 @@
      //新增获取单据号
      // this.getHBillNo();
      let date = new Date();
      this.form.HCompID = sessionStorage["HSupID"];
      this.form.HCompName = sessionStorage["HSupName"];
      this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
      this.resetForm();
      if (this.OperationType == 1) {
@@ -853,7 +856,7 @@
                HCarPric: data.车辆照片,
                HCarCardIDPic: data.车辆行驶证照片,
                HCompID: data.HCompID,
                HCompName: data.所属公司,
                HCompName: data.所属供应商,
                HModel: data.车辆型号,
                HColor: data.车辆颜色,
                HBuyDate: data.购买日期 ? dayjs(data.购买日期).format("YYYY-MM-DD") : "",
@@ -1093,6 +1096,9 @@
                    this.subDisabled = true; //设置保存按钮不可用
                    this.$modal.msgSuccess(response.data.Message);
                    this.addBtnShow = true;
                  }else {
              // 显示后端返回的错误（车牌号重复、保存失败等）
                  this.$modal.msgError(response.data.Message);
                  }
                })
                .catch((error) => {
@@ -1159,7 +1165,7 @@
        // 所属公司
        this.iframeUrl = "/iframe/GySupplier";

        this.dialogTitle = "所属公司";
        this.dialogTitle = "所属供应商";
        // this.materialShow = true;
        this.openData = true;
      }