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

wangyi

15 小时以前 e2257774ab77c5cb3a9f2020213ac9ced8350498

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

 src/router/index.js

@@ -1587,6 +1587,26 @@
  },
  //#endregion

  //#region 车辆列表
  {
    path: "/basic",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/basic/gy", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/basic/gy/GyDriver",
        component: () => import("@/views/system/user/GyDriver.vue"),
        name: "gyDriver",
        meta: { title: "驾驶员列表", activeMenu: "/basic/gy" },
      },
    ],
  },
  //#endregion
  //#endregion

  //#region 费用基础资料

 src/store/modules/permission.js

@@ -705,7 +705,7 @@
                    },
                    component: () =>
                      import("@/views/basic/gyCartypelist/gyCartypelist.vue"),
                    hidden: false,
                    hidden: HIsHide,
                    name: "GyCartypelist",
                    path: "gyCartypelist",
                  },
@@ -740,6 +740,18 @@
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "驾驶员列表",
                    },
                    component: () => import("@/views/system/user/GyDriver.vue"),
                    hidden: false,
                    name: "gyDriver",
                    path: "GyDriver",
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "职员列表",
                    },
                    component: () =>

 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>
@@ -1095,6 +1095,9 @@
                    this.subDisabled = true; //设置保存按钮不可用
                    this.$modal.msgSuccess(response.data.Message);
                    this.addBtnShow = true;
                  }else {
              // 显示后端返回的错误（车牌号重复、保存失败等）
                  this.$modal.msgError(response.data.Message);
                  }
                })
                .catch((error) => {

 src/views/basic/gyCar/gyCarList.vue

@@ -138,10 +138,10 @@
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit((row = rowForm), (OperationType = 3))">编辑</el-button>
      </el-col>
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit((row = rowForm), (OperationType = 2))">复制</el-button>
      </el-col>
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除
        </el-button>

 src/views/logistics/transportGPS/WL_YayBill.vue

@@ -515,7 +515,7 @@
            }).then(result=>{
                if (result.data.count != 1) {
                   Permission = true;
                   this.sWhere=this.sWhere+"and 承运商ID ="+sessionStorage["HSupID"]
                   this.sWhere=this.sWhere+" and 承运商ID ="+sessionStorage["HSupID"]
                }  
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");