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

duhe

2 天以前 2bb55a40bf0121078595aa84cb8a397916df80a6

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/views/basic/gyCar/gyCarList.vue

@@ -1111,9 +1111,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/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/system/user/GyDriver.vue

@@ -437,7 +437,7 @@
        );
        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;
        }
@@ -628,9 +628,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") {