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

chenhaozhe

2025-12-02 e07116c09aa92f1691474831ebb34fa85828e9e1

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

 src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue

@@ -72,14 +72,14 @@
                                    <el-col :span="6">
                                        <el-form-item label="过滤">
                                            <el-select v-model="query.ColName" style="width:190px">
                                                <el-option value="0" label=""></el-option>
                                                <!-- <el-option value="0" label=""></el-option> -->
                                                <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
                                            </el-select>
                                        </el-form-item>
                                    </el-col>
                                    <el-col :span="6">
                                        <el-select v-model="query.Comparator" style="width:190px">
                                            <el-option value="0" label=""></el-option>
                                            <!-- <el-option value="0" label=""></el-option> -->
                                            <el-option value="=" label="=" />
                                            <el-option value=">=" label=">=" />
                                            <el-option value=">" label=">" />
@@ -108,7 +108,7 @@
                                    </el-col>
                                    <el-col :span="6">
                                        <el-select v-model="query.Comparator1" style="width:190px">
                                            <el-option value="0" label=""></el-option>
                                            <!-- <el-option value="0" label=""></el-option> -->
                                            <el-option value="=" label="=" />
                                            <el-option value=">=" label=">=" />
                                            <el-option value=">" label=">" />
@@ -137,7 +137,7 @@
                                    </el-col>
                                    <el-col :span="6">
                                        <el-select v-model="query.Comparator2" style="width:190px">
                                            <el-option value="0" label=""></el-option>
                                            <!-- <el-option value="0" label=""></el-option> -->
                                            <el-option value="=" label="=" />
                                            <el-option value=">=" label=">=" />
                                            <el-option value=">" label=">" />
