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

陈婷婷

2026-01-28 65bf09a12a59dd62e414da255f9527a21d850327

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

 src/store/modules/permission.js

@@ -35,6 +35,11 @@
      const loginSource = getLoginPageSource();
      console.log(`用户从 ${loginSource} 页面登录`);

      var HIsHide = false;
      if(loginSource=="loginTMS"){
        HIsHide = true;
      }

      return new Promise((resolve) => {
        // 向后端请求路由数据
        let data = [
@@ -87,7 +92,7 @@
                  noCache: false,
                  title: "运输定位",
                },
                hidden: false,
                hidden: HIsHide,
                name: "WayBillPaymentBill",
                path: "WayBillPaymentBill",
                redirect: "noRedirect",
@@ -104,7 +109,7 @@
                      import(
                        "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue"
                      ),
                    hidden: false,
                    hidden: HIsHide,
                    name: "payWayBillPaymentBillList",
                    path: "PayWayBillPaymentBillList",
                  },
@@ -121,7 +126,7 @@
              noCache: false,
              title: "销售管理",
            },
            hidden: false,
            hidden: HIsHide,
            name: "Sell",
            path: "/sell",
            redirect: "noRedirect",
@@ -348,7 +353,7 @@
              noCache: false,
              title: "仓库管理",
            },
            hidden: false,
            hidden: HIsHide,
            name: "Warehouse",
            path: "/warehouse",
            redirect: "noRedirect",
@@ -556,7 +561,7 @@
                  noCache: false,
                  title: "生产资料",
                },
                hidden: false,
                hidden: HIsHide,
                name: "Production",
                path: "production",
                redirect: "noRedirect",
@@ -584,7 +589,7 @@
                  noCache: false,
                  title: "物流基础资料",
                },
                hidden: false,
                hidden: HIsHide,
                name: "Transport",
                path: "transport",
                redirect: "noRedirect",
@@ -629,7 +634,7 @@
                    },
                    component: () =>
                      import("@/views/basic/gyWarehouse/gyWarehouse.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyWarehouse",
                    path: "gyWarehouse",
                  },
@@ -642,7 +647,7 @@
                    },
                    component: () =>
                      import("@/views/basic/gyStockPlace/gyStockPlace.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyStockPlace",
                    path: "gyStockPlace",
                  },
@@ -668,7 +673,7 @@
                    },
                    component: () =>
                      import("@/views/basic/gyItemMoney/gyItemMoney.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyItemMoney",
                    path: "gyItemMoney",
                  },
@@ -694,7 +699,7 @@
                    },
                    component: () =>
                      import("@/views/basic/gyEmployee/gyEmployee.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyEmployee",
                    path: "gyEmployee",
                  },
@@ -707,7 +712,7 @@
                    },
                    component: () =>
                      import("@/views/basic/gy/gyDepartment.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyDepartment",
                    path: "gyDepartment",
                  },
@@ -720,24 +725,22 @@
                    },
                    component: () =>
                      import("@/views/basic/gyCurrency/gyCurrency.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyCurrency",
                    path: "gyCurrency",
                  },

                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      noCache: HIsHide,
                      title: "计量单位列表",
                    },
                    component: () => import("@/views/basic/gyUnit/gyUnit.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyUnit",
                    path: "gyUnit",
                  },

                  {
                    meta: {
                      icon: "build",
@@ -746,7 +749,7 @@
                      title: "供应商列表",
                    },
                    component: () => import("@/views/basic/gy/gySupplier.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GySupplier",
                    path: "gySupplier",
                  },
@@ -759,7 +762,7 @@
                    },
                    component: () =>
                      import("@/views/gyMaterial/GyMaterial.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyMaterial",
                    path: "GyMaterial",
                  },
@@ -771,7 +774,7 @@
                      title: "客户列表",
                    },
                    component: () => import("@/views/GyCustomer/index.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyCustomer",
                    path: "GyCustomer",
                  },
