MES-WEB-VUEUI.git

			@@ -15,6 +15,8 @@
			type="date"
			placeholder="开始日期"
			style="width: 150px"
			:disabled="queryParams.HInitTimeCycle != -1"
			value-format="yyyy-MM-dd"
			>
			</el-date-picker>
			</el-form-item>
			@@ -24,6 +26,8 @@
			type="date"
			placeholder="结束日期"
			style="width: 150px"
			:disabled="queryParams.HInitTimeCycle != -1"
			value-format="yyyy-MM-dd"
			>
			</el-date-picker>
			</el-form-item>
			@@ -613,11 +617,9 @@
			import axios from "axios";
			import RowSettings from "@/views/component/rowSettings";
			import dayjs from "dayjs";
			import { computed } from "vue";
			import { watch } from "vue";

			export default {
			name: "GySource",
			name: "xsSeOrderBill",
			components: { RowSettings },
			props: {
			openPage: { type: String },
			@@ -626,7 +628,7 @@
			return {
			iframeUrl: "",
			activeSeach: "",
			HModName: "Cg_POOrderBillList",
			HModName: "xsSeOrderBill",
			editShow: false,
			openEdit: false,
			totalNameList: [],
			@@ -635,7 +637,7 @@
			openPrintList: false,
			printListShow: false,
			HClassTag: "ForFilteringSchemes", //过滤条件的class类
			HBillType: "1202",
			HBillType: "1401",
			openBtnHide: false,
			btnHideShow: false,
			rowHideShow: false,
			@@ -667,6 +669,7 @@
			{ label: "近30天", value: 29 },
			{ label: "近半年", value: 180 },
			{ label: "近一年", value: 365 },
			{ label: "任意日期", value: -1 },
			],
			hPriceTypeList: ["成本价", "结算价"],
			addBtnShow: false,
			@@ -685,7 +688,6 @@
			OperationType: null, //保存类型（新增1修改3）
			HInterID: null,
			baseURL: process.env.VUE_APP_BASE_API \|\| "http://47.96.97.237/API/",
			user: "admin",
			currentRow: [],
			lastSelectedRowIndex: null, // 用于记录上次点击的行索引
			lastSelectedRow: null, // 上一次选中的行
			@@ -869,6 +871,10 @@
			this.getList();
			},
			riqiChange() {
			if (this.queryParams.HInitTimeCycle == -1) {
			// 随意日期不计算
			return;
			}
			const end = new Date();
			const start = new Date();
			start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
			@@ -919,35 +925,6 @@
			this.dbEmitData(this.deptform, this.dialogTypeNum);
			this.deptform = {};
			},
			fetchData() {
			//登录用户信息
			axios
			.get(
			"http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
			)
			.then((res) => {
			let data = res.data.data[0];
			this.zuzhiId = data.HUSEORGID; //根据登录用户获取默认的组织ID
			this.queryParams.HOrgID = data.HUSEORGID;
			this.user = data.Czymc;
			axios
			.get(this.baseURL + "/Web/GetOrganizations", {})
			.then((res) => {
			if (res.data.count == 1) {
			this.organizationList = res.data.data; //组织列表
			}

			this.handleQuery();
			// this.getList();
			})
			.catch((error) => {
			this.$modal.msgError("接口请求失败!");
			});
			})
			.catch((error) => {
			this.$modal.msgError("接口请求失败!");
			});
			},
			async getList() {
			this.tableShow = false;
			this.loading = true;
			@@ -965,7 +942,7 @@
			let res = await axios.get(this.baseURL + "Xs_SeOrderBill/list_ByPage", {
			params: {
			sWhere: this.sWhere,
			user: this.user,
			user: sessionStorage["HUserName"],
			Organization: sessionStorage["Organization"],
			page: this.page,
			size: this.pageSize,
			@@ -1054,7 +1031,12 @@
			}
			}
			option.data = result;
			this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
			this.DisPlay_HideColumn(
			this.HModName,
			sessionStorage["HUserName"],
			option,
			this.dataList
			);
			}
			} catch (err) {
			this.$modal.msgError(`获取收料通知单错误: ${err}`);
			@@ -1354,7 +1336,7 @@
			.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
			params: {
			HModName: this.HModName,
			user: this.user,
			user: sessionStorage["HUserName"],
			HOrgID: this.zuzhiId,
			},
			})
			@@ -1442,7 +1424,7 @@
			HQty: this.rowForm.HQty,
			HSourceInterID: this.rowForm.HSourceInterID,
			HSourceEntryID: this.rowForm.HSourceEntryID,
			user: this.user,
			user: sessionStorage["HUserName"],
			},
			})
			.then((res) => {
			@@ -1468,7 +1450,11 @@
			//逻辑审核方法
			axios
			.get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
			params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
			params: {
			HInterID: InterID,
			IsAudit: num,
			CurUserName: sessionStorage["HUserName"],
			},
			})
			.then((res) => {
			let result = res.data;
			@@ -1493,7 +1479,7 @@
			params: {
			HInterID: HInterID,
			Type: num,
			user: this.user,
			user: sessionStorage["HUserName"],
			},
			}
			);
			@@ -1521,7 +1507,7 @@
			HInterID: HInterID,
			HEntryID: HEntryID,
			ISAudit: num,
			CurUserName: this.user,
			CurUserName: sessionStorage["HUserName"],
			},
			}
			);
			@@ -1547,7 +1533,7 @@
			params: {
			HInterID: HInterID,
			Type: num,
			user: this.user,
			user: sessionStorage["HUserName"],
			},
			}
			);
			@@ -1569,7 +1555,11 @@
			//逻辑审核方法
			axios
			.get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
			params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
			params: {
			HInterID: InterID,
			IsStop: num,
			CurUserName: sessionStorage["HUserName"],
			},
			})
			.then((res) => {
			let result = res.data;
			@@ -1635,7 +1625,7 @@
			}
			}
			var sSubStr = JSON.stringify(num);
			var sMainSub = sSubStr + "&和" + this.user;
			var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
			axios({
			method: "post",
			url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",