@@ -249,14 +249,14 @@
                HSourceBillNo: '',
                Warehouse: '',
                Hmaker: '',
                ColName: '0',
                Comparator: '0',
                ColName: '',
                Comparator: '',
                ColContent: '',
                ColName1: '0',
                Comparator1: '0',
                ColName1: '',
                Comparator1: '',
                ColContent1: '',
                ColName2: '0',
                Comparator2: '0',
                ColName2: '',
                Comparator2: '',
                ColContent2: ''
            },
            timeCycles: [

 src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue

@@ -72,7 +72,7 @@
                                    <el-col :span="6">
                                        <el-form-item label="过滤">
                                            <el-select v-model="query.ColName" style="width:190px">
                                                <el-option value="0" label=""></el-option>
                                                <!-- <el-option value="0" label=""></el-option> -->
                                                <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
                                            </el-select>
                                        </el-form-item>
@@ -101,7 +101,7 @@
                                    <el-col :span="6">
                                        <el-form-item label="过滤1">
                                            <el-select v-model="query.ColName1" style="width:190px">
                                                <el-option value="0" label=""></el-option>
                                                <!-- <el-option value="0" label=""></el-option> -->
                                                <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
                                            </el-select>
                                        </el-form-item>
@@ -130,7 +130,7 @@
                                    <el-col :span="6">
                                        <el-form-item label="过滤2">
                                            <el-select v-model="query.ColName2" style="width:190px">
                                                <el-option value="0" label=""></el-option>
                                                <!-- <el-option value="0" label=""></el-option> -->
                                                <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
                                            </el-select>
                                        </el-form-item>
@@ -246,14 +246,14 @@
                HSourceBillNo: '',
                Warehouse: '',
                Hmaker: '',
                ColName: '0',
                Comparator: '0',
                ColName: '',
                Comparator: '',
                ColContent: '',
                ColName1: '0',
                Comparator1: '0',
                ColName1: '',
                Comparator1: '',
                ColContent1: '',
                ColName2: '0',
                Comparator2: '0',
                ColName2: '',
                Comparator2: '',
                ColContent2: ''
            },
            timeCycles: [

 src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue

@@ -14,7 +14,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="单据编号" prop="HBillNo">
                <el-input v-model="form.HBillNo" placeholder="请输入单据编号" disabled="true" />
                <el-input v-model="form.HBillNo" placeholder="请输入单据编号" :disabled="true" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -287,8 +287,8 @@
        </el-table-column>
        <el-table-column align="center" label="发料仓位" width="120">
          <template slot-scope="scope">
            <el-input v-model="scope.row.收料仓位" placeholder="请输入发料仓位" @keyup.native.f7="openDataDialog(2, scope.row)"
              @dblclick.native="openDataDialog(2, scope.row)" />
            <el-input v-model="scope.row.收料仓位" placeholder="请输入发料仓位" @keyup.native.f7="openDataDialog(4, scope.row)"
              @dblclick.native="openDataDialog(4, scope.row)" />
          </template>
        </el-table-column>
        <el-table-column align="center" label="批次" width="120">
@@ -417,6 +417,7 @@
      activeName: 'first',
      zbIndex: null,
      zbSelForm: {},                                                             //子表选中数据,用于子表复制、上移、下移等操作
      zbRow: null,
    };
  },
  created() {
@@ -432,7 +433,7 @@
    getdata() {
      this.formShow = false
      this.formLoading = true

      console.log(this.OperationType,this.copyType)
      if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
        this.handleAdd()
      } 
@@ -637,7 +638,10 @@
    //#region 打开数据列表弹窗
    openDataDialog(num, row) {
      if (row) {
        this.zbIndex = row.index - 1

        const idx = this.editData.indexOf(row);
        this.zbIndex = idx >= 0 ? idx : null;
        this.zbRow = row;
      }
      this.showReset()
      if (num == 1) {
@@ -677,13 +681,23 @@
        this.openData = false
      } 
      else if (num == 2) {                                                      //收料仓库
        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
        this.editData[this.zbIndex].收料仓库 = deptRow.仓库名称;

        if (this.zbIndex == null || this.zbIndex < 0 || !this.editData[this.zbIndex]) {
          this.$modal.msgError('请选择要编辑的明细行后再选择仓库');
          this.openData = false;
          return;
        }
 
        this.$set(this.editData[this.zbIndex], 'HWHID', deptRow.HItemID);
        this.$set(this.editData[this.zbIndex], '收料仓库', deptRow.仓库名称);

        this.openData = false
      }
      else if (num == 4) {                                                      //仓位
        this.editData[this.zbIndex].HSPID = deptRow.HItemID;
        this.editData[this.zbIndex].仓位名称 = deptRow.仓位名称;
      else if (num == 4) {        
        this.$set(this.editData[this.zbIndex], 'HSPID', deptRow.HItemID);
        this.$set(this.editData[this.zbIndex], '发料仓位', deptRow.仓位名称);                                              //仓位
        // this.editData[this.zbIndex].HSPID = deptRow.HItemID;
        // this.editData[this.zbIndex].仓位名称 = deptRow.仓位名称;
        this.openData = false
      }
      else if (num == 3) {                                                      //物料
@@ -803,8 +817,9 @@

    //#region 子表操作
    //#region 设置子表序号列
    rowSysZbIndex({ row, rowIndex }) {
    rowSysZbIndex( row, rowIndex ) {
      row.index = rowIndex + 1;
      return '';
    },
    //#endregion

@@ -837,13 +852,20 @@
          HCostPrice: 0,
          HCostMoney: 0,
          HSalePrice: 0,
          HSeOrderInterID: 741,
          HSeOrderEntryID: 18,
          HSeOrderBillNo: 'XSFH00000747',
          HSourceInterID: 741,
          HSourceEntryID: 18,
          HSourceBillNo: 'XSFH00000747',
          HSourceBillType: 1402,
          // HSeOrderInterID: 741,
          // HSeOrderEntryID: 18,
          HSeOrderInterID: '',
          HSeOrderEntryID: '',
          //HSeOrderBillNo: 'XSFH00000747',
          HSeOrderBillNo: '',
          // HSourceInterID: 741,
          // HSourceEntryID: 18,
          // HSourceBillNo: 'XSFH00000747',
          HSourceInterID: '',
          HSourceEntryID: '',
          HSourceBillNo: '',
          //HSourceBillType: '1402',
          HSourceBillType: '',
          HRelationQty: 0,
          HRelationMoney: 0,
          HSPID: 0,
@@ -943,7 +965,8 @@
    handleTableZbEdit(selection) {
      this.checkedSysZb = selection.map(item => item.index)
      this.zbSelForm = selection[0]
      this.zbIndex = this.checkedSysZb[0]

      this.zbIndex = selection.length ? this.editData.indexOf(selection[0]) : null
      if (selection.length > 1) {
        const del_row = selection.shift()
        this.$refs.zbTable.toggleRowSelection(del_row, false) //设置这一行取消选中

 src/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue

@@ -374,7 +374,7 @@
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
      });
      this.queryParams.HOrgID = sessionStorage["OrganizationID"];
      this.queryParams.HOrgID = sessionStorage["Organization"];
    },
    //#endregion

@@ -475,9 +475,9 @@
      if (this.queryParams.HBillNo) {
        this.sWhere += " and 单据号 like '%" + this.queryParams.HBillNo + "%'";
      }
      
      if (this.queryParams.HOrgID) {
        this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
      //this.queryParams.HOrgID
      if (sessionStorage["OrganizationID"] != "0") {
        this.sWhere += " and HOrgID = '" + sessionStorage["OrganizationID"] + "'";
      }
      this.getList()
    },

 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue

@@ -9,15 +9,27 @@
      class="searchBox"
    >
      <el-row>
        <el-form-item label="日期" style="margin-left: 100px">
        <el-form-item label="开始日期" style="margin-left: 100px">
          <el-date-picker
            v-model="dateRange"
            v-model="queryParams.HBeginDate"
            type="date"
            value-format="yyyy-MM-dd"
            type="daterange"
            range-separator="-"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
          ></el-date-picker>
            format="yyyy-MM-dd"
            placeholder="开始日期"
            style="width:160px"
            :disabled="disableDataPicker"
          />
        </el-form-item>
        <el-form-item label="结束日期">
          <el-date-picker
            v-model="queryParams.HEndDate"
            type="date"
            value-format="yyyy-MM-dd"
            format="yyyy-MM-dd"
            placeholder="结束日期"
            style="width:160px"
            :disabled="disableDataPicker"
          />
        </el-form-item>
        <el-form-item label="日期间隔">
          <el-select
@@ -696,8 +708,8 @@
        ColContent2: "",
        ColContent: "",
        HInitTimeCycle: 29,
        HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
        HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
        HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DD"),
        HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
      },
      // 显示搜索条件
      showSearch: true,
@@ -854,15 +866,11 @@
      const start = dayjs(new Date())
        .subtract(this.queryParams.HInitTimeCycle, "d")
        .format("YYYY-MM-DD");
      // start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
      // const yyyyS = start.getFullYear();
      // const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 月份是从0开始的
      // const ddS = String(start.getDate()).padStart(2, "0");
      // const yyyyE = end.getFullYear();
      // const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 月份是从0开始的
      // const ddE = String(end.getDate()).padStart(2, "0");
      this.sTime = start;
      this.eTime = end;
      
      this.queryParams.HBeginDate = start;
      this.queryParams.HEndDate = end;
      this.dateRange = [this.sTime, this.eTime];
    },
    organizationChange(val) {
@@ -917,11 +925,11 @@
      // this.sWhere += ` and CONVERT(varchar(100),日期, 23) >= '2020-01-01' and CONVERT(varchar(100),日期, 23) <= '2030-01-01'`;
      // 收料通知单列表

      if (this.dateRange.length > 0) {
      if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
        this.sWhere +=
          " and CONVERT(varchar(100),日期, 23) >= '" + this.dateRange[0] + "'";
          " and CONVERT(varchar(100),日期, 23) >= '" + this.queryParams.HBeginDate + "'";
        this.sWhere +=
          " and CONVERT(varchar(100),日期, 23) <= '" + this.dateRange[1] + "'";
          " and CONVERT(varchar(100),日期, 23) <= '" + this.queryParams.HEndDate + "'";
      }

      try {
@@ -1178,7 +1186,7 @@
    //选中行高亮样式
    rowStyle({ row, rowIndex }) {
      if (this.ids.includes(row.HItemID)) {
        return { background: "#ecf5ff" };
        return { };
      }
    },
    //双击行