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

陈婷婷

3 天以前 a4989ac2090626b23c630a097f5f773f08f8f949

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

 RuoYi-Vue

New file
@@ -0,0 +1 @@
Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814

 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/FbStepFoldOutBillList/fbStepFoldOutBillList.vue

@@ -545,7 +545,7 @@
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '贴标签数不能为小数！'
          if (num <= 0) return '贴标签数必须大于0！'
          if (num <0) return '贴标签数必须大于0！'
          return true
        }
      }).then(({ value }) => {
@@ -590,7 +590,7 @@
            const num = parseInt(value)
            if (isNaN(num)) return '请输入有效的数字！'
            if (num.toString() !== value) return '托数不能为小数！'
            if (num <= 0) return '托数必须大于0！'
            if (num <0) return '托数必须大于0！'
            return true
            }
        }).then(({ value }) => {

 src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue

@@ -684,7 +684,7 @@
            const num = parseInt(value)
            if (isNaN(num)) return '请输入有效的数字！'
            if (num.toString() !== value) return '托数不能为小数！'
            if (num <= 0) return '托数必须大于0！'
            if (num < 0) return '托数必须大于0！'
            return true
            }
        }).then(({ value }) => {

 src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue

@@ -666,7 +666,7 @@
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          if (num < 0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {

 src/views/ProductInBill/Kf_ProductInBillList.vue

@@ -173,10 +173,11 @@
          </el-table-column>
        </template>
      </el-table>
      <!-- 记录数、页数、当前页 -->
      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" @pagination="handleQuery" />
      <!-- 列设置 -->
      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
      <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
          v-if="rowHideShow" />
      </el-dialog>
        <RowSettings :colName="btResList" HModName="Kf_ProductInBillList" @rowEditClose="rowSetClose"
          v-if="rowHideShow" />
      </el-dialog>
@@ -286,9 +287,17 @@
        ColContent: '',
      },
      
      page: 1,                                                      //page页索引
      pageSize: 0,                                                  //page页面记录数
      total: 0,                                                     //记录合计数
      loading: true,
      tyResList: [],//列表（接口数据）
      btList: [],//表头列表显示
      btResList: [],
      tableData: [],//列表(分页显示)
      dataList: [],
      titleData: [],//不需要显示的字段 可扩展
      pageSizes: [ 50,100, 500, 5000, 50000],
      page: 1,
      pageSize: 0,
      total: 0,                                                    //记录合计数
      tableShow: true,                                              // table显示标记
      totalNameList: [],                                            // 需要设置合计行的列数组
      tableData: [],                                                // 列表数据。用于table监听事件
@@ -498,7 +507,6 @@

    //#region 查询
    getList() {
      this.pageSize = 50
      if (this.pageSize == 0) {
        this.pageSize = 50
      }
@@ -506,18 +514,19 @@
      this.loading = true
      
      // 列表查询
      axios.get(this.$baseUrl + '/Kf_ProductInBillController/GetKf_ProductInBillList_Json', {
      axios.get(this.$baseUrl + '/Kf_ProductInBillController/page', {
        params: {
          "sWhere": this.sWhere,
          "HMaker": sessionStorage["HUserName"],
          "OperationType": 1,
          "ViewName": "h_v_Kf_ProductInBillList"
          "user": sessionStorage["HUserName"],
          "page": this.page,
          "size": this.pageSize,
          "Type":'3802',
        },
      }).then(response => {
        this.tyResList = response.data.data//总数据
        let data1 = response.data
        let option = []
        if (data1.count == 1) {
        if (data1.list && data1.list.length > 0) {
          this.btResList = data1.list             //列表表头数据
          this.total = data1.count;
          var data = [];//列字段数据
@@ -675,7 +684,7 @@
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          if (num < 0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {
@@ -811,11 +820,11 @@
              this.totalNameList.push(item)
            }
          })
          if (data1.data[0].HPageSize == 0) {
            this.pageSize = 50
          } else {
            this.pageSize = data1.data[0].HPageSize
          }
          // if (data1.data[0].HPageSize == 0) {
          //   this.pageSize = 50
          // } else {
          //   this.pageSize = data1.data[0].HPageSize
          // }
          this.tableData = option.data
          this.tableShow = true
          this.loading = false
@@ -921,7 +930,7 @@
      var result = false;
      axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
        var data1 = response.data
        if (data1.count == 1) {
        if (data1.list && data1.list.length > 0) {
          if (data1.data == "水务") {
            result = true;
          }

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

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

 src/views/basic/gyCar/gyCarList.vue

@@ -112,11 +112,11 @@
        </el-collapse-item>
      </el-collapse>

      <!-- <el-form-item label-width="78px">
      <el-form-item label-width="78px">
        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
          搜 索</el-button>
        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false">取 消</el-button>
      </el-form-item> -->
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
@@ -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>
@@ -207,12 +207,12 @@
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">隐藏列设置</el-button>
      </el-col>
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">搜 索</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重 置</el-button>
      </el-col>
      </el-col> -->
      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
    </el-row>
    <div class="tableBox" v-loading="loading">
@@ -513,6 +513,109 @@
      return sums;
    },

    //#region 权限判断
        async set_ModCheck(ModRightNameCheck)
        {
            var Permission = false;
            const res=await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
                params: {
                    "ModRightNameCheck": ModRightNameCheck,
                    "user": sessionStorage["HUserName"],
                   
                },
            }).then(result=>{
                if (result.data.count != 1) {
                   Permission = true;
                   this.sWhere=this.sWhere+"and HCompID ="+sessionStorage["HSupID"]
                }  
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");
            });
        },
        //#endregion
        //#region 快速过滤
        async handleQuery() {
            this.sWhere = ''
            if (this.queryParams.ColName && this.queryParams.Comparator) {
                var com = "";
                switch (this.queryParams.Comparator) {
                    case "7":
                        com = "like'%" + this.queryParams.ColContent + "%'";
                        break;
                    case "8":
                        com = "like'%" + this.queryParams.ColContent + "'";
                        break;
                    case "9":
                        com = "like'" + this.queryParams.ColContent + "%'";
                        break;
                    case "10":
                        com = "not like'%" + this.queryParams.ColContent + "%'";
                        break;
                    default:
                        com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
                        break;
                }
                this.sWhere += " and " + this.queryParams.ColName + " " + com;
            }
            if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
                var com1 = "";
                switch (this.queryParams.Comparator1) {
                    case "7":
                        com1 = "like'%" + this.queryParams.ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + this.queryParams.ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + this.queryParams.ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
                        break;
                }
                this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
            }
            if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
                var com2 = "";
                switch (this.queryParams.Comparator2) {
                    case "7":
                        com2 = "like'%" + this.queryParams.ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + this.queryParams.ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + this.queryParams.ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
                        break;
                }
                this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
            }
            if (this.queryParams.sTime) {
                this.queryParams.sTime = moment(this.queryParams.sTime).format('YYYY-MM-DD')
                this.queryParams.eTime = moment(this.queryParams.eTime).format('YYYY-MM-DD')
                this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.queryParams.sTime + "'" + " and CONVERT(varchar(100),日期, 23) <= '" + this.queryParams.eTime + "'";
            }
            if (this.queryParams.HBillNo) {
                this.sWhere += " and 单据号 like '%" + this.queryParams.HBillNo + "%'";
            }
            // if (this.queryParams.HOrgID) {
            //     this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
            // }
            console.log("swhere",this.sWhere)
            this.clearData()
            this.getList()
        },
        //#endregion

    //#region 获取公司名，根据公司进行定制化开发
    defaintOperationByCompanyName() {
      var result = false;
@@ -607,6 +710,7 @@
      this.deptform = {};
    },
    async getList() {
      await this.set_ModCheck("Gy_Car_SUBQuery");
      this.tableShow = false;
      this.loading = true;
      if (this.pageSize == 0) {
@@ -865,6 +969,7 @@
      document.body.removeChild(span);
      return h(span, column.label);
    },
    
    //点击行
    handleRowClick(row, column, event) {
      this.lastSelectedRow = this.selectedRow; // 记录上一次选中的行
@@ -1111,9 +1216,9 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.$baseUrl + "Xs_SeOrderBill/DropXs_SeOrderBill", {
              .get(this.$baseUrl + "Gy_CarController/DropGy_Car", {
                params: {
                  HInterID: this.rowForm.hmainid.toString(),
                  HItemID: this.rowForm.hmainid.toString(),
                  user: sessionStorage["HUserName"],
                },
              })

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

@@ -374,6 +374,10 @@
                        label: '往返',
                        value: '往返',
                      },
                      {
                        label: '零担',
                        value: '零担',
                      },
                    ]"
                    :key="index"
                    :label="item.label"

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

@@ -588,7 +588,8 @@
    },
    //选中行高亮样式
    rowStyle({ row, rowIndex }) {
      if (this.ids.includes(row.hmainid)) {
      // 使用 HInterID 判断
      if (this.ids.includes(row.HInterID)) {
        return { "background": "#ecf5ff" }
      }
    },
@@ -603,8 +604,7 @@
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      // this.rowForm = {}
      this.ids = selection.map(item => item.hmainid)
      this.ids = selection.map(item => item.HInterID) 
      this.single = selection.length != 1
      this.multiple = !selection.length
      if (!this.single) {

 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue

@@ -257,15 +257,15 @@
                                <el-col :span="6">
                                    <el-form-item label="物流状态" prop="HCarryStatus">
                                        <el-select v-model="form.HCarryStatus" placeholder="请选择物流状态" disabled>
                                            <el-option label="申请中" value="1"></el-option>
                                            <el-option label="已审核" value="2"></el-option>
                                            <el-option label="承运商确认" value="3"></el-option>
                                            <el-option label="待提货" value="4"></el-option>
                                            <el-option label="已到厂" value="5"></el-option>
                                            <el-option label="已提货" value="6"></el-option>
                                            <el-option label="运输中" value="7"></el-option>
                                            <el-option label="已签收" value="8"></el-option>
                                            <el-option label="已核算" value="9"></el-option>
                                            <el-option label="申请中" value="申请中"></el-option>
                                            <el-option label="待供应商确认" value="待供应商确认"></el-option>
                                            <el-option label="指定驾驶员、车辆中" value="指定驾驶员、车辆中"></el-option>
                                            <el-option label="正在前往始发地" value="正在前往始发地"></el-option>
                                            <el-option label="提货中" value="提货中"></el-option>
                                            <el-option label="准备离厂" value="准备离厂"></el-option>
                                            <el-option label="送货中" value="送货中"></el-option>
                                            <el-option label="已签收" value="已签收"></el-option>
                                            <el-option label="已核算" value="已核算"></el-option>
                                        </el-select>
                                    </el-form-item>
                                </el-col>
@@ -860,7 +860,7 @@
                    this.form.HEndAddr = data.目的地
                    this.form.HEndAddrName = data.目的地名称
                    this.form.HPickAddr = data.提货地址
                    this.form.HArriverAddr = data.到货方式
                    this.form.HArriverAddr = data.到货地址
                    this.form.HTransType = data.运输方式
                    this.form.HCarTypeID = data.车型ID
                    this.form.HCarTypeName = data.车型名称

 src/views/logistics/transportGPS/WL_YayBill.vue

@@ -143,8 +143,24 @@
                </el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(0, form = rowForm)">审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(1, form = rowForm)">反审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="handleVolume(rowForm)">维护零单占用体积</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="set_ConfirmBill">供应商确认</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="openDataDialog(14, form = rowForm)">分配司机</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@@ -162,29 +178,9 @@
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="set_ConfirmOtherBill(4)">到货签收确认</el-button>
            </el-col>
            <!-- <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="set_CheckBill(0, form = rowForm)">分配司机</el-button>
            </el-col> -->
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="handleVolume(rowForm)">维护零单占用体积</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini"
                    @click="handlePush(row = rowForm, OperationType = 4)">下推（费用结算单）</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="openDataDialog(14, form = rowForm)">分配司机</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(0, form = rowForm)">审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(1, form = rowForm)">反审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@@ -208,17 +204,6 @@
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">隐藏列设置</el-button>
            </el-col>
            <!-- <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">打印</el-button>
            </el-col> 
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
                    @click="get_BarCodeDetail">条码明细</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
                    @click="get_PackStockDetail">包装容器出入库明细</el-button>
            </el-col>-->
        </el-row>
        <div class="tableBox" v-loading="loading">
            <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -530,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("接口请求失败!");
@@ -734,8 +719,8 @@
        //#region 删除
        handleDelete() {
            this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {
                axios.get(this.$baseUrl + "/Cg_ContractTransportBillListController/DeleteBill", {
                    params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
                axios.get(this.$baseUrl + "/WLYayBillController/deleteBill", {
                    params: { 'HItemID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
                }).then(response => {
                    if (response.data.count == 1) {
                        this.handleQuery()

 src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue

@@ -886,7 +886,7 @@
        },
        set_CheckBill(num) {
            //逻辑审核方法
            axios.get(this.$baseUrl + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
            axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/AuditGy_MaterialPackingRelation", {
                params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
            }).then(response => {
                let result = response.data

 src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue

@@ -889,7 +889,7 @@
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          if (num <0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {

 src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue

@@ -890,7 +890,7 @@
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          if (num <0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {

 src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue

@@ -799,7 +799,7 @@
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          if (num <0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {

 src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue

@@ -831,7 +831,7 @@
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          if (num < 0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {

 src/views/sell/XsSeOutStockBill.vue

@@ -88,9 +88,8 @@
                  <el-col :span="6" style="padding: 0 10px">
                    <el-select v-model="queryParams.Comparator2" placeholder="请选择" @change="riqiChange"
                      class="ForFilteringSchemes">
                      <span v-for="(item, index) in btList" :key="index">
                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
                      </span>
                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
                        :value="item.value"></el-option>
                    </el-select>
                  </el-col>
                  <el-col :span="11">
@@ -104,8 +103,9 @@
                  <el-col :span="7">
                    <el-select v-model="queryParams.ColName" placeholder="请选择" @change="riqiChange"
                      class="ForFilteringSchemes">
                      <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
                        :value="item.field"></el-option>
                       <span v-for="(item, index) in btList" :key="index">
                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
                      </span>
                    </el-select>
                  </el-col>
                  <el-col :span="6" style="padding: 0 10px">
@@ -707,6 +707,9 @@
        this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.sTime + "'";
        this.sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + this.eTime + "'";
      }
      if (this.queryParams.HOrgID) {
        this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
      }
      let Organization = this.organizationList.find(
        (e) => e.ID == this.queryParams.HOrgID
      )?.Name;
@@ -1070,9 +1073,8 @@
      }

      if (this.queryParams.HBillNo) {
        this.sWhere += " and 单据号 like '%" + this.queryParams.HNumber + "%'";
        this.sWhere += " and 单据号 like '%" + this.queryParams.HBillNo + "%'";
      }

      if (this.queryParams.HProjectNumber) {
        this.sWhere += " and 项目编码 like '%" + this.queryParams.HProjectNumber + "%'";
      }

 src/views/sell/sellOut/sellOutBill.vue

@@ -1040,7 +1040,7 @@
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '贴标签数不能为小数！'
          if (num <= 0) return '贴标签数必须大于0！'
          if (num < 0) return '贴标签数必须大于0！'
          return true
        }
      }).then(({ value }) => {
@@ -1093,7 +1093,7 @@
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          if (num < 0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {

 src/views/system/user/GyDriver.vue

@@ -437,9 +437,11 @@
        );
        if (userRes.data.data && userRes.data.data[0]) {
          const userData = userRes.data.data[0];
          this.user = userData.Czymc || "admin";
          this.user = sessionStorage["HUserName"] ;
          this.Organization = userData.HUSEORGID;
          this.queryParams.HUSEORGID = userData.HUSEORGID;
          const orgId = sessionStorage["OrganizationID"];
          this.queryParams.HUSEORGID = orgId ? Number(orgId) : null;
          this.$forceUpdate();
        }

        const orgRes = await axios.get(`${this.$baseUrl}/Web/GetOrganizations`);
@@ -460,7 +462,8 @@
    async getList() {
      this.tableShow = false;
      this.loading = true;
      console.log("获取列表数据...", this.sWhere);
      this.sWhere=this.sWhere+"and 使用组织 ="+sessionStorage["OrganizationID"]
      await this.set_ModCheck("GyDriver_SUPQuery")
      try {
        const params = {
          sWhere: this.sWhere || "",
@@ -617,8 +620,27 @@
        console.error("加载列配置失败:", error);
      }
    },
   async set_ModCheck(ModRightNameCheck)
        {
            var Permission = false;
            const res=await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
                params: {
                    "ModRightNameCheck": ModRightNameCheck,
                    "user": sessionStorage["HUserName"],
                   
                },
            }).then(result=>{
                if (result.data.count != 1) {
                   Permission = true;
                   this.sWhere=this.sWhere+"and 所属公司ID ="+sessionStorage["HSupID"]
                }  
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");
            });
        },

    handleQuery() {
  async handleQuery() {
      
      this.sWhere = "";
      const conditions = [];

@@ -628,9 +650,9 @@
      if (this.queryParams.HName) {
        conditions.push(`驾驶员名称 like '%${this.queryParams.HName}%'`);
      }
      // if (this.queryParams.HUSEORGID) {
      //   conditions.push(`HUSEORGID = '${this.queryParams.HUSEORGID}'`);
      // }
      if (this.queryParams.HUSEORGID) {
        conditions.push(`使用组织 = '${this.queryParams.HUSEORGID}'`);
      }


      if (this.queryParams.ColName !== "0" && this.queryParams.Comparator !== "0") {
@@ -707,7 +729,7 @@

    resetQuery() {
      this.queryParams = {
        HUSEORGID: this.Organization,
        HUSEORGID: sessionStorage["OrganizationID"],
        HName: "",
        HNumber: "",
        HSyncNumber: "",

 src/views/system/user/GyDriverEdit.vue

@@ -67,18 +67,17 @@
              />
            </el-form-item>

            <el-form-item label="所属公司" prop="HDeptID">
            <el-form-item label="所属承运商" prop="HCompID">
              <div class="dept-select">
                <el-input
                  v-model="formData.HDeptName"
                  placeholder="请选择所属公司"
                  placeholder="请选择所属承运商"
                  readonly
                  clearable
                  :disabled="isViewMode" 
                />
                <el-input
                  type="hidden"
                  v-model="formData.HDeptID"
                  v-model="formData.HCompID"
                  style="display: none"
                />
                <el-button
@@ -87,6 +86,7 @@
                  @click="openDeptDialog"
                  :disabled="isViewMode"
                  style="margin-left: 10px"
                  disabled
                >
                </el-button>
              </div>
@@ -99,7 +99,7 @@
                v-model="formData.checkboxHStopflag"
                :true-label="1"
                :false-label="0"
                :disabled="!canEditStopFlag"
                disabled
                @change="handleStopFlagChange"
              >
                是否禁用
@@ -253,13 +253,14 @@

    <!-- 部门选择弹窗 -->
    <el-dialog
      title="dialogTitle"
      title="承运商"
      :visible.sync="openData"
      width="90%"
      top="5vh"
      append-to-body
      disabled
    >
    <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
    <GySupplier  ref="supplierRef"@deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
      
      <span slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
@@ -272,10 +273,10 @@

<script>
import axios from "axios";
import Dept from "@/views/component/dept";
import GySupplier from '@/views/basic/gy/gySupplier.vue'
export default {
  name: "GyDriverEdit",
  components: { Dept},
  components: { GySupplier},
  props: {
    OperationType: {
      type: Number,
@@ -313,14 +314,14 @@
        HNumber: "",
        HName: "",
        HHelpCode: "",
        HDeptName: "",
        HDeptID: "0",
        HDeptName:sessionStorage["HSupName"],
        HCompID: sessionStorage["HSupID"],
        HDepNumber: "",
        HIDCard: "",
        HPhone: "",
        HDriverCardType: "A1",
        HEmpType: "固定",
        HStopflag: "0",
        HStopflag: 0,
        checkboxHStopflag: 0,
        HRemark: "",
        HUSEORGID: "",
@@ -399,14 +400,19 @@
        this.openData = false;
    },
    deptClickSub() {
      if (this.deptform && this.deptform.HItemID) {
      this.formData.HDeptName = this.deptform.部门名称;
      this.formData.HDeptID = this.deptform.HItemID;
      this.openData = false;
      this.deptShow = false;
    } else {
      this.$modal.msgWarning("请先选择一个部门");
    }
      // 直接从子组件获取当前选中的行数据
      const selectedRow = this.$refs.supplierRef?.rowForm;
      if (selectedRow && selectedRow.HItemID) {
        // 设置表单数据
        this.formData.HDeptName = selectedRow.供应商名称 || selectedRow.HName;
        this.formData.HCompID = selectedRow.HItemID;
        this.openData = false;
        this.deptShow = false;
        
        this.$modal.msgSuccess("已选择承运商：" + this.formData.HDeptName);
      } else {
        this.$modal.msgWarning("请先选择一个承运商");
      }
    },
    deptDialogVisible() {
      this.deptform = {};
@@ -438,6 +444,8 @@
        case 1: // 新增
          this.orgDisabled = true;
          this.formData.HItemID = "0";
          this.formData.HDeptName =sessionStorage["HSupName"];
          this.formData.HCompID = sessionStorage["HSupID"];
          break;
          
        case 2: // 复制
@@ -529,10 +537,10 @@
      
      if (data.禁用标识) {
        this.formData.checkboxHStopflag = 1;
        this.formData.HStopflag = "1";
        this.formData.HStopflag = 1;
      } else {
        this.formData.checkboxHStopflag = 0;
        this.formData.HStopflag = "0";
        this.formData.HStopflag = 0;
      }
    },
    
@@ -573,7 +581,7 @@
        const sMainStr = JSON.stringify(saveData);
        const res = await axios.post(`${this.$baseUrl}/Gy_Driver/AddBill1`, {
          oMain: `${sMainStr};${sessionStorage.getItem("HUserName")};${
            sessionStorage.getItem("OrganizationID") || 100038
            sessionStorage.getItem("OrganizationID")
          }`,
        });
        
@@ -631,14 +639,14 @@
    

    handleStopFlagChange(value) {
      this.formData.HStopflag = value ? "1" : "0";
      this.formData.HStopflag = value ? 1 : 0;
    },
    
  
    openDeptDialog() {
        this.deptShow = false;
       this.dialogTitle = "部门列表";
        this.deptShow = true;
        this.dialogTitle = "承运商列表";
        this.deptShow = false;
        this.openData = true;
    },