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

duhe

2026-01-27 4c286f18431189d674966fbfb3999e94971c52ab

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

 src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue

@@ -872,9 +872,9 @@
    /** 修改按钮操作 */
    handleUpdate() {
      this.reset();
      let rowHmainid = this.linterid;
      let rowHmainid = this.linterid || this.hmainid;
      console.log(this.linterid);
      //主表
      //主表  %EF%BB%BFEditList
      axios
        .get(this.$baseUrl + "/Cg_ContractTransportBillListController/%EF%BB%BFEditList", {
          params: { HInterID: rowHmainid,user: sessionStorage["HUserName"]},

 src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue

@@ -170,7 +170,7 @@
      </el-dialog>
      <!-- 编辑 -->
      <el-dialog title="编辑" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
        <edit :OperationType=OperationType :linterid=this.rowForm.hmainid || this.rowForm.HInterID
        <edit :OperationType=OperationType :linterid=this.rowForm.HInterID||this.rowForm.hmainid
          :HSouceBillType=this.rowForm.HSourceBillType :copyType="copyType" @editClose="editClose" v-if="editShow" />
      </el-dialog>
      <el-dialog title="打印模板选择" :visible.sync="openPrintList" width="800px" append-to-body>

 src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue

@@ -682,7 +682,7 @@
        getHBillNo() {
            axios.get(this.$baseUrl + "/Web/GetMAXNum", {
                params: {
                    HBillType: '1242'
                    HBillType: '6667'
                }
            }).then(response => {
                this.form.HMaker = sessionStorage["HUserName"]

 src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue

@@ -574,13 +574,13 @@
        HMaker: '',
        HUpDater: '',
        HChecker: '',
        HMakeDate: new Date(),
        HUpDateDate: '',
        HCheckDate: '',
        HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCloseMan: '',
        HDeleteMan: '',
        HCloseDate: '',
        HDeleteDate: '',
        HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
      }
      this.editData = []
      this.editData1 = []

 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue

@@ -644,13 +644,13 @@
        HMaker: '',
        HUpDater: '',
        HChecker: '',
        HMakeDate: new Date(),
        HUpDateDate: '',
        HCheckDate: '',
        HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCloseMan: '',
        HDeleteMan: '',
        HCloseDate: '',
        HDeleteDate: '',
        HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
      }
      this.editData = []
      this.editData1 = []

 src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue

@@ -667,13 +667,13 @@
        HMaker: '',
        HUpDater: '',
        HChecker: '',
        HMakeDate: new Date(),
        HUpDateDate: '',
        HCheckDate: '',
        HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCloseMan: '',
        HDeleteMan: '',
        HCloseDate: '',
        HDeleteDate: '',
        HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
      }
      this.editData = []
      this.editData1 = []

 src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue

@@ -810,13 +810,13 @@
        HMaker: '',
        HUpDater: '',
        HChecker: '',
        HMakeDate: new Date(),
        HUpDateDate: '',
        HCheckDate: '',
        HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCloseMan: '',
        HDeleteMan: '',
        HCloseDate: '',
        HDeleteDate: '',
        HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
      }
      this.editData = []
      this.editData1 = []

 src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue

@@ -883,13 +883,13 @@
        HMaker: '',
        HUpDater: '',
        HChecker: '',
        HMakeDate: new Date(),
        HUpDateDate: '',
        HCheckDate: '',
        HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCloseMan: '',
        HDeleteMan: '',
        HCloseDate: '',
        HDeleteDate: '',
        HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
      }
      this.editData = []
      this.editData1 = []

 src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue

@@ -808,13 +808,13 @@
        HMaker: '',
        HUpDater: '',
        HChecker: '',
        HMakeDate: new Date(),
        HUpDateDate: '',
        HCheckDate: '',
        HMakeDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HUpDateDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCheckDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HCloseMan: '',
        HDeleteMan: '',
        HCloseDate: '',
        HDeleteDate: '',
        HCloseDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
        HDeleteDate: moment(new Date()).format('YYYY-MM-DD hh:mm:ss'),
      }
      this.editData = []
      this.editData1 = []

 src/views/system/user/GyDriver.vue

