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

dytyqx

2026-03-31 9620ca5caed59bd206dce701a04a5a4e4cfb9dc5

 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>
@@ -45,7 +45,7 @@
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="6">
            <!-- <el-col :span="6">
              <el-form-item label="父级" prop="HParentName">
                <el-input v-model="form.HParentName" placeholder="请选择父级" disabled>
                  <el-button
@@ -56,7 +56,7 @@
                  ></el-button>
                </el-input>
              </el-form-item>
            </el-col>
            </el-col> -->
            <el-col :span="6">
              <el-form-item label="车架号" prop="HCarSN">
                <el-input v-model="form.HCarSN" placeholder="请输入车架号"></el-input>
@@ -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,12 +169,13 @@
          </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"
                    class="select-btn-primary"
                    class="select-btn-disabled"
                    disabled
                    @click.stop="openDataDialog(3)"
                  ></el-button>
                </el-input>
@@ -749,8 +750,8 @@
        HCarTypeName: "",
        HCarPric: "",
        HCarCardIDPic: "",
        HCompID: 0,
        HCompName: "",
        HCompID: sessionStorage["HSupID"],
        HCompName: sessionStorage["HSupName"],
        HModel: "",
        HColor: "",
        HBuyDate: dayjs(new Date()).format("YYYY-MM-DD"),
@@ -813,6 +814,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) {
@@ -847,12 +850,12 @@
                HCarCheckDate: data.车辆年检日期
                  ? dayjs(data.车辆年检日期).format("YYYY-MM-DD")
                  : "",
                HCarTypeID: data.车型,
                HCarTypeName: data.车型名称 || "",
                HCarTypeID: data.HCarTypeID,
                HCarTypeName: data.车型 || "",
                HCarPric: data.车辆照片,
                HCarCardIDPic: data.车辆行驶证照片,
                HCompID: data.HCompID,
                HCompName: data.所属公司,
                HCompName: data.所属供应商,
                HModel: data.车辆型号,
                HColor: data.车辆颜色,
                HBuyDate: data.购买日期 ? dayjs(data.购买日期).format("YYYY-MM-DD") : "",
@@ -870,6 +873,7 @@
                HModifyTime: data.修改时间
                  ? dayjs(data.修改时间).format("YYYY-MM-DD")
                  : "",

              },
            };

@@ -1091,6 +1095,9 @@
                    this.subDisabled = true; //设置保存按钮不可用
                    this.$modal.msgSuccess(response.data.Message);
                    this.addBtnShow = true;
                  }else {
              // 显示后端返回的错误（车牌号重复、保存失败等）
                  this.$modal.msgError(response.data.Message);
                  }
                })
                .catch((error) => {
@@ -1103,10 +1110,11 @@
    },
    // 反审核/审核数据
    set_CheckBill(num, form) {
      var InterID = form.hmainid || form.HInterID;
      console.log(form)
      var InterID = form.hmainid || form.HInterID || form.HItemID;
      //逻辑审核方法
      axios
        .get(this.$baseUrl + "/Kf_SellOutBill/AuditKf_SellOutBill", {
        .get(this.$baseUrl + "/Gy_Car/AuditGy_Car", {
          params: {
            HInterID: InterID,
            IsAudit: num,
@@ -1117,6 +1125,8 @@
          let result = response.data;
          if (result.code == 1) {
            this.$modal.msgSuccess("操作成功");
            this.subDisabled = true
            this.checkDisabled = true
          } else {
            this.$modal.msgError("错误:" + result.code + result.Message);
          }
@@ -1154,7 +1164,7 @@
        // 所属公司
        this.iframeUrl = "/iframe/GySupplier";

        this.dialogTitle = "所属公司";
        this.dialogTitle = "所属供应商";
        // this.materialShow = true;
        this.openData = true;
      }
@@ -1172,6 +1182,11 @@
  color: #fff !important;
}

.select-btn-disabled {
  background-color: rgba(245, 247, 250, 1) !important;
  color: #000 !important;
}

.image-input-outer {
  display: inline-flex;
  width: 60%;