This commit is contained in:
bb_pan 2025-06-02 11:29:59 +08:00
parent f4fe7c32d6
commit 1625530c31
12 changed files with 35 additions and 35 deletions

View File

@ -45,18 +45,18 @@
@select="handleProChange" @select="handleProChange"
/> />
</el-form-item> </el-form-item>
<el-form-item label="退料人" prop="backPerson"> <el-form-item label="班组长" prop="backPerson">
<el-input <el-input
v-model="queryParams.backPerson" v-model="queryParams.backPerson"
placeholder="请输入退料人" placeholder="请输入班组长"
clearable clearable
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="退料人电话" prop="phone"> <el-form-item label="班组长电话" prop="phone">
<el-input <el-input
v-model="queryParams.phone" v-model="queryParams.phone"
placeholder="请输入退料人电话" placeholder="请输入班组长电话"
clearable clearable
style="width: 240px" style="width: 240px"
:maxlength="11" :maxlength="11"
@ -484,7 +484,7 @@ export default {
// companyId: '', // // companyId: '', //
// createBy: '', // // createBy: '', //
// backTime: '', // // backTime: '', //
//退 //
backPerson: '', backPerson: '',
phone: '', phone: '',
remark: '', remark: '',
@ -524,7 +524,7 @@ export default {
backPerson: [ backPerson: [
{ {
required: true, required: true,
message: '请输入退料人', message: '请输入班组长',
trigger: 'blur' trigger: 'blur'
} }
], ],
@ -539,7 +539,7 @@ export default {
{ {
required: true, required: true,
trigger: 'blur', trigger: 'blur',
message: '请输入退料人的手机号' message: '请输入班组长的手机号'
}, },
{ {
pattern: /^1[3456789]\d{9}$/, pattern: /^1[3456789]\d{9}$/,

View File

@ -112,8 +112,8 @@
<el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" width="150"/> <el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="退料单号" align="center" prop="code" :show-overflow-tooltip="true" width="150"/> <el-table-column label="退料单号" align="center" prop="code" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="工器具类型" align="center" prop="typeName" :show-overflow-tooltip="true" width="200"/> <el-table-column label="工器具类型" align="center" prop="typeName" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="退料人" align="center" prop="backPerson" :show-overflow-tooltip="true" width="100"/> <el-table-column label="班组长" align="center" prop="backPerson" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="退料人电话" align="center" prop="phone" :show-overflow-tooltip="true" width="120"/> <el-table-column label="班组长电话" align="center" prop="phone" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="180"/> <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="创建人" align="center" prop="createBy" :show-overflow-tooltip="true" width="100"/> <el-table-column label="创建人" align="center" prop="createBy" :show-overflow-tooltip="true" width="100"/>
<!-- <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/> --> <!-- <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/> -->

View File

@ -36,19 +36,19 @@
></el-input> ></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="退料人" prop="backPerson"> <el-form-item label="班组长" prop="backPerson">
<el-input <el-input
v-model="queryParams.backPerson" v-model="queryParams.backPerson"
placeholder="请输入退料人" placeholder="请输入班组长"
clearable clearable
style="width: 240px" style="width: 240px"
:disabled="isView" :disabled="isView"
/> />
</el-form-item> </el-form-item>
<el-form-item label="退料人电话" prop="phone"> <el-form-item label="班组长电话" prop="phone">
<el-input <el-input
v-model="queryParams.phone" v-model="queryParams.phone"
placeholder="请输入退料人电话" placeholder="请输入班组长电话"
clearable clearable
style="width: 240px" style="width: 240px"
:maxlength="11" :maxlength="11"
@ -407,7 +407,7 @@ export default {
// companyId: '', // // companyId: '', //
// createBy: '', // // createBy: '', //
// backTime: '', // // backTime: '', //
//退 //
backPerson: '', backPerson: '',
phone: '', phone: '',
remark: '', remark: '',
@ -449,7 +449,7 @@ export default {
backPerson: [ backPerson: [
{ {
required: true, required: true,
message: '请输入退料人', message: '请输入班组长',
trigger: 'blur', trigger: 'blur',
}, },
], ],
@ -464,7 +464,7 @@ export default {
{ {
required: true, required: true,
trigger: 'blur', trigger: 'blur',
message: '请输入退料人的手机号', message: '请输入班组长的手机号',
}, },
{ {
pattern: /^1[3456789]\d{9}$/, pattern: /^1[3456789]\d{9}$/,

View File

@ -59,7 +59,7 @@
<el-table-column label="退料日期" align="center" prop="backTime" :show-overflow-tooltip="true" /> <el-table-column label="退料日期" align="center" prop="backTime" :show-overflow-tooltip="true" />
<el-table-column label="退料班组" align="center" prop="teamName" :show-overflow-tooltip="true" /> <el-table-column label="退料班组" align="center" prop="teamName" :show-overflow-tooltip="true" />
<el-table-column label="退料工程" align="center" prop="proName" :show-overflow-tooltip="true" /> <el-table-column label="退料工程" align="center" prop="proName" :show-overflow-tooltip="true" />
<el-table-column label="退料人" align="center" prop="backPerson" :show-overflow-tooltip="true" /> <el-table-column label="班组长" align="center" prop="backPerson" :show-overflow-tooltip="true" />
<el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" /> <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" />
<el-table-column label="退料单号" align="center" prop="code" :show-overflow-tooltip="true" /> <el-table-column label="退料单号" align="center" prop="code" :show-overflow-tooltip="true" />
</el-table> </el-table>
@ -106,7 +106,7 @@
<!-- <el-table-column label="原值(元)" align="center" prop="buyPrice" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="原值(元)" align="center" prop="buyPrice" :show-overflow-tooltip="true" /> -->
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" /> <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
<!-- <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true" /> -->
<el-table-column label="退料人员" align="center" prop="backPerson" :show-overflow-tooltip="true" /> <el-table-column label="班组长" align="center" prop="backPerson" :show-overflow-tooltip="true" />
<el-table-column label="退料时间" align="center" prop="backTime" :show-overflow-tooltip="true" /> <el-table-column label="退料时间" align="center" prop="backTime" :show-overflow-tooltip="true" />
<!-- <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true" /> -->
</el-table> </el-table>

View File

@ -83,7 +83,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="relName"> <el-form-item label="班组长" prop="relName">
<el-input v-model="dialogForm.relName" placeholder="请输入内容" clearable /> <el-input v-model="dialogForm.relName" placeholder="请输入内容" clearable />
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="relPhone"> <el-form-item label="联系电话" prop="relPhone">
@ -116,7 +116,7 @@ export default {
tableColumns: [ tableColumns: [
{ label: '班组名称', prop: 'teamName' }, { label: '班组名称', prop: 'teamName' },
{ label: '所属项目部', prop: 'departName' }, { label: '所属项目部', prop: 'departName' },
{ label: '联系人', prop: 'relName' }, { label: '班组长', prop: 'relName' },
{ label: '联系电话', prop: 'relPhone' } { label: '联系电话', prop: 'relPhone' }
], ],
// //
@ -134,7 +134,7 @@ export default {
dialogRules: { dialogRules: {
teamName: [{ required: true, message: '请输入班组名称', trigger: 'blur' }], teamName: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
departId: [{ required: true, message: '请选择所属项目部', trigger: 'change' }], departId: [{ required: true, message: '请选择所属项目部', trigger: 'change' }],
relName: [{ required: true, message: '请输入联系人', trigger: 'blur' }], relName: [{ required: true, message: '请输入班组长', trigger: 'blur' }],
relPhone: [ relPhone: [
{ required: true, message: '请输入联系电话', trigger: 'blur' }, { required: true, message: '请输入联系电话', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' } { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }

View File

@ -36,10 +36,10 @@
placeholder="请选择租赁工程" placeholder="请选择租赁工程"
/> />
</el-form-item> </el-form-item>
<el-form-item label="领料人" prop="leasePerson"> <el-form-item label="班组长" prop="leasePerson">
<el-input <el-input
v-model="maForm.leasePerson" v-model="maForm.leasePerson"
placeholder="请输入领料人" placeholder="请输入班组长"
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 240px"
@ -326,7 +326,7 @@ export default {
leasePerson: [ leasePerson: [
{ {
required: true, required: true,
message: '请输入领料人', message: '请输入班组长',
trigger: 'blur' trigger: 'blur'
} }
], ],

View File

@ -101,7 +101,7 @@
<!-- <el-table-column label="协议号" align="center" prop="agreementCode" width="140" :show-overflow-tooltip="true"/> --> <!-- <el-table-column label="协议号" align="center" prop="agreementCode" width="140" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column label="租赁申请单号" align="center" prop="code" width="140px" :show-overflow-tooltip="true"></el-table-column> --> <!-- <el-table-column label="租赁申请单号" align="center" prop="code" width="140px" :show-overflow-tooltip="true"></el-table-column> -->
<el-table-column label="领料工器具类型" align="center" prop="maTypeNames" width="140px" :show-overflow-tooltip="true"></el-table-column> <el-table-column label="领料工器具类型" align="center" prop="maTypeNames" width="140px" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true"/> <el-table-column label="班组长" align="center" prop="leasePerson" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="领料人电话" align="center" prop="phone" width="120px" :show-overflow-tooltip="true"/> --> <!-- <el-table-column label="领料人电话" align="center" prop="phone" width="120px" :show-overflow-tooltip="true"/> -->
<el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" width="150"> <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

View File

@ -27,10 +27,10 @@
readonly readonly
/> />
</el-form-item> </el-form-item>
<el-form-item label="领料人" prop="leasePerson"> <el-form-item label="班组长" prop="leasePerson">
<el-input <el-input
v-model="maForm.leasePerson" v-model="maForm.leasePerson"
placeholder="领料人" placeholder="班组长"
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 240px"

View File

@ -60,7 +60,7 @@
<el-table-column label="领料日期" align="center" prop="leaseDate" :show-overflow-tooltip="true" /> <el-table-column label="领料日期" align="center" prop="leaseDate" :show-overflow-tooltip="true" />
<el-table-column label="领料班组" align="center" prop="teamName" :show-overflow-tooltip="true" /> <el-table-column label="领料班组" align="center" prop="teamName" :show-overflow-tooltip="true" />
<el-table-column label="领料工程" align="center" prop="projectName" :show-overflow-tooltip="true" /> <el-table-column label="领料工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" /> <el-table-column label="班组长" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
<el-table-column label="出库人" align="center" prop="outPerson" :show-overflow-tooltip="true" /> <el-table-column label="出库人" align="center" prop="outPerson" :show-overflow-tooltip="true" />
<el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" /> <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
</el-table> </el-table>

View File

@ -36,10 +36,10 @@
placeholder="请选择租赁工程" placeholder="请选择租赁工程"
/> />
</el-form-item> </el-form-item>
<el-form-item label="领料人" prop="leasePerson"> <el-form-item label="班组长" prop="leasePerson">
<el-input <el-input
v-model="maForm.leasePerson" v-model="maForm.leasePerson"
placeholder="请输入领料人" placeholder="请输入班组长"
:disabled="isEdit" :disabled="isEdit"
clearable clearable
maxlength="50" maxlength="50"
@ -352,7 +352,7 @@ export default {
leasePerson: [ leasePerson: [
{ {
required: true, required: true,
message: '请输入领料人', message: '请输入班组长',
trigger: 'blur' trigger: 'blur'
} }
], ],

View File

@ -91,8 +91,8 @@
<!-- <el-table-column label="协议号" align="center" prop="agreementCode" width="140" :show-overflow-tooltip="true"/> --> <!-- <el-table-column label="协议号" align="center" prop="agreementCode" width="140" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column label="租赁申请单号" align="center" prop="code" width="140px" :show-overflow-tooltip="true"></el-table-column> --> <!-- <el-table-column label="租赁申请单号" align="center" prop="code" width="140px" :show-overflow-tooltip="true"></el-table-column> -->
<el-table-column label="领料工器具类型" align="center" prop="maTypeNames" width="140px" :show-overflow-tooltip="true"></el-table-column> <el-table-column label="领料工器具类型" align="center" prop="maTypeNames" width="140px" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true"/> <el-table-column label="班组长" align="center" prop="leasePerson" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="领料人电话" align="center" prop="phone" width="120px" :show-overflow-tooltip="true"/> --> <!-- <el-table-column label="班组长电话" align="center" prop="phone" width="120px" :show-overflow-tooltip="true"/> -->
<el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" width="150"> <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.lease_task_status" :value="scope.row.taskStatus"/> <dict-tag :options="dict.type.lease_task_status" :value="scope.row.taskStatus"/>

View File

@ -27,10 +27,10 @@
readonly readonly
/> />
</el-form-item> </el-form-item>
<el-form-item label="领料人" prop="leasePerson"> <el-form-item label="班组长" prop="leasePerson">
<el-input <el-input
v-model="maForm.leasePerson" v-model="maForm.leasePerson"
placeholder="领料人" placeholder="班组长"
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 240px"