|
@@ -375,10 +375,10 @@
|
|
></el-option>
|
|
></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="巡检日期" prop="fUpdateTime">
|
|
|
|
|
|
+ <el-form-item label="巡检日期" prop="fCreateTime">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
style="width: 200px;"
|
|
style="width: 200px;"
|
|
- v-model="twarehousecheckdetailList.fUpdateTime"
|
|
|
|
|
|
+ v-model="twarehousecheckdetailList.fCreateTime"
|
|
type="date"
|
|
type="date"
|
|
value-format="yyyy-MM-dd"
|
|
value-format="yyyy-MM-dd"
|
|
placeholder="选择日期">
|
|
placeholder="选择日期">
|
|
@@ -429,7 +429,7 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
-import {listCorps,delLog,information,newlyAdded,savePicture,selectUserByRole,addOrModifyPictureList} from '@/api/warehouseCheck/index'
|
|
|
|
|
|
+import {listCorps,delLog,information,newlyAdded,savePicture,selectUserByRole,addOrModifyPictureList,currentLogin} from '@/api/warehouseCheck/index'
|
|
import {listWarehousesss} from "@/api/basicdata/warehouse";
|
|
import {listWarehousesss} from "@/api/basicdata/warehouse";
|
|
import {getToken} from "@/utils/auth";
|
|
import {getToken} from "@/utils/auth";
|
|
|
|
|
|
@@ -485,6 +485,9 @@ export default {
|
|
};
|
|
};
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
|
|
+ currentLogin().then(res=>{
|
|
|
|
+ console.log(res)
|
|
|
|
+ })
|
|
selectUserByRole().then(res => {
|
|
selectUserByRole().then(res => {
|
|
this.patrolInspection = res.rows
|
|
this.patrolInspection = res.rows
|
|
console.log(res)
|
|
console.log(res)
|
|
@@ -525,15 +528,23 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
preservationtwo(){
|
|
preservationtwo(){
|
|
|
|
+ for (let item in this.pictureEist){
|
|
|
|
+ this.twarehousecheckdetailList.fPhotoUrl[item] = this.pictureEist[item].response.url
|
|
|
|
+ }
|
|
|
|
+ this.twarehousecheckdetailList.fPhotoUrl = JSON.stringify(this.twarehousecheckdetailList.fPhotoUrl)
|
|
addOrModifyPictureList(this.twarehousecheckdetailList).then(res=>{
|
|
addOrModifyPictureList(this.twarehousecheckdetailList).then(res=>{
|
|
-
|
|
|
|
|
|
+ console.log(res)
|
|
})
|
|
})
|
|
},
|
|
},
|
|
pictureList(scope){
|
|
pictureList(scope){
|
|
savePicture(scope.row.fId).then(res=>{
|
|
savePicture(scope.row.fId).then(res=>{
|
|
console.log(res)
|
|
console.log(res)
|
|
|
|
+ if (!res.data){
|
|
|
|
+ this.twarehousecheckdetailList.fCheckFid = scope.row.fCheckFid
|
|
|
|
+ this.twarehousecheckdetailList.fItemFid = scope.row.fId
|
|
|
|
+ this.twarehousecheckdetailList.fPhotoUrl = []
|
|
|
|
+ }
|
|
})
|
|
})
|
|
- this.picturefId = scope.row.fId
|
|
|
|
this.opentwo = true
|
|
this.opentwo = true
|
|
},
|
|
},
|
|
//查看明细
|
|
//查看明细
|