From 7fb0a8f0ab16c149484bf043754cd10cfa94de2f Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 19 一月 2026 14:48:05 +0800
Subject: [PATCH] 增加了业务员，保管员和验收员的对应的显示
---
src/views/basic/gy/gyDepartmentEdit.vue | 374 +++++++++++++++++------------------------------------
1 files changed, 120 insertions(+), 254 deletions(-)
diff --git a/src/views/basic/gy/gyDepartmentEdit.vue b/src/views/basic/gy/gyDepartmentEdit.vue
index cc6803e..62ec808 100644
--- a/src/views/basic/gy/gyDepartmentEdit.vue
+++ b/src/views/basic/gy/gyDepartmentEdit.vue
@@ -1,15 +1,8 @@
<template>
<div v-loading="formLoading" v-if="formShow">
<div style="margin-bottom: 10px; border-bottom: 1px solid #f6f6f6">
- <el-button type="primary" @click="submitForm" :disabled="subDisabled"
- >淇� 瀛�</el-button
- >
- <el-button
- type="primary"
- @click="set_CheckBill(0, form)"
- :disabled="CheckBillDisabled"
- >瀹� 鏍�</el-button
- >
+ <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+ <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="CheckBillDisabled">瀹� 鏍�</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
</div>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
@@ -17,12 +10,12 @@
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="8">
- <el-form-item label="浠撳簱浠ｇ爜" prop="HNumber">
+ <el-form-item label="閮ㄩ棬浠ｇ爜" prop="HNumber">
<el-input v-model="form.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="浠撳簱鍚嶇О" prop="HName">
+ <el-form-item label="閮ㄩ棬鍚嶇О" prop="HName">
<el-input v-model="form.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" />
</el-form-item>
</el-col>
@@ -34,84 +27,52 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="浠撳簱鍦板潃" prop="HAddress">
- <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ヤ粨搴撳湴鍧�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="HPhone">
- <el-input v-model="form.HPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="浠撳簱绫诲瀷" prop="HWarehouseType">
- <el-select v-model="form.HWarehouseType" placeholder="璇烽�夋嫨浠撳簱绫诲瀷">
- <el-option
- v-for="(item, index) in HWarehouseTypeList"
- :key="index"
- :label="item.Name"
- :value="item.Name"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="8">
<el-form-item label="绂佺敤鏍囧織" prop="HStopflag">
<el-checkbox v-model="form.HStopflag" disabled>鏄惁绂佺敤</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鍚敤浠撲綅" prop="HSPFlag">
- <el-checkbox v-model="form.HSPFlag">鏄惁鍚敤</el-checkbox>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="璐熷簱瀛樻帶鍒舵爣璁�" prop="HStockCtrlFlag">
- <el-checkbox v-model="form.HStockCtrlFlag">鏄惁鍚敤</el-checkbox>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="8">
<el-form-item label="缁勭粐" prop="HUSEORGID">
- <el-select
- v-model="form.HUSEORGID"
- placeholder="璇烽�夋嫨缁勭粐"
- :disabled="zzSelDis"
- >
- <el-option
- v-for="(item, index) in organizationList"
- :key="index"
- :label="item.Name"
- :value="item.ID"
- >
+ <el-select v-model="form.HUSEORGID" placeholder="璇烽�夋嫨缁勭粐" :disabled="zzSelDis">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item class="form-inline" label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�..."></el-input>
</el-form-item>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="鍏朵粬淇℃伅" name="second">
<el-row>
- <el-col :span="16">
- <el-form-item class="form-inline" label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�..."></el-input>
+ <el-col :span="8">
+ <el-form-item label="璐熻矗浜�" prop="HEmpName">
+ <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨璐熻矗浜�">
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏉″舰鐮�" prop="HBarCode">
+ <el-input v-model="form.HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏄惁鐢熶骇杞﹂棿" prop="HWorkShopFlag">
+ <el-select v-model="form.HWorkShopFlag" placeholder="璇烽�夋嫨">
+ <el-option value="true">鏄�</el-option>
+ <el-option value="false">鍚�</el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item class="form-inline" label="浠撳簱绠＄悊鍛�" prop="HEmpName">
- <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨浠撳簱绠＄悊鍛�">
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openDataDialog(1)"
- ></el-button>
- </el-input>
+ <el-form-item label="閮ㄩ棬浜烘暟" prop="HEmpQtys">
+ <el-input-number v-model="form.HEmpQtys" placeholder="璇疯緭鍏ラ儴闂ㄤ汉鏁�" :min="0" :precision="0" />
</el-form-item>
</el-col>
</el-row>
@@ -137,34 +98,19 @@
<el-row>
<el-col :span="8">
<el-form-item label="鍒涘缓鏃ユ湡" prop="HMakeDate">
- <el-date-picker
- v-model="form.HMakeDate"
- type="date"
- placeholder="閫夋嫨鍒涘缓鏃ユ湡"
- disabled
- >
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒涘缓鏃ユ湡" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绂佺敤鏃ユ湡" prop="HStopTime">
- <el-date-picker
- v-model="form.HStopTime"
- type="date"
- placeholder="閫夋嫨绂佺敤鏃ユ湡"
- disabled
- >
+ <el-date-picker v-model="form.HStopTime" type="date" placeholder="閫夋嫨绂佺敤鏃ユ湡" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckTime">
- <el-date-picker
- v-model="form.HCheckTime"
- type="date"
- placeholder="閫夋嫨瀹℃牳鏃ユ湡"
- disabled
- >
+ <el-date-picker v-model="form.HCheckTime" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -173,21 +119,8 @@
</el-tabs>
</el-form>
<!-- 閮ㄩ棬寮圭獥 -->
- <el-dialog
- :title="dialogTitle"
- :visible.sync="openData"
- width="1280px"
- append-to-body
- >
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
- <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
- <Employee
- @deptEmitDb="dbEmitData"
- @deptEmit="emitData"
- v-if="employeeShow"
- ></Employee>
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -203,13 +136,13 @@
import Material from "@/views/component/material";
import RowSettings from "@/views/component/rowSettings";
import GyWorkCenter from "@/views/component/gyWorkCenter";
-import Employee from "@/views/component/employee";
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
import moment from "moment";
import dayjs from "dayjs";
export default {
name: "gyWarehouse_Edit",
- components: { Dept, Warehouse, Material, RowSettings, GyWorkCenter, Employee },
+ components: { Dept, Warehouse, Material, RowSettings, GyWorkCenter, GyEmployee },
props: {
OperationType: { type: Number },
linterid: { type: Number },
@@ -218,13 +151,15 @@
},
data() {
return {
+ HModName: "Xt_UserListEdit",
formShow: false,
temp: undefined,
formLoading: true,
- zzSelDis: false,
+ zzSelDis: true,
rowHideShow: false,
openRowHide: false,
workCenterShow: false,
+ gyEmployeeShow: false,
sWhere: "",
sTime: "",
eTime: "",
@@ -238,13 +173,12 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: 0,
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
CheckBillDisabled: true,
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -289,110 +223,66 @@
},
created() {
this.reset();
- this.fetchData();
+ this.getdata();
},
activated() {
this.reset();
- this.fetchData();
+ this.getdata();
},
methods: {
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((response) => {
- let data = response.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- this.getdata();
- }
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
getdata() {
this.reset();
- console.log(this.OperationType);
+ console.log(this.OperationType,this.copyType);
if (this.OperationType != 1) {
this.zzSelDis = true;
- axios
- .get(this.baseURL + "/Gy_Warehouse/cx", {
- params: {
- HInterID: this.linterid,
- },
- })
- .then((response) => {
- console.log(response);
- let result = response.data;
- if (result.code == 1) {
- // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
-
- Object.assign(this.form, {
- HNumber: data.浠撳簱浠ｇ爜,
- HItemID: data.HItemID,
- HParentID: data.HParentID,
- HShortNumber: data.HNumber,
- HName: data.浠撳簱鍚嶇О,
- HHelpCode: data.HHelpCode,
- HEmpID: data.HEmpID,
- HEmpName: data.HEmpName,
- HAddress: data.浠撳簱鍦板潃,
- HPhone: data.鑱旂郴鐢佃瘽,
- HStopflag: data.绂佺敤鏍囪,
- HStockCtrlFlag: data.璐熷簱瀛樻帶鍒舵爣璁�,
- HSPFlag: data.鍚敤浠撲綅 == "Y" ? 1 : 0,
- HRemark: data.HRemark,
- HWarehouseType: data.浠撳簱绫诲瀷,
- //, "HItemID": data.鏉＄爜缂栧彿
- HBarCode: data.HBarCode,
- HUSEORGID: data.HUSEORGID,
- //, "HCreator": data.鍒涘缓浜�
- //, "lngBillKey": data.lngBillKey
- //, "lngBillSubKey": data.lngBillSubKey
- //, "HMaker": data.HMaker
- //, "HCreateDate": data.鍒涘缓鏃ユ湡
- HUpDater: sessionStorage["HUserName"],
- HMakeEmp: data["鍒涘缓浜�"],
- HMakeDate:
- data["鍒涘缓鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["鍒涘缓鏃ユ湡"])).format("yyyy-MM-dd"),
- HCheckEmp: data["瀹℃牳浜�"],
- HCheckDate:
- data["瀹℃牳鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["瀹℃牳鏃ユ湡"])).format("yyyy-MM-dd"),
- HStopEmp: data["绂佺敤浜�"],
- HStopDate:
- data["绂佺敤鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["绂佺敤鏃ユ湡"])).format("yyyy-MM-dd"),
- });
- if (!data.HCheckEmp) {
- this.CheckBillDisabled = false;
- }
- }
- this.$nextTick(() => {
- this.formShow = true;
- this.formLoading = false;
+ axios.get(this.$baseUrl + "/Gy_Department/cx", {
+ params: {
+ HInterID: this.linterid,
+ },
+ }).then((response) => {
+ let result = response.data;
+ if (result.code == 1) {
+ // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ Object.assign(this.form, {
+ HNumber: data.閮ㄩ棬浠ｇ爜,
+ HItemID: data.HItemID,
+ HName: data.閮ㄩ棬鍚嶇О,
+ HHelpCode: data.HHelpCode,
+ HEmpID: data.HEmpID,
+ HEmpName: data.HEmpName,
+ HBarCode: data.鏉″舰鐮�,
+ HStopflag: data.绂佺敤鏍囪,
+ HRemark: data.HRemark,
+ HUSEORGID: data.HUSEORGID,
+ HRemark: data.澶囨敞,
+ HMakeEmp: data["鍒涘缓浜�"],
+ HMakeDate: data["鍒涘缓鏃ユ湡"] == null ? "" : dayjs(new Date(data["鍒涘缓鏃ユ湡"])).format("yyyy-MM-dd"),
+ HCheckEmp: data["瀹℃牳浜�"],
+ HCheckDate: data["瀹℃牳鏃ユ湡"] == null ? "" : dayjs(new Date(data["瀹℃牳鏃ユ湡"])).format("yyyy-MM-dd"),
+ HStopEmp: data["绂佺敤浜�"],
+ HStopDate: data["绂佺敤鏃ユ湡"] == null ? "" : dayjs(new Date(data["绂佺敤鏃ユ湡"])).format("yyyy-MM-dd"),
});
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ if (!data.HCheckEmp) {
+ this.CheckBillDisabled = false;
+ }
+ if (this.copyType == 1) {
+ this.form.HItemID = 0
+ this.form.HMakeEmp = sessionStorage["HUserName"]
+ this.form.HMakeDate = moment(new Date()).format("YYYY-MM-DDTHH:mm:ss")
+ this.form.HCheckEmp = ''
+ this.form.HCheckDate = ''
+ this.form.HStopEmp = ''
+ this.form.HStopDate = ''
+ }
+ }
+ this.$nextTick(() => {
+ this.formShow = true;
+ this.formLoading = false;
});
+ }).catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
} else if (this.OperationType == 1) {
let date = new Date();
this.form.HMakeDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
@@ -416,12 +306,11 @@
},
//閮ㄩ棬寮圭獥璧嬪��
dbEmitData(deptRow, num) {
- console.log(deptRow, num);
- // num=1 浠撳簱绠＄悊鍛�
- if (num == 1) {
- this.form.HEmpID = deptRow.HItemID;
- this.form.HEmpName = deptRow["鑱屽憳鍚嶇О"];
- this.openData = false;
+ if (num == 4) {
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ this.gyEmployeeShow = false
+ this.openData = false
}
},
emitData(deptRow, num) {
@@ -440,35 +329,18 @@
//鏂板缂栬緫琛ㄥ崟鍒濆鍖�
reset() {
this.form = {
- HNumber: null,
+ HNumber: '',
HItemID: 0,
- HName: null,
- HHelpCode: null,
- HWorkTimes: "0",
- HMaxWorkTimes: "0",
- HRelationID: "0",
- HMinAdd: "0",
- HClassCount: "0",
- HOverTimes: "0",
- HCenter: null,
- HCenterID: null,
- HGroup: null,
- HGroupID: 0,
- HDeptName: null,
- HDeptID: 0,
- HProcName: null,
- HProcID: 0,
- HProcNumber: null,
- HStopflag: false,
- HType: null,
- HRemark: null,
- HUseFlag: "鏈娴�",
- HUSEORGID: this.zuzhiId,
- HCREATEORGID: this.zuzhiId,
- HMacAddr: null,
+ HName: '',
+ HHelpCode: '',
HEmpID: 0,
- HEmpName: null,
- HMakeEmp: this.user,
+ HEmpName: '',
+ HBarCode: '',
+ HStopflag: false,
+ HRemark: '',
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
+ HRemark: '',
+ HMakeEmp: sessionStorage["HUserName"],
HMakeTime: null,
HStopEmp: null,
HStopTime: null,
@@ -504,15 +376,12 @@
let fhck = false;
this.$nextTick(() => {
if (!fhck) {
- console.log(4);
var sMainStr = JSON.stringify(this.form);
- // var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ";" + this.user;
axios({
method: "post",
- url: this.baseURL + "/Gy_Warehouse/ModifyByID",
+ url: this.$baseUrl + "/Gy_Department/AddBill1",
data: {
- oMain: sMainSub,
+ oMain: sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"],
},
})
.then((response) => {
@@ -543,8 +412,8 @@
.then(() => {
if (this.rowForm.鐘舵�� == "鍒涘缓") {
axios
- .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
- params: { HInterID: this.rowForm.hmainid.toString(), user: this.user },
+ .get(this.$baseUrl + "/Kf_SellOutBill/DeltetSellOutBill", {
+ params: { HInterID: this.rowForm.hmainid.toString(), user: sessionStorage["HUserName"] },
})
.then((response) => {
if (response.data.count == 1) {
@@ -560,15 +429,15 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
- var InterID = form.HItemID || form.HInterID;
+ var InterID = this.form.HItemID.toString();
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
- params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ .get(this.$baseUrl + "/Gy_Department/AuditGy_Department", {
+ params: { HInterID: InterID, IsAudit: num, CurUserName: sessionStorage["HUserName"] },
})
.then((response) => {
let result = response.data;
@@ -584,10 +453,7 @@
});
},
showReset() {
- this.deptShow = false;
- this.warehouseShow = false;
- this.materialShow = false;
- this.workCenterShow = false;
+ this.gyEmployeeShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -595,10 +461,10 @@
this.zbIndex = row.index - 1;
}
this.showReset();
- if (num == 1) {
- this.dialogTitle = "浠撳簱绠＄悊鍛樺垪琛�";
- this.employeeShow = true;
- this.openData = true;
+ if (num == 4) {
+ this.dialogTitle = '鑱屽憳鍒楄〃'
+ this.gyEmployeeShow = true
+ this.openData = true
}
},
},
@@ -609,7 +475,7 @@
width: 100%;
}
-.form-inline > .el-form-item__content {
+.form-inline>.el-form-item__content {
display: flex;
flex-direction: row;
}
--
Gitblit v1.9.1