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

陈婷婷

8 天以前 e98c6cf658b332cd65676645301827ac03db832c

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

 .env.development

@@ -6,7 +6,7 @@

# 智云迈思L-MOM管理系统/开发环境
# VUE_APP_BASE_API = http://localhost:81/API/
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://localhost:8082/API/'
@@ -14,8 +14,8 @@
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 宁波 四维尔
# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
VUE_APP_BASE_API = http://220.189.218.155:9010/API/
#杜贺
# VUE_APP_BASE_API = http://localhost:8082/API/
# 内网地址测试

 .env.production

@@ -5,11 +5,11 @@
ENV = 'production'

# 宁波 四维尔
# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
VUE_APP_BASE_API = http://220.189.218.155:9010/API/
# 余姚 锦隆 智能家居
VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 智云迈思L-MOM管理系统/生产环境
# VUE_APP_BASE_API = http://47.96.97.237/API/
#杜贺

 RuoYi-Vue

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

 src/views/basic/gy/gySupplier.vue

@@ -360,8 +360,29 @@
  created() {
    this.getList()
    this.getTreeselect()
    console.log(this.treeOptions)
    if (this.openPage) {
      this.autoSelectCarrierTree()
    }
  },
  methods: {
    autoSelectCarrierTree() {
      setTimeout(() => {
        if (this.$refs.tree && this.treeOptions) {
          // 👇 这里换成你真实的【承运商分类ID】
          const carrierId = "1"

          // 自动选中节点
          this.$refs.tree.setCurrentKey(carrierId)

          // 自动触发节点点击，执行筛选
          let node = this.$refs.tree.getNode(carrierId)
          if (node) {
            this.handleNodeClick(node.data)
          }
        }
      }, 300)
    },
    getSummaries(param) {
      const { columns, data } = param;
      const sums = [];

 src/views/basic/gyCar/gyCarEdit.vue

@@ -440,6 +440,7 @@
      rules: {
        HNumber: [{ required: true, message: "车牌号不能为空", trigger: "blur" }],
        HName: [{ required: true, message: "车辆名称不能为空", trigger: "blur" }],
        HCarTypeName:[{required: true, message: "车型请选择", trigger: "blur"}],
      },
      preUploadFiles: {
        HCarPric: [], // 车辆照片 文件缓存(只保存一张)

 src/views/basic/gyCurrency/gyCurrency.vue

@@ -1177,12 +1177,17 @@
    //双击行
    handleDblclick(row, column, cell, event) {
      if (this.checkIsIframe()) {
        window.parent.iframeCarCallBack(row);
        window.parent.iframeCurrencyCallBack(row);
        return;
      }
      this.OperationType = 3;
      this.handleEdit(row, this.OperationType);
      if (this.openPage) {
        this.$emit('deptEmitDb', row, 2)
      } else {
        this.handleEdit();
      }
    },
    
    // 多选框选中数据
    handleSelectionChange(selection) {
      // this.rowForm = {}

 src/views/basic/gyCurrency/gyCurrencyEdit.vue

@@ -134,6 +134,18 @@
  },
  mounted() {
    this.user = sessionStorage["HUserName"] || "admin";
    this.fetchData();
    this.getdata();
    // 币别 回调
    window.iframeCurrencyCallBack = (info) => {
      // 回调赋值
      console.log(info);
      this.form.HCurID = info.HItemID;
      this.form.HCurName = info["货币名称"];
      this.form.HExRate = info["汇率"];
      // 关闭弹窗
      this.deptClose();
    };
  },
  methods: {
    // 检查是否在iframe中
@@ -147,6 +159,8 @@
      const hID = urlParams.HInterID ? parseInt(urlParams.HInterID) : 0;
      const opType = urlParams.OperationType ? parseInt(urlParams.OperationType) : 1;
      


      // 如果props没有传递，使用URL参数
      const operationType = this.OperationType || opType;
      const linterid = this.linterid || hID;

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

@@ -86,7 +86,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="结算方式" prop="HSSName" required>
              <el-form-item label="结算方式" prop="HSSName" >
                <el-input v-model="form.HSSName" placeholder="请选择结算方式" disabled>
                  <el-button
                    slot="append"
@@ -626,7 +626,7 @@
          HCurID: [{ required: true, message: "币别不能为空", trigger: "blur" }],
          HExRate: [{ required: true, message: "汇率不能为空", trigger: "blur" }],
          HSTOCKINORGID: [{ required: true, message: "组织不能为空", trigger: "change" }],
          HSSName: [{ required: true, message: "结算方式不能为空", trigger: "blur" }],
          // HSSName: [{ required: true, message: "结算方式不能为空", trigger: "blur" }],
      },
    };
  },
@@ -703,8 +703,8 @@
            this.form.HCurName = deptRow.货币名称;
            this.form.HCurID = deptRow.HItemID;
            this.form.HExRate = deptRow.汇率;
          this.CurrencyDialogShow = false;
          this.openData = false;
            this.CurrencyDialogShow = false;
            this.openData = false;
        } else if (num == 3) {
          console.log(deptRow);
          if(this.areaType==1)
@@ -1107,6 +1107,12 @@
    },
    // 编辑提交保存
    submitForm() {
      this.form.HSupID = this.form.HSupID || 0;
      this.form.HEmpID = this.form.HEmpID || 0;
      this.form.HDeptID = this.form.HDeptID || 0;
      this.form.HCurID = this.form.HCurID || 0;
      this.form.HExRate = this.form.HExRate || 1;
      this.form.HSSID = this.form.HSSID || 0;
      this.$refs["form"].validate((valid) => {
        if (valid) {
          let fhck = false;
@@ -1119,8 +1125,8 @@
          { field: 'HDeptID', name: '部门' },
          { field: 'HCurID', name: '币别' },
          { field: 'HExRate', name: '汇率' },
          { field: 'HSTOCKINORGID', name: '组织' },
          { field: 'HSSName', name: '结算方式' }
          { field: 'HSTOCKINORGID', name: '组织' }
          // { field: 'HSSName', name: '结算方式' }
        ];
          for (let i = 0; i < requiredFields.length; i++) {
            const field = requiredFields[i].field;

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

@@ -22,7 +22,7 @@
      <el-form-item label-width="78px">
        <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 搜 索</el-button>
        <el-button icon="el-icon-circle-close" @click="resetQuery">重 置</el-button>
        <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">重新同步</el-button>
        <!-- <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">重新同步</el-button> -->
      </el-form-item>
      <el-collapse v-model="activeSeach">
        <el-collapse-item title="更多" name="1">
@@ -163,8 +163,7 @@
          </el-table-column>
        </template>
      </el-table>
      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
        @pagination="getList" />
       <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>
@@ -258,7 +257,7 @@
      queryParams: {
        HBillNo: '',
        HBillno2: '',
        HInitTimeCycle: 29,
        HInitTimeCycle: 364,
        HDeptID: '',

        HSourceBillNo: '',
@@ -282,16 +281,17 @@
      multiple: true,
      // 遮罩层
      loading: true,
      loading: true,
      tyResList: [],//列表（接口数据）
      btList: [],//表头列表显示
      btResList: [],
      tableData: [],//列表(分页显示)
      dataList: [],
      titleData: [],//不需要显示的字段 可扩展
      pageSizes: [50, 100, 500, 5000, 50000],
      pageSizes: [ 10,50, 500, 5000, 50000],
      page: 1,
      pageSize: 0,
      total: 0,
      total: 0,  
    };
  },
  created() {
@@ -373,7 +373,6 @@
      this.eTime = yyyyE + '-' + mmE + '-' + ddE
    },
    getList() {
      this.pageSize = 50
      this.tableShow = false
      this.loading = true
      if (this.sTime && !this.sWhere) {
@@ -393,16 +392,19 @@
      if (this.pageSize == 0) {
        this.pageSize = 50
      }
      axios.get(this.$baseUrl + '/Cg_ContractTransportBillListController/get%EF%BB%BFList', {
      axios.get(this.$baseUrl + '/Cg_ContractTransportBillListController/page', {
        params: {
          "sWhere": this.sWhere,
          "user": sessionStorage["HUserName"],
          "Page":this.page,
          "size":this.pageSize,
          "Type":1117
        },
      }).then(response => {
        this.tyResList = response.data.data//总数据
        let data1 = response.data
        let option = []
        if (data1.code == 1) {
        if (data1.list && data1.list.length > 0) {
          this.btResList = data1.list//销售出库单接口表头数据
          this.total = data1.count;
          var data = [];//列字段数据
@@ -545,11 +547,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

 src/views/component/CurrencyDialog/index.vue

@@ -598,12 +598,14 @@
    handleDblclick(row, column, cell, event) {
      this.OperationType = 3
      if (this.openPage) {
        if(this.openPage='Kf_StockOutRequestBill')
      {
        this.$emit('deptEmitDb', row, 10)
      }
      else
        this.$emit('deptEmitDb', row, 2)
        if(this.openPage == 'Kf_StockOutRequestBill'){
          this.$emit('deptEmitDb', row, 10)
          this.closeDialog();
        }
        else{
          this.$emit('deptEmitDb', row, 2)
          this.closeDialog();
        }
      } else {
        this.handleEdit();
      }

 src/views/login.vue

@@ -210,6 +210,7 @@
            this.$router.push({ path: this.redirect || "/" }).catch(() => { })
          }).catch(() => {
            this.loading = false
            this.$message.error('账号或密码错误，请重新输入')
            if (this.captchaEnabled) {
              this.getCode()
            }

 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue

@@ -46,16 +46,6 @@
                                        </el-input>
                                    </el-form-item>
                                </el-col> -->
                                <el-col :span="6">
                                    <el-form-item label="币别" prop="HCurName">
                                        <el-input v-model="form.HCurName" placeholder="请输入币别" />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="6">
                                    <el-form-item label="汇率" prop="HExRate">
                                        <el-input v-model="form.HExRate" placeholder="请输入汇率" readonly />
                                    </el-form-item>
                                </el-col>
                            </el-row>
                        </div>

@@ -243,6 +233,16 @@
                                <el-col :span="6">
                                    <el-form-item label="运费" prop="HMoney">
                                        <el-input v-model="form.HMoney" placeholder="请输入运费" />
                                    </el-form-item>
                                </el-col>
                                  <el-col :span="6">
                                    <el-form-item label="币别" prop="HCurName">
                                        <el-input v-model="form.HCurName" placeholder="请输入币别" />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="6">
                                    <el-form-item label="汇率" prop="HExRate">
                                        <el-input v-model="form.HExRate" placeholder="请输入汇率" readonly />
                                    </el-form-item>
                                </el-col>
                            </el-row>
@@ -434,7 +434,7 @@
                            @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
                            <el-table-column type="selection" width="55" align="center" />
                            <el-table-column align="center" label="序号" type="index" width="80" />
                            <el-table-column align="center" label="源单单据号" width="120">
                            <el-table-column align="center" label="发货通知单" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HSourceBillNo }}</span>
                                </template>
@@ -456,21 +456,19 @@
                            <el-table-column align="center" label="物料名称" width="120">
                                <template slot-scope="scope">{{ scope.row.HMaterName }} </template>
                            </el-table-column>
                            <el-table-column align="center" label="容器代码" width="120">
                            <el-table-column align="center" label="物料规格" width="120">
                                <template slot-scope="scope">{{ scope.row.HModel }} </template>
                            </el-table-column>
                            <el-table-column v-if="false"  align="center" label="容器代码" width="120">
                                <template slot-scope="scope">
                                    <el-input v-model="scope.row.HMouldNumber" placeholder="请输入器具代码"
                                        @keyup.native.f7="openDataDialog(17, scope.row)"
                                        @dblclick.native="openDataDialog(17, scope.row)" />
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="容器名称" width="120">
                            <el-table-column v-if="false" align="center" label="容器名称" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HMouldName }}</span>
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="容器数量/托" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
                                </template>
                            </el-table-column>

@@ -481,25 +479,30 @@
                                        @change="checkTotalQtyExceed(scope.row)"></el-input-number>
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="标准包装数量" width="120">
                            <el-table-column v-if="false" align="center" label="标准包装数量" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HSNP }}</span>
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="包装容器数量" width="120">
                            <el-table-column v-if="false" align="center" label="包装容器数量" width="170">
                                <template slot-scope="scope">
                                    <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
                                    <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 150px;"
                                        controls-position="right"
                                        @change="changeHMouldQty(scope.row)"></el-input-number>
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="托数" width="120">
                             <el-table-column v-if="false" align="center" label="容器数量/托" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
                                </template>
                            </el-table-column>
                            <el-table-column v-if="false" align="center" label="托数" width="120">
                                <template slot-scope="scope"> <!--HPackQTY=HMouldQty/HStandardQtyForMouldInPack -->
                                    <el-input-number v-model="scope.row.HPackQTY" :min="0" style="width: 90px;"
                                        controls-position="right" @change="changeHPackQty(scope.row)"></el-input-number>
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="托单位体积" width="120">
                            <el-table-column v-if="false" align="center" label="托单位体积" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HPackV }}</span>
                                </template>
@@ -516,22 +519,22 @@
                                        controls-position="right"></el-input-number> -->
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="容器长度" width="120">
                            <el-table-column  v-if="false" align="center" label="容器长度" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HMouldLength }}</span>
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="容器宽度" width="120">
                            <el-table-column v-if="false" align="center" label="容器宽度" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HMouldWidth }}</span>
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="容器高度" width="120">
                            <el-table-column  v-if="false" align="center" label="容器高度" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HMouldHeight }}</span>
                                </template>
                            </el-table-column>
                            <el-table-column align="center" label="折叠高度" width="120">
                            <el-table-column v-if="false" align="center" label="折叠高度" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HMouldFoldHeight }}</span>
                                </template>
