MES-WEB-VUEUI.git

			@@ -56,9 +56,9 @@
			</el-option>
			</el-select>
			</el-form-item>
			<el-form-item label="单据号" prop="HMaterNumber">
			<el-form-item label="单据号" prop="HBillNo">
			<el-input
			v-model="queryParams.HMaterNumber"
			v-model="queryParams.HBillNo"
			placeholder="请输入物料编码"
			@keyup.enter.native="handleQuery"
			/>
			@@ -376,7 +376,7 @@
			icon="el-icon-delete"
			size="mini"
			:disabled="single"
			@click="handleDelete((row = rowForm))"
			@click="handleDelete"
			>删除
			</el-button>
			</el-col>
			@@ -597,7 +597,7 @@
			</el-dialog>
			<!-- 编辑 -->
			<el-dialog
			title="编辑职员"
			title="编辑生产订单"
			:visible.sync="openEdit"
			width="1480px"
			append-to-body
			@@ -833,7 +833,14 @@
			btResList: [],
			tableData: [], //收料通知单列表(分页显示)
			dataList: [],
			titleData: ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID"], //不需要显示的字段可扩展
			titleData: [
			"HItemID",
			"hmainid",
			"Hprocid",
			"HUSEORGID",
			"HCREATEORGID",
			"HParentID",
			], //不需要显示的字段可扩展
			pageSizes: [50, 100, 500, 5000, 50000],
			page: 1,
			pageSize: 50,
			@@ -872,8 +879,7 @@
			},
			mounted() {},
			created() {
			// this.form.Organization = sessionStorage["Organization"];
			this.queryParams.HOrgID = sessionStorage["OrganizationID"];
			this.form.Organization = sessionStorage["Organization"];
			this.riqiChange();
			this.get_HProjectList();
			this.get_HDeptNameList();
			@@ -1031,13 +1037,42 @@
			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;
			if (this.pageSize == 0) {
			this.pageSize = 50;
			}
			// this.queryParams.HOrgID = sessionStorage["OrganizationID"];
			this.queryParams.HOrgID = sessionStorage["OrganizationID"];

			if (this.dateRange.length > 0) {
			this.sWhere +=
			@@ -1052,15 +1087,18 @@
			console.log(Organization);

			try {
			let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
			params: {
			sWhere: this.sWhere,
			user: this.user,
			Organization: Organization,
			page: this.page,
			size: this.pageSize,
			},
			});
			let res = await axios.get(
			this.baseURL + "/LEMS/MES_IF_ICMOBillList_Json_byPage",
			{
			params: {
			sWhere: this.sWhere,
			user: this.user,
			Organization: Organization,
			page: this.page,
			size: this.pageSize,
			},
			}
			);
			this.tyResList = [...JSON.parse(JSON.stringify(res.data.data))]; //总数据
			let data1 = res.data;
			let option = [];
			@@ -1304,7 +1342,7 @@
			},
			//选中行高亮样式
			rowStyle({ row, rowIndex }) {
			if (this.ids.includes(row.HItemID)) {
			if (this.ids.includes(row.hmainid)) {
			return { background: "#ecf5ff" };
			}
			},
			@@ -1316,7 +1354,7 @@
			// 多选框选中数据
			handleSelectionChange(selection) {
			// this.rowForm = {}
			this.ids = selection.map((item) => item.HItemID);
			this.ids = selection.map((item) => item.hmainid);
			this.single = selection.length != 1;
			this.multiple = !selection.length;
			if (!this.single) {
			@@ -1520,14 +1558,13 @@
			(this.multiple = true), this.getList();
			},
			/** 删除按钮操作 */
			handleDelete(row) {
			console.log(row);
			handleDelete() {
			this.$modal
			.confirm("确认要删除吗，删除后不能恢复")
			.then(() => {
			if (!this.rowForm.审核人) {
			axios
			.get(this.baseURL + "/Sc_ICMOBill/DeltetSc_ICMOReportBill", {
			.get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
			params: {
			HInter: this.rowForm.hmainid.toString(),
			HsupId: this.rowForm.HsupId,