UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备计划代码提交

Browse Source
dev
郑明梁 2 years ago
parent b93a646520
commit 0a047acb1b
4 changed files with 55 additions and 61 deletions
Show Stats Download Patch File Download Diff File

28
src/views/inventory/DeviceInspectPlanAuditModify.vue
Unescape Escape View File

@ -122,33 +122,13 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="巡检人:" prop="inspectUser"> <el-form-item label="计划状态:" prop="planStatus">
<el-select v-model="inspectPlan.inspectUser" placeholder="委托验收人" clearable style="width: 90%"> <el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
<el-option <el-option label="不启用" :value=1></el-option>
v-for="item in userList" <el-option label="启用" :value=2></el-option>
:key="item.userid"
:label="item.employeeName"
:value="item.userid">
<span style="float: left">{{ item.employeeName }}</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10">
<el-form-item label="预期结束时间:" prop="expectedTime">
<el-date-picker
v-model="inspectPlan.expectedTime"
type="datetime"
placeholder="选择任务预期结束时间"
style="width: 90%"
:picker-options="pickerOptionsExpected"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>

34
src/views/inventory/DeviceInspectPlanModify.vue
Unescape Escape View File

@ -20,7 +20,7 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item class="query-form-item" label="部门:" prop="deptCode"> <el-form-item class="query-form-item" label="部门:" prop="deptCode">
<el-select v-model="inspectPlan.deptCode" placeholder="请选择部门" clearable="true" <el-select v-model="inspectPlan.deptCode" placeholder="请选择部门" clearable="true"
:disabled="inspectPlan.id !== null" @change="deptChange" style="width: 90%"> :disabled="inspectPlan.code != null" @change="deptChange" style="width: 90%">
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
:key="item.name" :key="item.name"
@ -34,7 +34,7 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item class="query-form-item" label="仓库:" prop="invCode"> <el-form-item class="query-form-item" label="仓库:" prop="invCode">
<el-select v-model="inspectPlan.invCode" :disabled="inspectPlan.id !== null" placeholder="请选择仓库" <el-select v-model="inspectPlan.invCode" :disabled="inspectPlan.code != null" placeholder="请选择仓库"
clearable="true" style="width: 90%"> clearable="true" style="width: 90%">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
@ -124,16 +124,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>-->
<el-col :span="10"> <!-- <el-col :span="10">-->
<el-form-item label="计划状态:" prop="planStatus"> <!-- <el-form-item label="计划状态:" prop="planStatus">-->
<el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable> <!-- <el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>-->
<el-option label="不启用" :value=1></el-option> <!-- <el-option label="不启用" :value=1></el-option>-->
<el-option label="启用" :value=2></el-option> <!-- <el-option label="启用" :value=2></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-form> </el-form>
</el-card> </el-card>
@ -248,6 +248,7 @@
> >
<deviceProjectSelect <deviceProjectSelect
:inputQuery="inputQuery" :inputQuery="inputQuery"
type="1"
:closeDialog="inspectPlanSetCloseDialog" :closeDialog="inspectPlanSetCloseDialog"
></deviceProjectSelect> ></deviceProjectSelect>
</el-dialog> </el-dialog>
@ -387,6 +388,9 @@ export default {
this.$refs["formRef"].validate((valid) => { this.$refs["formRef"].validate((valid) => {
if (valid) { if (valid) {
let formName = isBlank(this.inspectPlan.id) ? "add" : "edit"; let formName = isBlank(this.inspectPlan.id) ? "add" : "edit";
if(formName == "add"){
this.inspectPlan.planStatus = 1;
}
saveDeviceInspectPlan(this.inspectPlan, formName).then((res) => { saveDeviceInspectPlan(this.inspectPlan, formName).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("添加成功"); this.$message.success("添加成功");
@ -500,6 +504,9 @@ export default {
this.$refs["formRef"].validate((valid) => { this.$refs["formRef"].validate((valid) => {
if (valid) { if (valid) {
let formName = isBlank(this.inspectPlan.id) ? "add" : "edit"; let formName = isBlank(this.inspectPlan.id) ? "add" : "edit";
if(formName == "add"){
this.inspectPlan.planStatus = 1;
}
saveDeviceInspectPlan(this.inspectPlan, formName).then((res) => { saveDeviceInspectPlan(this.inspectPlan, formName).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.inspectPlan.id = res.data.id; this.inspectPlan.id = res.data.id;
@ -532,6 +539,9 @@ export default {
this.$refs["formRef"].validate((valid) => { this.$refs["formRef"].validate((valid) => {
if (valid) { if (valid) {
let formName = isBlank(this.inspectPlan.id) ? "add" : "edit"; let formName = isBlank(this.inspectPlan.id) ? "add" : "edit";
if(formName == "add"){
this.inspectPlan.planStatus = 1;
}
saveDeviceInspectPlan(this.inspectPlan, formName).then((res) => { saveDeviceInspectPlan(this.inspectPlan, formName).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.inspectPlan.id = res.data.id; this.inspectPlan.id = res.data.id;

22
src/views/inventory/DeviceInspectPlanNew.vue
Unescape Escape View File

@ -145,7 +145,7 @@
</el-table-column> </el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120"> <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-tag :type="statusFilterType(scope.row.status)">{{ statusMap[scope.row.status] }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
@ -160,7 +160,6 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled = "scope.row.planStatus != 2"
@click.native.stop="submitAudit(scope.row)" @click.native.stop="submitAudit(scope.row)"
>提交审核 >提交审核
</el-button </el-button
@ -229,7 +228,7 @@
> >
<DeviceInspectPlanProjectSet <DeviceInspectPlanProjectSet
:detailQuery="detailQuery" :detailQuery="detailQuery"
:closeDialog="closeDialog" :closeDialog="detailCloseDialogc"
> >
</DeviceInspectPlanProjectSet> </DeviceInspectPlanProjectSet>
</el-dialog> </el-dialog>
@ -255,7 +254,7 @@ export default {
deptCode: this.$store.getters.locDeptCode, deptCode: this.$store.getters.locDeptCode,
invCode: null, invCode: null,
code: null, code: null,
status: 0, statusList: [0,3],
page: 1, page: 1,
limit: 20, limit: 20,
}, },
@ -270,7 +269,8 @@ export default {
statusMap: { statusMap: {
0: "草稿", 0: "草稿",
1: "未审核", 1: "未审核",
2: "已审核" 2: "已审核",
3: "已拒绝"
}, },
levelMap: { levelMap: {
1: "低级", 1: "低级",
@ -397,7 +397,7 @@ export default {
deptCode: this.$store.getters.locDeptCode, deptCode: this.$store.getters.locDeptCode,
invCode: null, invCode: null,
code: null, code: null,
status: 0, statusList: [0,3],
page: 1, page: 1,
limit: 20, limit: 20,
}; };
@ -481,9 +481,6 @@ export default {
this.deviceInspectPlan = row; this.deviceInspectPlan = row;
}, },
submitAudit(row) { submitAudit(row) {
if(row.planStatus != 2){
return this.$message.error("该计划没有启用");
}
let params = {orderId: row.orderId}; let params = {orderId: row.orderId};
submitAudit(params).then((res) => { submitAudit(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
@ -521,6 +518,13 @@ export default {
this.formVisible = false; this.formVisible = false;
this.deviceProjectSelectVisible = false this.deviceProjectSelectVisible = false
this.selectDeviceInspectPlanDelect({orderIdFk:this.orderIds}) this.selectDeviceInspectPlanDelect({orderIdFk:this.orderIds})
this.getList()
},
detailCloseDialogc() {
this.formVisible = false;
this.deviceProjectSelectVisible = false
this.selectDeviceInspectPlanDelect({orderIdFk:this.orderIds})
this.getList()
}, },
addInspectPlan() { addInspectPlan() {
this.formVisible = true; this.formVisible = true;

32
src/views/inventory/DeviceProjectSelect.vue
Unescape Escape View File

@ -16,21 +16,15 @@
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item class="query-form-item" label="项目类型:"> <!-- <el-form-item class="query-form-item" label="项目类型:">-->
<el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择项目类型" clearable="true" <!-- <el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择项目类型" clearable="true"-->
> <!-- >-->
<el-option label="巡检" :value="1"></el-option> <!-- <el-option label="巡检" :value="1"></el-option>-->
<el-option label="养护" :value="2"></el-option> <!-- <el-option label="养护" :value="2"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
@ -49,6 +43,8 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="margin-left: 10px;display:flex;"> <el-button-group style="margin-left: 10px;display:flex;">
@ -108,6 +104,10 @@ export default {
type: Object, type: Object,
required: true required: true
}, },
type: {
type: Object,
required: true
},
closeDialog: { closeDialog: {
type: Function, type: Function,
required: true required: true
@ -207,7 +207,7 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.type = 1 this.filterQuery.type = this.type
getprojectSetList(this.filterQuery).then((res) => { getprojectSetList(this.filterQuery).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {

Write Preview
Loading…
Cancel
Save