@@ -658,17 +661,17 @@
                HCusName: [
                    { required: true, message: "客户不能为空", trigger: "blur" }
                ],
                HBeginAddrName: [
                    { required: true, message: "始发地不能为空", trigger: "blur" }
                ],
                HEndAddrName: [
                    { required: true, message: "目的地不能为空", trigger: "blur" }
                HCarTypeName:[
                    { required: true, message: "车型不能为空", trigger: "blur" }
                ],
                HDate: [
                    { required: true, message: "日期不能为空", trigger: "blur" }
                ],
                HExRate: [
                    { required: true, message: "汇率不能为空", trigger: "blur" }
                ],
                HCarrierName: [
                    { required: true, message: "承运合同不能为空", trigger: "blur" }
                ]
            },

@@ -946,7 +949,10 @@
                                "HQty": result.data[i].物料数量,
                                "HQty_origin": result.data[i].HQty,
                                "HVolume": rowVolume,
                                "HScatteredVolume": result.data[i].零单占用体积
                                "HScatteredVolume": result.data[i].零单占用体积,
                                "HStandardQtyForMouldInPack":result.data[i].HStandardQtyForMouldInPack,
                                "HPackV":result.data[i].HPackV,
                                "HPackQTY":result.data[i].HPackQTY,
                            }
                        )
                    }