@@ -1266,6 +1266,13 @@

        if (res.data.count == 1) {
          this.$modal.msgSuccess("删除成功");
           this.$refs.tableData.clearSelection();
      // 清空选中数据
      this.ids = [];
      this.rowForm = {};
      // 重置按钮状态
      this.single = true;
      this.multiple = true;
          this.getList();
        } else {
          this.$modal.msgError(res.data.Message || "删除失败");
@@ -1298,6 +1305,14 @@

        if (res.data.count == 1) {
          this.$modal.msgSuccess(`${action}成功`);
           // 清除表格选中状态
          this.$refs.tableData.clearSelection();
          // 清空选中数据
          this.ids = [];
          this.rowForm = {};
        // 重置按钮状态
          this.single = true;
          this.multiple = true;
          this.getList();
        } else {
          this.$modal.msgError(res.data.Message || `${action}失败`);
@@ -1330,6 +1345,14 @@

        if (res.data.count == 1) {
          this.$modal.msgSuccess(`${action}成功`);
          // 清除表格选中状态
      this.$refs.tableData.clearSelection();
      // 清空选中数据
      this.ids = [];
      this.rowForm = {};
      // 重置按钮状态
      this.single = true;
      this.multiple = true;
          this.getList();
        } else {
          this.$modal.msgError(res.data.Message || `${action}失败`);

 src/views/system/user/GyDriverEdit.vue

@@ -149,7 +149,7 @@
          <div class="form-row">
            <el-form-item label="身份证号码">
              <el-input
                v-model="formData.identityID"
                v-model="formData.HIDCard"
                placeholder="请输入身份证号码"
                clearable
                :disabled="isViewMode"
@@ -159,7 +159,7 @@

            <el-form-item label="手机号码">
              <el-input
                v-model="formData.Telephone"
                v-model="formData.HPhone"
                placeholder="请输入手机号码"
                clearable
                :disabled="isViewMode"
@@ -168,7 +168,7 @@

            <el-form-item label="驾照类型">
              <el-select
                v-model="formData.LicenseType"
                v-model="formData.HDriverCardType"
                placeholder="请选择驾照类型"
                :disabled="isViewMode"
              >
@@ -182,7 +182,7 @@

            <el-form-item label="司机类型">
              <el-select
                v-model="formData.DriverType"
                v-model="formData.HEmpType"
                placeholder="请选择司机类型"
                :disabled="isViewMode"
              >
@@ -316,10 +316,10 @@
        HDeptName: "",
        HDeptID: "0",
        HDepNumber: "",
        identityID: "",
        Telephone: "",
        LicenseType: "A1",
        DriverType: "固定",
        HIDCard: "",
        HPhone: "",
        HDriverCardType: "A1",
        HEmpType: "固定",
        HStopflag: "0",
        checkboxHStopflag: 0,
        HRemark: "",
@@ -332,6 +332,7 @@
        HStopEmp: "",
        HStopDate: "",
        Organization: "",
        HPhone: "",
      },
      
      // 表单验证规则
@@ -497,16 +498,17 @@
        HNumber: "驾驶员代码",
        HName: "驾驶员名称",
        HHelpCode: "短代码",
        HCompID: "所属公司ID",
        HDeptName: "所属公司名称",
        HDepNumber: "所属公司代码",
        HDeptID: "所属公司ID",
        identityID: "身份证号码",
        Telephone: "手机号码",
        HStopflag: "禁用标记",
        HIDCard: "身份证号码",
        HPhone: "手机号码",
        HStopflag: "禁用标识",
        HRemark: "备注",
        HUSEORGID: "HUSEORGID",
        LicenseType: "驾照类型",
        DriverType: "司机类型",
        HDriverCardType: "驾照类型",
        HEmpType: "司机类型",
        HMakeEmp: "创建人",
        HMakeDate: "创建日期",
        HCheckEmp: "审核人",
@@ -525,7 +527,7 @@
        }
      });
      
      if (data.禁用标记) {
      if (data.禁用标识) {
        this.formData.checkboxHStopflag = 1;
        this.formData.HStopflag = "1";
      } else {