@@ -784,7 +787,7 @@
                    },
                    component: () =>
                      import("@/views/basic/gyProperty/gyPropertyList.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyProperty",
                    path: "gyProperty",
                  },
@@ -801,7 +804,7 @@
              noCache: false,
              title: "采购管理",
            },
            hidden: false,
            hidden: HIsHide,
            name: "Purchase",
            path: "/purchase",
            redirect: "noRedirect",
@@ -1072,7 +1075,7 @@
              noCache: false,
              title: "生产管理",
            },
            hidden: false,
            hidden: HIsHide,
            name: "ICMO",
            path: "/icmo",
            redirect: "noRedirect",
@@ -1210,7 +1213,7 @@
              noCache: false,
              title: "容器管理",
            },
            hidden: false,
            hidden: HIsHide,
            name: "ScMould",
            path: "/scMould",
            redirect: "noRedirect",
@@ -1479,7 +1482,7 @@
              noCache: false,
              title: "系统管理",
            },
            hidden: false,
            hidden: HIsHide,
            name: "System",
            path: "/system",
            redirect: "noRedirect",

 src/views/basic/gyCartypelist/gyCartypelistEdit.vue

@@ -87,6 +87,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="8">
               <el-col :span="8" v-show="false">
              <el-form-item label="等级" prop="HLevel">
                <el-input
                  v-model="form.HLevel"
@@ -94,6 +95,7 @@
                  type="text"
                />
              </el-form-item>
               </el-col>
            </el-col>
          </el-row>
          <el-row>
@@ -283,7 +285,7 @@
        HHeight: "",
        HMaxVolume: "",
        HUseFlag: "未检测",
        HLevel: "",
        HLevel: 0,
        HEndFlag: true,
        HStopflag: false,
        HShortNumber: "",
@@ -334,13 +336,7 @@
            trigger: "blur",
          },
        ],
        HLevel: [
          {
            pattern: /^\d+$/,
            message: "等级必须为数字",
            trigger: "blur",
          },
        ],
        
      },
    };
  },
@@ -498,7 +494,7 @@
        HHeight: "",
        HMaxVolume: "",
        HUseFlag: "未检测",
        HLevel: "",
        HLevel: 0,
        HEndFlag: true,
        HStopflag: false,
        HShortNumber: "",

 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/basicModeling/Gy_MouldFile.vue

@@ -107,6 +107,16 @@
                </el-date-picker>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="托体积" prop="HPackV" v-show="isShow">
                <el-input v-model="form.HPackV" placeholder="请输入托体积" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="托标准容器数量" prop="HStandardQtyForMouldInPack" v-show="isShow">
                <el-input v-model="form.HStandardQtyForMouldInPack" placeholder="请输入托标准容器数量" />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="6">
@@ -1002,6 +1012,8 @@
        HInComDate: moment(new Date()).format('YYYY-MM-DD'),
        DateTime: moment(new Date()).format('YYYY-MM-DD'),
        HCalibrationDate: moment(new Date()).format('YYYY-MM-DD'),
        HPackV:0,
        HStandardQtyForMouldInPack:0,
      }
      this.editData = []
      this.editBtData = []
@@ -1155,9 +1167,11 @@
          this.form.HTransPackFlag = data.周转容器标记
          this.form.HSendPackFlag = data.发货容器标记
          this.form.HMouldFoldHeight = data.折叠高度
            this.form.HMouldLength = data.长
          this.form.HMouldLength = data.长
          this.form.HMouldWidth = data.宽
          this.form.HMouldHeight = data.高
          this.form.HPackV = data.托体积
          this.form.HStandardQtyForMouldInPack = data.托标准容器数量
          for (var i = 0; i < result.data.length; i++) {
            this.editData.push(
              {

 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

@@ -876,6 +876,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 || "删除失败");
@@ -908,6 +915,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}失败`);
@@ -940,6 +955,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 {