|
@@ -17,7 +17,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="计划日期">
|
|
|
<el-date-picker
|
|
|
- v-model="plannedDate"
|
|
|
+ v-model="fPlanneddate"
|
|
|
@change="planDateMethod"
|
|
|
type="daterange"
|
|
|
:clearable="false"
|
|
@@ -95,14 +95,14 @@
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="序号" type="index" width="50" fixed align="center"/>
|
|
|
<el-table-column label="仓库名称" align="center" prop="fWarehousename"/>
|
|
|
- <el-table-column label="巡检人" align="center" prop="fInspector"/>
|
|
|
- <el-table-column label="计划开始日期" align="center" prop="fBeginTime"/>
|
|
|
- <el-table-column label="计划结束日期" align="center" prop="fEndTime"/>
|
|
|
+ <el-table-column label="巡检人" align="center" prop="fInspectorid"/>
|
|
|
+ <el-table-column label="计划开始日期" align="center" prop="fBegintime"/>
|
|
|
+ <el-table-column label="计划结束日期" align="center" prop="fEndtime"/>
|
|
|
<el-table-column label="制单人" align="center" prop="createBy"/>
|
|
|
<el-table-column label="制单日期" align="center" prop="createTime"/>
|
|
|
<el-table-column label="更新人" align="center" prop="updateBy"/>
|
|
|
<el-table-column label="更新日期" align="center" prop="updateTime"/>
|
|
|
- <el-table-column label="系统编号" align="center" prop="fSystemNum"/>
|
|
|
+ <el-table-column label="系统编号" align="center" prop="fSystemnum"/>
|
|
|
<el-table-column label="备注" align="center" prop="remark"/>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope" style="width: 100px;">
|
|
@@ -210,11 +210,11 @@
|
|
|
</el-date-picker>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="最新巡检日期" align="center" prop="fLatestinspectordate">
|
|
|
+ <el-table-column label="最新巡检日期" align="center" prop="fLatestinspectdate">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
style="width: 100%;"
|
|
|
- v-model="scope.row.fLatestinspectordate"
|
|
|
+ v-model="scope.row.fLatestinspectdate"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
type="date"
|
|
|
placeholder="选择日期">
|
|
@@ -237,38 +237,38 @@
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-<!-- <el-table-column label="录入人" align="center" prop="createBy">-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-input v-model="scope.row.createBy" placeholder="请输入内容"></el-input>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
-<!-- <el-table-column label="录入日期" align="center" prop="createTime">-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-date-picker-->
|
|
|
-<!-- style="width: 100%;"-->
|
|
|
-<!-- v-model="scope.row.createTime"-->
|
|
|
-<!-- value-format="yyyy-MM-dd"-->
|
|
|
-<!-- type="date"-->
|
|
|
-<!-- placeholder="选择日期">-->
|
|
|
-<!-- </el-date-picker>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
-<!-- <el-table-column label="更新人" align="center" prop="updateBy">-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-input v-model="scope.row.updateBy" placeholder="请输入内容"></el-input>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
-<!-- <el-table-column label="更新日期" align="center" prop="updateTime">-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-date-picker-->
|
|
|
-<!-- style="width: 100%;"-->
|
|
|
-<!-- v-model="scope.row.updateTime"-->
|
|
|
-<!-- value-format="yyyy-MM-dd"-->
|
|
|
-<!-- type="date"-->
|
|
|
-<!-- placeholder="选择日期">-->
|
|
|
-<!-- </el-date-picker>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
+ <!-- <el-table-column label="录入人" align="center" prop="createBy">-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- <el-input v-model="scope.row.createBy" placeholder="请输入内容"></el-input>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
+ <!-- <el-table-column label="录入日期" align="center" prop="createTime">-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- <el-date-picker-->
|
|
|
+ <!-- style="width: 100%;"-->
|
|
|
+ <!-- v-model="scope.row.createTime"-->
|
|
|
+ <!-- value-format="yyyy-MM-dd"-->
|
|
|
+ <!-- type="date"-->
|
|
|
+ <!-- placeholder="选择日期">-->
|
|
|
+ <!-- </el-date-picker>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
+ <!-- <el-table-column label="更新人" align="center" prop="updateBy">-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- <el-input v-model="scope.row.updateBy" placeholder="请输入内容"></el-input>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
+ <!-- <el-table-column label="更新日期" align="center" prop="updateTime">-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- <el-date-picker-->
|
|
|
+ <!-- style="width: 100%;"-->
|
|
|
+ <!-- v-model="scope.row.updateTime"-->
|
|
|
+ <!-- value-format="yyyy-MM-dd"-->
|
|
|
+ <!-- type="date"-->
|
|
|
+ <!-- placeholder="选择日期">-->
|
|
|
+ <!-- </el-date-picker>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
<el-table-column label="备注" align="center" prop="remark">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
|
|
@@ -296,11 +296,11 @@
|
|
|
:visible.sync="opentwo"
|
|
|
append-to-body
|
|
|
width="70%">
|
|
|
- <el-form ref="form" :model="twarehouseWarehousecheckdetailList" label-width="80px"
|
|
|
+ <el-form ref="form" :model="twarehousecheckdetailList" label-width="80px"
|
|
|
style="display:flex;flex-wrap: wrap;justify-content: space-between">
|
|
|
<el-form-item label="仓库名称" prop="fWarehouseid">
|
|
|
<el-select
|
|
|
- v-model="twarehouseWarehousecheckdetailList.fWarehouseid"
|
|
|
+ v-model="twarehousecheckdetailList.fWarehouseid"
|
|
|
filterable
|
|
|
placeholder="请选择仓库名称"
|
|
|
style="width: 200px;"
|
|
@@ -316,7 +316,7 @@
|
|
|
<el-form-item label="巡检日期" prop="fInspectiondate">
|
|
|
<el-date-picker
|
|
|
style="width: 200px;"
|
|
|
- v-model="twarehouseWarehousecheckdetailList.fInspectionDate"
|
|
|
+ v-model="twarehousecheckdetailList.fInspectiondate"
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="选择日期">
|
|
@@ -325,14 +325,14 @@
|
|
|
<el-form-item label="巡检人" prop="fInspectorid">
|
|
|
<el-input
|
|
|
style="width: 200px;"
|
|
|
- v-model="twarehouseWarehousecheckdetailList.fInspectorid"
|
|
|
+ v-model="twarehousecheckdetailList.fInspectorid"
|
|
|
placeholder="请输入巡检人"
|
|
|
clearable
|
|
|
size="small"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
- <el-input style="width: 200px;" v-model="twarehouseWarehousecheckdetailList.remark" type="textarea" placeholder="请输入内容" autosize/>
|
|
|
+ <el-input style="width: 200px;" v-model="twarehousecheckdetailList.remark" type="textarea" placeholder="请输入内容" autosize/>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div style="background-color: #1c84c6">
|
|
@@ -373,7 +373,7 @@ export default {
|
|
|
},
|
|
|
uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
|
|
|
warehouseOptions: [],
|
|
|
- plannedDate: [],
|
|
|
+ fPlanneddate: [],
|
|
|
fileList:[],
|
|
|
dialogImageUrl: '',
|
|
|
dVisible:false,
|
|
@@ -409,7 +409,7 @@ export default {
|
|
|
formList:[],
|
|
|
// 表单校验
|
|
|
rules: {},
|
|
|
- twarehouseWarehousecheckdetailList:{},
|
|
|
+ twarehousecheckdetailList:{},
|
|
|
picturefId:''
|
|
|
};
|
|
|
},
|
|
@@ -437,9 +437,11 @@ export default {
|
|
|
inputDetails(){
|
|
|
this.formList.push({
|
|
|
fWarehousename:'',
|
|
|
- latestInspector:'',
|
|
|
- inspector:'',
|
|
|
- plannedDate:'',
|
|
|
+ fLatestinspectorid:'',
|
|
|
+ fInspectorid:'',
|
|
|
+ fPlanneddate:'',
|
|
|
+ fLatestinspectdate:'',
|
|
|
+ fInspectionrecord:'',
|
|
|
updateTime:'',
|
|
|
createBy:'',
|
|
|
createTime:'',
|
|
@@ -451,20 +453,26 @@ export default {
|
|
|
let list = []
|
|
|
for (let item in this.pictureEist){
|
|
|
list.push({
|
|
|
- fWarehouseid:this.twarehouseWarehousecheckdetailList.fWarehouseid,
|
|
|
- fInspectionDate:this.twarehouseWarehousecheckdetailList.fInspectionDate,
|
|
|
- fInspectorid:this.twarehouseWarehousecheckdetailList.fInspectorid,
|
|
|
- remark:this.twarehouseWarehousecheckdetailList.remark,
|
|
|
+ fWarehouseid:this.twarehousecheckdetailList.fWarehouseid,
|
|
|
+ fInspectiondate:this.twarehousecheckdetailList.fInspectiondate,
|
|
|
+ fInspectorid:this.twarehousecheckdetailList.fInspectorid,
|
|
|
+ remark:this.twarehousecheckdetailList.remark,
|
|
|
fPhotosname:this.pictureEist[item].response.fileName,
|
|
|
- fInspectionphotos:this.pictureEist[item].response.thumbnailUrl
|
|
|
+ fPhotosurl:this.pictureEist[item].response.thumbnailUrl
|
|
|
})
|
|
|
}
|
|
|
for (let item in this.formList){
|
|
|
- if (this.picturefId === this.formList[item].fId) this.formList[item].twarehouseWarehousecheckdetailList = list
|
|
|
+ if (this.picturefId === this.formList[item].fId) this.formList[item].twarehousecheckdetailList = list
|
|
|
}
|
|
|
- this.form.twarehouseWarehousecheckitemsVOList = this.formList
|
|
|
+ this.form.twarehousecheckitemsVOList = this.formList
|
|
|
console.log(this.form)
|
|
|
- savePicture(this.form).then(res =>{
|
|
|
+
|
|
|
+ // updateLog(this.form).then(res =>{
|
|
|
+ // this.opentwo=false;
|
|
|
+ // console.log(res)
|
|
|
+ // })
|
|
|
+ newlyAdded(this.form).then(res =>{
|
|
|
+ this.opentwo=false;
|
|
|
console.log(res)
|
|
|
})
|
|
|
},
|
|
@@ -476,16 +484,17 @@ export default {
|
|
|
viewDetails(row){
|
|
|
information(row.fId).then(res =>{
|
|
|
this.open = true
|
|
|
- this.formList = res.data.twarehouseWarehousecheckitemsVOList
|
|
|
- delete res.data.twarehouseWarehousecheckitemsVOList
|
|
|
+ if (res.data.twarehousecheckitemsVOList === null) res.data.twarehousecheckitemsVOList = []
|
|
|
+ this.formList = res.data.twarehousecheckitemsVOList
|
|
|
+ delete res.data.twarehousecheckitemsVOList
|
|
|
this.form = res.data
|
|
|
})
|
|
|
},
|
|
|
//拆分计划日期
|
|
|
planDateMethod() {
|
|
|
- if (this.plannedDate) {
|
|
|
- this.$set(this.queryParams, 'fBegintime', this.plannedDate[0])
|
|
|
- this.$set(this.queryParams, 'fEndTime', this.plannedDate[1])
|
|
|
+ if (this.fPlanneddate) {
|
|
|
+ this.$set(this.queryParams, 'fBegintime', this.fPlanneddate[0])
|
|
|
+ this.$set(this.queryParams, 'fEndtime', this.fPlanneddate[1])
|
|
|
}
|
|
|
},
|
|
|
/** 查询入出库状态列表 */
|
|
@@ -530,7 +539,7 @@ export default {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
}
|
|
|
- this.plannedDate = []
|
|
|
+ this.fPlanneddate = []
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
// 多选框选中数据
|
|
@@ -555,20 +564,12 @@ export default {
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
let list = this.form
|
|
|
- list.twarehouseWarehousecheckitemsVOList = this.formList
|
|
|
- if (this.form.fId != null) {
|
|
|
- updateLog(list).then(response => {
|
|
|
- this.msgSuccess("修改成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
- } else {
|
|
|
- newlyAdded(list).then(response => {
|
|
|
- this.msgSuccess("新增成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
- }
|
|
|
+ list.twarehousecheckitemsVOList = this.formList
|
|
|
+ newlyAdded(list).then(response => {
|
|
|
+ this.msgSuccess("新增成功");
|
|
|
+ this.open = false;
|
|
|
+ this.getList();
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
},
|