@@ -1371,6 +1377,7 @@
                            "HMouldWidth": res[j].宽度,
                            "HMouldHeight": res[j].高度,
                            "HMouldFoldHeight": res[j].折叠高度,
                            "HModel":res[j].物料规格,
                            "HQty": res[j].物料数量,
                            "HQty_origin": orginHQTY,
                            "HMouldQty": mouldQty,
@@ -1433,6 +1440,7 @@
        submitForm() {
            this.$refs["form"].validate(valid => {
                if (valid) {
                    this.form.HCarryStatus = 0;
                    var loadingRate = this.form.HLoadingRate;
                    if (loadingRate && typeof loadingRate === 'string') {
                        this.form.HLoadingRate = parseFloat(loadingRate.replace('%', '')) / 100;

 src/views/logistics/transportGPS/WL_YayBill.vue

@@ -24,6 +24,17 @@
                <el-input v-model="queryParams.HPlateNumber" placeholder="请输入车牌号" @keyup.enter.native="handleQuery"
                    style="width: 120px;" />
            </el-form-item>
            <el-form-item label="发货通知单" prop="HSourceBillNo">
                <el-input v-model="queryParams.HSourceBillNo" placeholder="请输入发货通知单" @keyup.enter.native="handleQuery"
                    style="width: 120px;" />
            </el-form-item>
            <el-form-item label="物流状态" prop="HBillStatus">
                <el-select v-model="queryParams.HBillStatus" placeholder="请选择物流状态">
                    <el-option v-for="(item, index) in HBillStatusList" :key="index" :label="item.Name"
                        :value="item.Name">
                    </el-option>
                </el-select>
            </el-form-item>

            <el-form-item label="组织" prop="HOrgID">
                <el-select v-model="queryParams.HOrgID" placeholder="请选择组织">
@@ -256,8 +267,9 @@
                </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"
                @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" />
@@ -432,7 +444,17 @@
            copyType: 0,                                          //复制标记。打开编辑组件时，用于区分编辑还是复制
            HInterID: null,
            hPriceTypeList: ['成本价', '结算价'],

            HBillStatusList:[
                {ID: 1, Name: "申请中" },
                {ID: 2, Name: "待供应商确认" },
                {ID: 3, Name: "指定驾驶员、车辆中" },
                {ID: 4, Name: "正在前往始发地" },
                {ID: 5, Name: "提货中" },  
                {ID: 6, Name: "准备离厂" },  
                {ID: 7, Name: "送货中" },                  
                {ID: 8, Name: "已签收" },  
                {ID: 9, Name: "已核算" },  
            ],
            rqsgList: [                                           //日期间隔下拉列表数据
                { label: '今天', value: 0 },
                { label: '近两天', value: 1 },
@@ -519,6 +541,8 @@
                HBillNo: '',
                HPlateNumber: '',
                HInitTimeCycle: 29,
                HSourceBillNo:'',
                HBillStatus:'',
                sTime: '',
                eTime: '',
                HOrgID: sessionStorage["OrganizationID"] - 0,
@@ -535,6 +559,14 @@
                ColContent2: '',
                ColContent: '',
            },
            loading: true,
            tyResList: [],//列表（接口数据）
            btList: [],//表头列表显示
            btResList: [],
            tableData: [],//列表(分页显示)
            dataList: [],
            titleData: [],//不需要显示的字段 可扩展
            pageSizes: [ 50,100, 500, 5000, 50000],
            page: 1,                                                      //page页索引
            pageSize: 0,                                                  //page页面记录数
            total: 0,                                                     //记录合计数
@@ -749,6 +781,12 @@
            if (this.queryParams.HPlateNumber) {
                this.sWhere += " and 车牌号 like '%" + this.queryParams.HPlateNumber + "%'";
            }
            if (this.queryParams.HSourceBillNo) {
                this.sWhere += " and 发货通知单号 like '%" + this.queryParams.HSourceBillNo + "%'";
            }
            if (this.queryParams.HBillStatus) {
                this.sWhere += " and 物流状态 like '%" + this.queryParams.HBillStatus + "%'";
            }

            // if (this.queryParams.HOrgID) {
            //     this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
@@ -761,7 +799,7 @@

        //#region 查询
        getList() {
            this.pageSize = 50
            
            if (this.pageSize == 0) {
                this.pageSize = 50
            }
@@ -769,18 +807,19 @@
            this.loading = true
            console.log("swhere", this.sWhere)
            // 列表查询
            axios.get(this.$baseUrl + '/WLYayBillController/GetListPage', {
            axios.get(this.$baseUrl + '/WLYayBillController/page', {
                params: {
                    "sWhere": this.sWhere,
                    "user": sessionStorage["HUserName"],
                    "page": this.page,
                    "size": this.pageSize
                    "size": this.pageSize,
                    "Type":3321
                },
            }).then(response => {
                this.tyResList = response.data.data//总数据
                let data1 = response.data
                let option = []
                if (data1.code == 1) {
                if (data1.list && data1.list.length > 0) {
                    this.btResList = data1.list             //列表表头数据
                    this.total = data1.count;
                    var data = [];//列字段数据
@@ -1231,11 +1270,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

 src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue

@@ -168,13 +168,12 @@
                      @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">

 src/views/sell/XsSeOutStockBill.vue

@@ -696,7 +696,7 @@
      if (this.pageSize == 0) {
        this.pageSize = 50;
      }
      if (this.openPage && this.propsHOrgID) {
      if (this.openPage && this.propsHOrgID && this.queryParams.HOrgID == "" ) {
        this.queryParams.HOrgID = this.propsHOrgID
      }
      // this.queryParams.HOrgID = 100038