Skip to content

X
xtj-ui
Commit 3b760e6b by T
Options

现场版本

parent 14422c3c
正在显示 包含 1440 行增加 和 129 行删除
public/favicon.ico
No preview for this file type
public/index.html
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<script> <script>
window._CONFIG = {}; window._CONFIG = {};
// window._CONFIG['dlURL'] = 'http://192.168.2.105:5007'; // window._CONFIG['dlURL'] = 'http://192.168.2.105:5007';
// window._CONFIG['dlURL'] = 'http://192.168.3.74:5001'; //window._CONFIG['dlURL'] = 'http://192.168.3.188:5007';
window._CONFIG['dlURL'] = 'http://41.204.124.248:5001'; window._CONFIG['dlURL'] = 'http://41.204.124.248:5001';
</script> </script>
......
src/main.js
...@@ -33,9 +33,9 @@ Vue.config.productionTip = false ...@@ -33,9 +33,9 @@ Vue.config.productionTip = false
// axios.defaults.baseURL = 'http://192.168.3.74:5001' // axios.defaults.baseURL = 'http://192.168.3.74:5001'
//开发环境 //开发环境
axios.defaults.baseURL = 'http://192.168.3.188:5007' //axios.defaults.baseURL = 'http://192.168.3.188:5007'
//现场 //现场
// axios.defaults.baseURL = 'http://41.204.124.248:5001' axios.defaults.baseURL = 'http://41.204.124.248:5001'
// 配置请求超时 // 配置请求超时
......
src/store/index.js
...@@ -29,7 +29,7 @@ export default new Vuex.Store({ ...@@ -29,7 +29,7 @@ export default new Vuex.Store({
{ {
id: 1, id: 1,
path: '/borrow', path: '/borrow',
menuName: '借用/领用管理', menuName: '借领管理',
icon: "iconfont icon-Home", icon: "iconfont icon-Home",
children: [ children: [
{ {
...@@ -165,7 +165,7 @@ export default new Vuex.Store({ ...@@ -165,7 +165,7 @@ export default new Vuex.Store({
{ {
id: 6 - 3, id: 6 - 3,
path: "/systemConfig/police", path: "/systemConfig/police",
menuName: "人员设置", menuName: "人员管理",
// icon: 'icon-Export', // icon: 'icon-Export',
} }
], ],
......
src/views/baseInfo/Materiel.vue
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
v-model="searchData.IsHaoCai" v-model="searchData.IsHaoCai"
filterable filterable
clearable clearable
placeholder="请选择是否为耗材" placeholder="请选择是否贴标"
> >
<el-option <el-option
v-for="item in optionsEquipment" v-for="item in optionsEquipment"
...@@ -213,9 +213,9 @@ ...@@ -213,9 +213,9 @@
<td class="textContent"> <td class="textContent">
{{ detailData.Unit }} {{ detailData.Unit }}
</td> </td>
<th class="textHeader">所否为消耗品</th> <th class="textHeader">是否贴标</th>
<td class="textContentLast"> <td class="textContentLast">
{{ detailData.IsHaoCai == 1 ? "是" : "否" }} {{ detailData.IsHaoCai == 1 ? "未贴标" : "已贴标" }}
</td> </td>
</tr> </tr>
<tr style="border-bottom: 1px solid #e8e8e8"> <tr style="border-bottom: 1px solid #e8e8e8">
...@@ -259,11 +259,17 @@ ...@@ -259,11 +259,17 @@
<th class="textHeader">视频查看</th> <th class="textHeader">视频查看</th>
<td class="textContentLast"> <td class="textContentLast">
<video v-if="detailData.VideoUrl !=''&& detailData.VideoUrl !=null" <video v-if="detailData.VideoUrl !=''&& detailData.VideoUrl !=null"
v-bind:src="detailData.VideoUrl" v-bind:src="'http://41.204.124.248:5001/' +detailData.videoUrl"
class="avatar video-avatar" class="avatar video-avatar"
controls="controls"> controls="controls">
您的浏览器不支持视频播放 您的浏览器不支持视频播放
</video> </video>
<!-- <video v-if="detailData.VideoUrl !=''&& detailData.VideoUrl !=null"
v-bind:src="'http://192.168.3.188:5007/' + detailData.VideoUrl"
class="avatar video-avatar"
controls="controls">
您的浏览器不支持视频播放
</video> -->
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -412,7 +418,7 @@ ...@@ -412,7 +418,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="视频上传" class="diaC" > <el-form-item label="视频上传" class="diaC" >
<!-- action="http://192.168.2.105:5007/api/UpFile/UploadVideo" --> <!-- action="http://192.168.3.188:5007/api/UpFile/UploadVideo" -->
<el-upload <el-upload
class="avatar-uploader" class="avatar-uploader"
...@@ -423,8 +429,14 @@ ...@@ -423,8 +429,14 @@
v-bind:on-success="handleVideoSuccess" v-bind:on-success="handleVideoSuccess"
v-bind:before-upload="beforeUploadVideo" v-bind:before-upload="beforeUploadVideo"
v-bind:show-file-list="false"> v-bind:show-file-list="false">
<!-- <video v-if="videoForm.storageurl !='' && !videoFlag"
v-bind:src="'http://192.168.3.188:5007/'+videoForm.storageurl"
class="avatar video-avatar"
controls="controls">
您的浏览器不支持视频播放
</video> -->
<video v-if="videoForm.storageurl !='' && !videoFlag" <video v-if="videoForm.storageurl !='' && !videoFlag"
v-bind:src="videoForm.storageurl" v-bind:src="'http://41.204.124.248:5001/'+videoForm.storageurl"
class="avatar video-avatar" class="avatar video-avatar"
controls="controls"> controls="controls">
您的浏览器不支持视频播放 您的浏览器不支持视频播放
...@@ -530,15 +542,15 @@ export default { ...@@ -530,15 +542,15 @@ export default {
}, },
{ {
value: "1", value: "1",
label: "耗材", label: "未贴标",
}, },
{ {
value: "0", value: "0",
label: "非耗材", label: "已贴标",
}, },
], ],
videoForm: { videoForm: {
storageurl: ""// 视频地址 storageurl: "",// 视频地址
}, },
searchData: { searchData: {
Page: 1, Page: 1,
...@@ -584,7 +596,8 @@ storageurl: ""// 视频地址 ...@@ -584,7 +596,8 @@ storageurl: ""// 视频地址
borrowTableVisible: false, borrowTableVisible: false,
detailData: { detailData: {
MaterielCode: "", MaterielCode: "",
VideoUrl:"" VideoUrl:"",
//videoUrlSrc:""
}, },
fixdetailData: [], fixdetailData: [],
loading: false, loading: false,
...@@ -672,11 +685,21 @@ storageurl: ""// 视频地址 ...@@ -672,11 +685,21 @@ storageurl: ""// 视频地址
beforeUploadVideo(file) { beforeUploadVideo(file) {
var fileSize = file.size / 1024 / 1024 < 50; var fileSize = file.size / 1024 / 1024 < 50;
if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'video/mov'].indexOf(file.type) == -1) { if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'video/mov'].indexOf(file.type) == -1) {
layer.msg("请上传正确的视频格式"); //layer.msg("请上传正确的视频格式");
this.$message({
message: "请上传正确的视频格式",
type: "warning",
})
return false; return false;
} }
if (!fileSize) { if (!fileSize) {
layer.msg("视频大小不能超过50MB"); //layer.msg("视频大小不能超过50MB");
this.$message({
message: "视频大小不能超过50MB",
type: "warning",
})
return false; return false;
} }
this.isShowUploadVideo = false; this.isShowUploadVideo = false;
...@@ -697,10 +720,10 @@ console.log("up") ...@@ -697,10 +720,10 @@ console.log("up")
if (res.Success === true) { if (res.Success === true) {
this.$message.success('视频上传成功') this.$message.success('视频上传成功')
// this.videoForm.storageurl = 'http://192.168.3.74:5001/'+res.Info // this.videoForm.storageurl = 'http://192.168.3.74:5001/'+res.Info
// this.videoForm.storageurl = 'http://192.168.2.105:5007/'+res.Info this.videoForm.storageurl = res.Info
this.videoForm.storageurl = 'http://41.204.124.248:5001/'+res.Info //this.videoForm.storageurl = 'http://41.204.124.248:5001/'+res.Info
console.log("imgUrl",this.videoForm.storageurl) console.log("vUrl",this.videoForm.storageurl)
} else { } else {
this.$message.error('视频上传失败，请重新上传！') this.$message.error('视频上传失败，请重新上传！')
} }
...@@ -709,6 +732,8 @@ console.log("up") ...@@ -709,6 +732,8 @@ console.log("up")
check(row) { check(row) {
this.borrowTableVisible = true; this.borrowTableVisible = true;
this.detailData = row; this.detailData = row;
//this.detailData.videoUrlSrc=window._CONFIG['dlURL']+'/'+videoUrl;
//console.log(this.detailData.videoUrl)
console.log("de",this.detailData) console.log("de",this.detailData)
}, },
//编辑信息 //编辑信息
...@@ -720,7 +745,7 @@ console.log("up") ...@@ -720,7 +745,7 @@ console.log("up")
this.EditRuleForm = JSON.parse(JSON.stringify(row)); this.EditRuleForm = JSON.parse(JSON.stringify(row));
if (row.VideoUrl!=null) if (row.VideoUrl!=null)
{ {
this.videoForm.storageurl=JSON.parse(JSON.stringify(row.VideoUrl)); this.videoForm.storageurl=JSON.parse(JSON.stringify(row.VideoUrl));
} }
this.title = "修改物料"; this.title = "修改物料";
......
src/views/baseInfo/equipmentManage.vue
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
style="height: 40px" style="height: 40px"
class="funcButton" class="funcButton"
@click="addEquipment()" @click="addEquipment()"
>添加装备</el-button >添加装备（未贴标）</el-button
> >
</el-form> </el-form>
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
<th class="textHeader">视频查看</th> <th class="textHeader">视频查看</th>
<td class="textContentLast"> <td class="textContentLast">
<video height="250px" width="300px" v-if="videoUrl !=''&& videoUrl !=null" <video height="250px" width="300px" v-if="videoUrl !=''&& videoUrl !=null"
v-bind:src="videoUrl" v-bind:src="videoUrlSrc"
class="avatar video-avatar" class="avatar video-avatar"
controls="controls"> controls="controls">
您的浏览器不支持视频播放 您的浏览器不支持视频播放
...@@ -497,7 +497,7 @@ ...@@ -497,7 +497,7 @@
<el-form-item class="diaB" label="采购日期"> <el-form-item class="diaB" label="采购日期">
<el-date-picker <el-date-picker
v-model="ruleForm.BuyTime" v-model="ruleForm.BuyTime"
value-format="yyyy年MM月dd日" value-format="yyyy-MM-dd"
class="inputA" class="inputA"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
...@@ -533,9 +533,9 @@ ...@@ -533,9 +533,9 @@
</el-form-item> </el-form-item>
<el-form-item class="diaB" label="报废日期"> <el-form-item class="diaB" label="报废日期">
<el-date-picker <el-date-picker
class="inputA"
value-format="yyyy年MM月dd日"
v-model="ruleForm.TermTime" v-model="ruleForm.TermTime"
class="inputA"
value-format="yyyy-MM-dd"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
> >
...@@ -708,6 +708,7 @@ export default { ...@@ -708,6 +708,7 @@ export default {
IsPublic: [{ required: true, message: "请选择类型", trigger: "blur" }], IsPublic: [{ required: true, message: "请选择类型", trigger: "blur" }],
}, },
videoUrl:"", videoUrl:"",
videoUrlSrc:"",
IsPublicType: [ IsPublicType: [
{ {
value: 0, value: 0,
...@@ -747,8 +748,8 @@ export default { ...@@ -747,8 +748,8 @@ export default {
], ],
aaa: "", aaa: "",
classDis: false, classDis: false,
peopleShow: true, peopleShow: false,
warehouseSelect: false, warehouseSelect: true,
usersOption: [], usersOption: [],
sizeOption: [], sizeOption: [],
MaterielOption: [], MaterielOption: [],
...@@ -781,7 +782,7 @@ export default { ...@@ -781,7 +782,7 @@ export default {
}, },
], ],
selectShow: false, selectShow: true,
searchData: { searchData: {
Page: 1, Page: 1,
Rows: 10, Rows: 10,
...@@ -829,11 +830,11 @@ export default { ...@@ -829,11 +830,11 @@ export default {
ruleForm: { ruleForm: {
ID: 0, ID: 0,
EqType: 0, EqType: 0,
IsPubilc: 2, //IsPubilc: 1,
EqName: "", EqName: "",
EqCode: "", EqCode: "",
BuyTime: "", BuyTime: null,
TermTime: "", TermTime: null,
Price: 1, Price: 1,
BaoYangDays: 1, BaoYangDays: 1,
Remarks: "", Remarks: "",
...@@ -841,7 +842,7 @@ export default { ...@@ -841,7 +842,7 @@ export default {
EqHaoCai: 1, EqHaoCai: 1,
EqCount: 1, EqCount: 1,
policeUserID: "", policeUserID: "",
IsPublic: 2, IsPublic: 1,
CategoryID: "", CategoryID: "",
CategoryName: "", CategoryName: "",
EqSizeId: "", EqSizeId: "",
...@@ -876,20 +877,20 @@ export default { ...@@ -876,20 +877,20 @@ export default {
resetForm() { resetForm() {
console.log("aaa") console.log("aaa")
this.$refs["ruleForm"].resetFields(); this.$refs["ruleForm"].resetFields();
this.peopleShow = true; this.peopleShow = false;
this.warehouseSelect = false; this.warehouseSelect = true;
this.selectShow = false; this.selectShow = true;
this.MaterielOption = []; this.MaterielOption = [];
this.storageOption = []; this.storageOption = [];
this.warehouseOption = []; this.warehouseOption = [];
this.ruleForm = { this.ruleForm = {
ID: 0, ID: 0,
EqType: 2, EqType: 2,
IsPubilc: 2, //IsPubilc: 1,
EqName: "", EqName: "",
EqCode: "", EqCode: "",
BuyTime: "", BuyTime: null,
TermTime: "", TermTime: null,
Price: 1, Price: 1,
BaoYangDays: 1, BaoYangDays: 1,
Remarks: "", Remarks: "",
...@@ -900,7 +901,7 @@ export default { ...@@ -900,7 +901,7 @@ export default {
IsNormal: "", IsNormal: "",
EqCount: 1, EqCount: 1,
policeUserID: "", policeUserID: "",
IsPublic: 2, IsPublic: 1,
CategoryID: "", CategoryID: "",
CategoryName: "", CategoryName: "",
EqSizeId: "", EqSizeId: "",
...@@ -995,7 +996,7 @@ export default { ...@@ -995,7 +996,7 @@ export default {
const formData = new FormData(); const formData = new FormData();
formData.append("ID", this.ruleForm.ID); formData.append("ID", this.ruleForm.ID);
formData.append("EqType", this.ruleForm.EqType); formData.append("EqType", this.ruleForm.EqType);
formData.append("IsPubilc", this.ruleForm.IsPublic.toString()); formData.append("IsPublic", this.ruleForm.IsPublic.toString());
formData.append("EqCode", this.ruleForm.EqCode); formData.append("EqCode", this.ruleForm.EqCode);
formData.append("EqName", this.ruleForm.EqName); formData.append("EqName", this.ruleForm.EqName);
...@@ -1024,7 +1025,7 @@ export default { ...@@ -1024,7 +1025,7 @@ export default {
}, },
}; };
if (type === "添加装备(耗材)") { if (type === "添加装备(未贴标)") {
const { data: res } = await this.$axios.post( const { data: res } = await this.$axios.post(
"/api/Equipment", "/api/Equipment",
formData, formData,
...@@ -1057,6 +1058,7 @@ export default { ...@@ -1057,6 +1058,7 @@ export default {
this.detailData = res; this.detailData = res;
console.log("ro",row) console.log("ro",row)
this.videoUrl=row.VideoUrl; this.videoUrl=row.VideoUrl;
this.videoUrlSrc=window._CONFIG['dlURL']+'/'+this.videoUrl;
}, },
//删除预案 //删除预案
deleteClick(row) { deleteClick(row) {
...@@ -1083,7 +1085,7 @@ export default { ...@@ -1083,7 +1085,7 @@ export default {
//添加装备 //添加装备
async addEquipment() { async addEquipment() {
this.classDis = false; this.classDis = false;
this.title = "添加装备(耗材)"; this.title = "添加装备(未贴标)";
this.addVisible = true; this.addVisible = true;
const { data: resclass } = await this.$axios.get("api/EqCategory", { const { data: resclass } = await this.$axios.get("api/EqCategory", {
params: this.searchEqCategoryData, params: this.searchEqCategoryData,
......
src/views/baseInfo/size.vue
...@@ -278,11 +278,11 @@ export default { ...@@ -278,11 +278,11 @@ export default {
}, },
{ {
value: "1", value: "1",
label: "耗材", label: "未贴标",
}, },
{ {
value: "0", value: "0",
label: "非耗材", label: "已贴标",
}, },
], ],
searchEqCategoryData: { searchEqCategoryData: {
......
src/views/borrow/borrowGet.vue
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
style="height: 40px; margin-left: 10px" style="height: 40px; margin-left: 10px"
class="funcButton" class="funcButton"
@click="addRecive(0)" @click="addRecive(0)"
>借用下发(耗材)</el-button >借用下发(未贴标)</el-button
> >
<el-button <el-button
type="primary" type="primary"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
style="height: 40px" style="height: 40px"
class="funcButton" class="funcButton"
@click="addRecive(1)" @click="addRecive(1)"
>借用下发(非耗材)</el-button >借用下发(已贴标)</el-button
> >
</el-form> </el-form>
...@@ -287,10 +287,20 @@ ...@@ -287,10 +287,20 @@
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column
prop="NameAndCode"
label="装备名称"
align="center"
>
</el-table-column>
<el-table-column prop="EqSizeName" label="号型" align="center"> <el-table-column prop="EqSizeName" label="号型" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="LyCount" label="借用数量" align="center"> <el-table-column prop="LyCount" label="借用数量" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="OutTime" label="借出时间" align="center">
</el-table-column>
<el-table-column prop="ReturnTime" label="归还时间" align="center">
</el-table-column>
</el-table> </el-table>
</template> </template>
</el-card> </el-card>
...@@ -938,6 +948,8 @@ export default { ...@@ -938,6 +948,8 @@ export default {
Order: "ESC", Order: "ESC",
MaterielId: "", MaterielId: "",
EqSizeId: "", EqSizeId: "",
State: 0,
IsNoBorrow: true
}, },
searchMaterielData: { searchMaterielData: {
Page: 1, Page: 1,
...@@ -1114,7 +1126,7 @@ export default { ...@@ -1114,7 +1126,7 @@ export default {
this.AddPlanForm.EquipmentName=obj.NameAndCode; this.AddPlanForm.EquipmentName=obj.NameAndCode;
this.AddPlanForm.EquipmentId = obj.ID; this.AddPlanForm.EquipmentId = obj.ID;
this.AddPlanForm.NameAndCode = obj.NameAndCode; this.AddPlanForm.NameAndCode = obj.NameAndCode;
this.AddPlanForm.LabelEpc = obj.LabelEpc; this.AddPlanForm.epc = obj.LabelEpc;
console.log("val",this.AddPlanForm) console.log("val",this.AddPlanForm)
} }
else else
...@@ -1266,7 +1278,7 @@ export default { ...@@ -1266,7 +1278,7 @@ export default {
EqSizeCode: this.AddPlanForm.EqSizeCode, EqSizeCode: this.AddPlanForm.EqSizeCode,
NameAndCode: this.AddPlanForm.NameAndCode, NameAndCode: this.AddPlanForm.NameAndCode,
EquipmentId: this.AddPlanForm.EquipmentId, EquipmentId: this.AddPlanForm.EquipmentId,
LabelEpc: this.AddPlanForm.LabelEpc, epc: this.AddPlanForm.epc,
}; };
console.log("添加物资", plan); console.log("添加物资", plan);
obj = this.NHCruleForm.BorrowList.find(function (item) { obj = this.NHCruleForm.BorrowList.find(function (item) {
...@@ -1318,9 +1330,9 @@ export default { ...@@ -1318,9 +1330,9 @@ export default {
}, },
stateFormat(row) { stateFormat(row) {
if (row.IsHaoCai === 0) { if (row.IsHaoCai === 0) {
return "非耗材"; return "已贴标";
} else if(row.IsHaoCai===1) { } else if(row.IsHaoCai===1) {
return "耗材"; return "未贴标";
} }
else else
{ {
...@@ -1347,12 +1359,12 @@ export default { ...@@ -1347,12 +1359,12 @@ export default {
console.log(row); console.log(row);
if (row === 0) { if (row === 0) {
//耗材0 //耗材0
this.title = "借用下发(耗材物资)"; this.title = "借用下发(未贴标物资)";
this.addVisible = true; this.addVisible = true;
this.ruleForm.BorrowList = []; this.ruleForm.BorrowList = [];
} //非耗材1 } //非耗材1
else { else {
this.title = "借用下发(非耗材物资)"; this.title = "借用下发(已贴标物资)";
this.NHCaddVisible = true; this.NHCaddVisible = true;
this.NHCruleForm.BorrowList = []; this.NHCruleForm.BorrowList = [];
} }
......
src/views/borrow/return.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<el-breadcrumb-item :to="{ path: '/index' }" <el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item >首页</el-breadcrumb-item
> >
<el-breadcrumb-item>借用/领用管理</el-breadcrumb-item> <el-breadcrumb-item>借领管理</el-breadcrumb-item>
<el-breadcrumb-item>归还记录</el-breadcrumb-item> <el-breadcrumb-item>归还记录</el-breadcrumb-item>
</el-breadcrumb></el-col </el-breadcrumb></el-col
> >
......
src/views/borrow/user.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }" <el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item >首页</el-breadcrumb-item
> >
<el-breadcrumb-item>借用/领用管理</el-breadcrumb-item> <el-breadcrumb-item>借领管理</el-breadcrumb-item>
<el-breadcrumb-item>人员借用</el-breadcrumb-item> <el-breadcrumb-item>人员借用</el-breadcrumb-item>
</el-breadcrumb></el-col </el-breadcrumb></el-col
> >
......
src/views/borrow/userGet.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }" <el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item >首页</el-breadcrumb-item
> >
<el-breadcrumb-item>借用/领用管理</el-breadcrumb-item> <el-breadcrumb-item>借领管理</el-breadcrumb-item>
<el-breadcrumb-item>领用管理</el-breadcrumb-item> <el-breadcrumb-item>领用管理</el-breadcrumb-item>
</el-breadcrumb></el-col </el-breadcrumb></el-col
> >
...@@ -898,7 +898,7 @@ export default { ...@@ -898,7 +898,7 @@ export default {
//下发领用 //下发领用
async addRecive() { async addRecive() {
this.title = "领用下发(耗材物资)"; this.title = "领用下发(未贴标物资)";
this.addVisible = true; this.addVisible = true;
this.ruleForm.BorrowList = []; this.ruleForm.BorrowList = [];
// //
......
src/views/home.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col" > <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col" >
<div <div
class="card-panel" class="card-panel"
@click="handleSetLineChartData('newVisitis')" @click="handleSetLineChartData('全部')"
> >
<div class="card-panel-icon-wrapper icon-people"> <div class="card-panel-icon-wrapper icon-people">
<img <img
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
/> />
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text">借用待审批</div> <div class="card-panel-text">借待审批</div>
<count-to <count-to
:start-val="0" :start-val="0"
:end-val="eqCount.h_JYWaitToExamined" :end-val="eqCount.h_JYWaitToExamined"
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
/> />
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text">领用待审批</div> <div class="card-panel-text">领待审批</div>
<count-to <count-to
:start-val="0" :start-val="0"
:end-val="eqCount.h_LYWaitToExamined" :end-val="eqCount.h_LYWaitToExamined"
......
src/views/log/doorLog.vue
...@@ -162,9 +162,8 @@ ...@@ -162,9 +162,8 @@
background background
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="searchData.pageNo" :current-page="searchData.page"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
:page-size="searchData.Page"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
/> />
......
src/views/log/outinLog.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }" <el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item >首页</el-breadcrumb-item
> >
<el-breadcrumb-item>借用/领用管理</el-breadcrumb-item> <el-breadcrumb-item>借领管理</el-breadcrumb-item>
<el-breadcrumb-item>出入库记录</el-breadcrumb-item> <el-breadcrumb-item>出入库记录</el-breadcrumb-item>
</el-breadcrumb></el-col </el-breadcrumb></el-col
> >
...@@ -96,28 +96,31 @@ ...@@ -96,28 +96,31 @@
<el-table-column prop="ID" v-if="false" /> <el-table-column prop="ID" v-if="false" />
<el-table-column prop="PhotoUrl" v-if="false" /> <el-table-column prop="PhotoUrl" v-if="false" />
<el-table-column <el-table-column
prop="Type" :formatter="stateFormat" label="类型" align="center" /> prop="Type" :formatter="stateFormat" label="类型" width="120" align="center" />
<el-table-column <el-table-column
prop="MaterielName" prop="MaterielName"
label="物料名称" label="物料名称"
width="250"
align="center" align="center"
/> />
<el-table-column prop="EqSizeName" label="号型名称" align="center" /> <el-table-column prop="EqSizeName" label="号型名称" width="200" align="center" />
<el-table-column prop="EquName" label="装备名称" align="center" /> <el-table-column prop="EquName" label="装备名称" width="250" align="center" />
<el-table-column prop="UserName" label="出入库人员" align="center" /> <el-table-column prop="UserName" label="出入库人员" width="100" align="center" />
<el-table-column <el-table-column
prop="CreateTime" prop="CreateTime"
label="出入库时间" label="出入库时间"
width="250"
align="center" align="center"
/> />
<el-table-column fixed="right" label="照片查看" width="100px" > <el-table-column fixed="right" label="照片查看" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a-button <el-button
v-if="scope.row.PhotoUrl !== null" v-if="scope.row.PhotoUrl !== null"
@click="getDetailInfo(scope.row)" @click="getDetailInfo(scope.row)"
type="primary" type="primary"
style="font-size: 15px" size="mini"
>预览</a-button
>预览</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
......
src/views/log/pdaLog.vue
...@@ -177,9 +177,8 @@ ...@@ -177,9 +177,8 @@
background background
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="searchData.pageNo" :current-page="searchData.page"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
:page-size="searchData.Page"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
/> />
......
src/views/log/systemLog.vue
...@@ -206,9 +206,8 @@ ...@@ -206,9 +206,8 @@
background background
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="searchData.pageNo" :current-page="searchData.page"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
:page-size="searchData.Page"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
/> />
......
src/views/login/Login.vue
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
{ {
id: 1, id: 1,
path: "/borrow", path: "/borrow",
menuName: "借用/领用管理", menuName: "借领管理",
icon: "资源借用", icon: "资源借用",
children: [ children: [
{ {
...@@ -260,7 +260,7 @@ export default { ...@@ -260,7 +260,7 @@ export default {
{ {
id: 6 - 3, id: 6 - 3,
path: "/systemConfig/police", path: "/systemConfig/police",
menuName: "人员设置", menuName: "人员管理",
icon: "人员设置", icon: "人员设置",
}, },
], ],
......
src/views/statistics/stock.vue
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 详细信息弹出 --> <!-- 详细信息弹出 -->
<!-- <div class="ivu-divider ivu-divider-horizontal"></div> --> <!-- <div class="ivu-divider ivu-divider-horizontal"></div> -->
<!-- 分页功能 --> <!-- 分页功能 -->
<el-row type="flex" justify="center" align="middle"> <el-row type="flex" justify="center" align="middle">
...@@ -121,9 +122,8 @@ ...@@ -121,9 +122,8 @@
background background
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="searchData.pageNo" :current-page="searchData.page"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
:page-size="searchData.Page"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
/> />
......
src/views/systemConfig/borrowApply.vue
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
style="height: 40px" style="height: 40px"
class="funcButton" class="funcButton"
@click="addHCRecive()" @click="addHCRecive()"
>耗材借用申请</el-button >借用申请（未贴标）</el-button
> >
<el-button <el-button
type="primary" type="primary"
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
style="height: 40px; margin-right: 20px" style="height: 40px; margin-right: 20px"
class="funcButton" class="funcButton"
@click="addNHCRecive()" @click="addNHCRecive()"
>非耗材借用申请</el-button >借用申请（已贴标）</el-button
> >
</el-form> </el-form>
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
class="box-card" class="box-card"
style="text-align: center; margin-top: 35px" style="text-align: center; margin-top: 35px"
> >
<label class="labelBorrow">借用装备表(耗材)</label> <label class="labelBorrow">借用装备表(未贴标)</label>
<el-divider></el-divider> <el-divider></el-divider>
<template> <template>
<el-table :data="HctableData" border class="details"> <el-table :data="HctableData" border class="details">
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
class="box-card" class="box-card"
style="text-align: center; margin-top: 35px" style="text-align: center; margin-top: 35px"
> >
<label class="labelBorrow">借用装备表(非耗材)</label> <label class="labelBorrow">借用装备表(已贴标)</label>
<el-divider></el-divider> <el-divider></el-divider>
<template> <template>
<el-table :data="NHctableData" border class="details"> <el-table :data="NHctableData" border class="details">
...@@ -309,6 +309,18 @@ ...@@ -309,6 +309,18 @@
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column
prop="OutTime"
label="出库时间"
align="center"
>
</el-table-column>
<el-table-column
prop="ReturnTime"
label="入库时间"
align="center"
>
</el-table-column>
</el-table> </el-table>
</template> </template>
</el-card> </el-card>
...@@ -832,6 +844,8 @@ export default { ...@@ -832,6 +844,8 @@ export default {
Order: "ESC", Order: "ESC",
MaterielId: "", MaterielId: "",
EqSizeId: "", EqSizeId: "",
State: 0,
IsNoBorrow: true
}, },
classOption: [], classOption: [],
MaterielOption: [], MaterielOption: [],
...@@ -843,7 +857,7 @@ export default { ...@@ -843,7 +857,7 @@ export default {
PlanName: "", PlanName: "",
PlanState: 0, PlanState: 0,
borrowType: 1, borrowType: 1,
LabelEpc: "", epc: "",
BorrowList: [ BorrowList: [
{ {
MainClass: "", MainClass: "",
...@@ -890,9 +904,9 @@ export default { ...@@ -890,9 +904,9 @@ export default {
EqSizeName: "", EqSizeName: "",
NameAndCode: "", NameAndCode: "",
LabelEpc: "", epc: "",
EquipmentId: "", EquipmentId: "",
State:0,
}, },
resetForm() { resetForm() {
(this.eqOption = []), (this.eqOption = []),
...@@ -1066,7 +1080,7 @@ export default { ...@@ -1066,7 +1080,7 @@ export default {
}, },
//新增耗材申请 //新增耗材申请
async addHCRecive() { async addHCRecive() {
this.title = "耗材借用申请"; this.title = "借用申请（未贴标）";
this.HCVisible = true; this.HCVisible = true;
this.HCruleForm.BorrowList = []; this.HCruleForm.BorrowList = [];
// console.log("rule",this.ruleForm) // console.log("rule",this.ruleForm)
...@@ -1077,7 +1091,7 @@ export default { ...@@ -1077,7 +1091,7 @@ export default {
}, },
//新增借用申请 //新增借用申请
async addNHCRecive() { async addNHCRecive() {
this.title = "非耗材借用申请"; this.title = "借用申请（已贴标）";
this.addVisible = true; this.addVisible = true;
this.ruleForm.BorrowList = []; this.ruleForm.BorrowList = [];
// console.log("rule",this.ruleForm) // console.log("rule",this.ruleForm)
...@@ -1092,7 +1106,7 @@ export default { ...@@ -1092,7 +1106,7 @@ export default {
if (row.IsHaoCai === 0) { if (row.IsHaoCai === 0) {
//非耗材 //非耗材
this.addVisible = true; this.addVisible = true;
this.title = "修改非耗材借用申请"; this.title = "修改借用申请（已贴标）";
this.addVisible = true; this.addVisible = true;
var url = "api/Borrow/" + row.ID; var url = "api/Borrow/" + row.ID;
const { data: res } = await this.$axios.get(url); const { data: res } = await this.$axios.get(url);
...@@ -1104,7 +1118,7 @@ export default { ...@@ -1104,7 +1118,7 @@ export default {
this.classOption = resclass.Rows; this.classOption = resclass.Rows;
} else { } else {
//耗材 //耗材
this.title = "修改耗材借用申请"; this.title = "修改借用申请（未贴标）";
this.HCVisible = true; this.HCVisible = true;
var url = "api/Borrow/" + row.ID; var url = "api/Borrow/" + row.ID;
const { data: res } = await this.$axios.get(url); const { data: res } = await this.$axios.get(url);
...@@ -1165,7 +1179,7 @@ export default { ...@@ -1165,7 +1179,7 @@ export default {
}); });
this.AddPlanForm.EquipmentId = obj.ID; this.AddPlanForm.EquipmentId = obj.ID;
this.AddPlanForm.NameAndCode = obj.NameAndCode; this.AddPlanForm.NameAndCode = obj.NameAndCode;
this.AddPlanForm.LabelEpc = obj.LabelEpc; this.AddPlanForm.epc = obj.LabelEpc;
} }
}, },
//获取号型的名字和ID //获取号型的名字和ID
...@@ -1335,7 +1349,7 @@ export default { ...@@ -1335,7 +1349,7 @@ export default {
EqSizeCode: this.AddPlanForm.EqSizeCode, EqSizeCode: this.AddPlanForm.EqSizeCode,
NameAndCode: this.AddPlanForm.NameAndCode, NameAndCode: this.AddPlanForm.NameAndCode,
EquipmentId: this.AddPlanForm.EquipmentId, EquipmentId: this.AddPlanForm.EquipmentId,
LabelEpc: this.AddPlanForm.LabelEpc, epc: this.AddPlanForm.epc,
}; };
console.log("添加物资", plan); console.log("添加物资", plan);
obj = this.ruleForm.BorrowList.find(function (item) { obj = this.ruleForm.BorrowList.find(function (item) {
...@@ -1433,7 +1447,7 @@ export default { ...@@ -1433,7 +1447,7 @@ export default {
}, },
//耗材提交数据 //耗材提交数据
HcsubmitForm(formName, type) { HcsubmitForm(formName, type) {
console.log("HC",this.HCruleForm); // console.log("HC",this.HCruleForm);
if (this.HCruleForm.BorrowList.length === 0) { if (this.HCruleForm.BorrowList.length === 0) {
return this.$message.warning("请添加装备"); return this.$message.warning("请添加装备");
} }
...@@ -1444,7 +1458,7 @@ export default { ...@@ -1444,7 +1458,7 @@ export default {
const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin; const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin;
this.$refs[formName].validate(async (valid) => { this.$refs[formName].validate(async (valid) => {
if (valid) { if (valid) {
if (type === "耗材借用申请") { if (type === "借用申请（未贴标）") {
const { data: res } = await this.$axios.post( const { data: res } = await this.$axios.post(
borrowUrl, borrowUrl,
this.HCruleForm this.HCruleForm
...@@ -1479,7 +1493,7 @@ export default { ...@@ -1479,7 +1493,7 @@ export default {
const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin; const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin;
this.$refs[formName].validate(async (valid) => { this.$refs[formName].validate(async (valid) => {
if (valid) { if (valid) {
if (type === "非耗材借用申请") { if (type === "借用申请（已贴标）") {
const { data: res } = await this.$axios.post( const { data: res } = await this.$axios.post(
borrowUrl, borrowUrl,
this.ruleForm this.ruleForm
...@@ -1557,9 +1571,9 @@ export default { ...@@ -1557,9 +1571,9 @@ export default {
}, },
stateFormat(row) { stateFormat(row) {
if (row.IsHaoCai === 0) { if (row.IsHaoCai === 0) {
return "非耗材"; return "已贴标";
} else if (row.IsHaoCai === 1) { } else if (row.IsHaoCai === 1) {
return "耗材"; return "未贴标";
} else { } else {
return ""; return "";
} }
......
src/views/systemConfig/equipmentInfo.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
label-position="left" label-position="left"
> >
<el-input <el-input
v-model="searchData.EqName" v-model="searchData.MaterielName"
@keypress.native.enter="onEnterPress" @keypress.native.enter="onEnterPress"
ref="nameInput" ref="nameInput"
style="width: 200px" style="width: 200px"
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
v-model="searchData.IsHaoCai" v-model="searchData.IsHaoCai"
filterable filterable
clearable clearable
placeholder="请选择是否为耗材" placeholder="请选择是否贴标"
> >
<el-option <el-option
v-for="item in optionsEquipment" v-for="item in optionsEquipment"
...@@ -188,9 +188,9 @@ ...@@ -188,9 +188,9 @@
<td class="textContent"> <td class="textContent">
{{ detailData.TermDays }} {{ detailData.TermDays }}
</td> </td>
<th class="textHeader">所否为消耗品</th> <th class="textHeader">是否贴标</th>
<td class="textContent"> <td class="textContent">
{{ detailData.IsHaoCai == 1 ? "是" : "否" }} {{ detailData.IsHaoCai == 1 ? "未贴标" : "已贴标" }}
</td> </td>
<th class="textHeader">数量</th> <th class="textHeader">数量</th>
<td class="textContentLast"> <td class="textContentLast">
...@@ -286,10 +286,10 @@ ...@@ -286,10 +286,10 @@
</el-form-item> </el-form-item>
<el-form-item class="diaB" label="是否贴标"> <el-form-item class="diaB" label="是否贴标">
<el-radio v-model="EditRuleForm.IsHaoCai" :label="1" <el-radio v-model="EditRuleForm.IsHaoCai" :label="1"
>是</el-radio >否</el-radio
> >
<el-radio v-model="EditRuleForm.IsHaoCai" :label="0" <el-radio v-model="EditRuleForm.IsHaoCai" :label="0"
>否</el-radio >是</el-radio
> >
</el-form-item> </el-form-item>
...@@ -448,11 +448,11 @@ export default { ...@@ -448,11 +448,11 @@ export default {
}, },
{ {
value: "1", value: "1",
label: "耗材", label: "未贴标",
}, },
{ {
value: "0", value: "0",
label: "非耗材", label: "已贴标",
}, },
], ],
...@@ -749,7 +749,7 @@ export default { ...@@ -749,7 +749,7 @@ export default {
this.getQueuData(); this.getQueuData();
}, },
stateFormat(row) { stateFormat(row) {
if (row.EqHaoCai === 0) { if (row.IsHaoCai == 0) {
return "已贴标"; return "已贴标";
} else { } else {
return "未贴标"; return "未贴标";
......
src/views/systemConfig/police.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<img src="../../assets/icons/3D库房.png" class="logo" alt="logo" <img src="../../assets/icons/3D库房.png" class="logo" alt="logo"
/></el-col> /></el-col>
<el-col :span="2" <el-col :span="2"
><span class="fontStyle">人员设置</span><br /><span></span> ><span class="fontStyle">人员管理</span><br /><span></span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
>首页</el-breadcrumb-item >首页</el-breadcrumb-item
> >
<el-breadcrumb-item>系统设置 </el-breadcrumb-item> <el-breadcrumb-item>系统设置 </el-breadcrumb-item>
<el-breadcrumb-item>人员设置</el-breadcrumb-item> <el-breadcrumb-item>人员管理</el-breadcrumb-item>
</el-breadcrumb></el-col </el-breadcrumb></el-col
> >
</el-row> </el-row>
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="PoliceTypeName" prop="PoliceCategoryldName"
label="所属所属警种" label="所属所属警种"
align="center" align="center"
></el-table-column> ></el-table-column>
......
src/views/systemConfig/receiveApply.vue
...@@ -753,7 +753,7 @@ export default { ...@@ -753,7 +753,7 @@ export default {
}, },
//新增领用申请 //新增领用申请
async addRecive() { async addRecive() {
this.title = "领用申请(耗材物资)"; this.title = "领用申请(未贴标物资)";
this.addVisible = true; this.addVisible = true;
this.ruleForm.BorrowList = []; this.ruleForm.BorrowList = [];
// console.log("rule",this.ruleForm) // console.log("rule",this.ruleForm)
...@@ -956,7 +956,7 @@ export default { ...@@ -956,7 +956,7 @@ export default {
const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin; const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin;
this.$refs[formName].validate(async (valid) => { this.$refs[formName].validate(async (valid) => {
if (valid) { if (valid) {
if (type === "领用申请(耗材物资)") { if (type === "领用申请(未贴标物资)") {
const { data: res } = await this.$axios.post( const { data: res } = await this.$axios.post(
borrowUrl, borrowUrl,
this.ruleForm this.ruleForm
......
src/views/warehouse/cabEditEquForm.vue 0 → 100644
<template>
<el-dialog
width="36%"
:close-on-click-modal="false"
:title="title"
:visible.sync=" editVisible"
@close="closeForm('ruleForm')"
>
<el-form
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="100px"
style="margin-top: 43px"
>
<el-row :gutter="50">
<el-form-item class="diaC" label="装备类别" prop="CategoryID">
<el-select
v-model="ruleForm.CategoryID"
filterable
clearable
style="width: 470px"
@change="getClass"
:disabled="classDis"
placeholder="请选择大类"
>
<el-option
v-for="item in classOption"
:key="item.ID"
:label="item.EqCategoryName"
:value="item.ID"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="diaC" label="装备物料" prop="MaterielId">
<el-select
v-model="ruleForm.MaterielId"
filterable
clearable
style="width: 470px"
@change="getMateriel"
:disabled="classDis"
placeholder="请选择物料"
>
<el-option
v-for="item in MaterielOption"
:key="item.ID"
:label="item.MaterielName"
:value="item.ID"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="diaC" label="装备号型">
<el-select
v-model="ruleForm.EqSizeId"
filterable
style="width: 470px"
clearable
:disabled="classDis"
@change="getIDAndName"
placeholder="请选择号型"
>
<el-option
v-for="item in sizeOption"
:key="item.ID"
:label="item.EqSizeName"
:value="item.ID"
>
</el-option>
</el-select>
</el-form-item>
<el-col :span="10" style="padding-left: 0px">
<el-form-item class="diaB" label="装备编号" prop="EqCode">
<el-input
class="inputA"
v-model="ruleForm.EqCode"
placeholder="请输入编号"
></el-input>
</el-form-item>
<el-form-item class="diaB" label="采购日期">
<el-date-picker
v-model="ruleForm.BuyTime"
value-format="yyyy-MM-dd"
class="inputA"
type="date"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
<el-form-item class="diaB" label="保养周期">
<template>
<el-input-number
v-model="ruleForm.BaoYangDays"
:min="1"
:max="10000"
></el-input-number>
</template>
</el-form-item>
<el-form-item class="diaB" label="数量" prop="EqCount">
<template>
<el-input-number
v-model="ruleForm.EqCount"
:min="1"
:max="10000"
></el-input-number>
</template>
</el-form-item>
</el-col>
<el-col :span="10" style="padding-left: 0px">
<el-form-item label="装备名称" class="diaB" prop="EqName">
<el-input
class="inputA"
v-model="ruleForm.EqName"
placeholder="请输入名称"
></el-input>
</el-form-item>
<el-form-item class="diaB" label="报废日期">
<el-date-picker
class="inputA"
value-format="yyyy-MM-dd"
v-model="ruleForm.TermTime"
type="date"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
<el-form-item class="diaB" label="采购价格">
<template>
<el-input-number
v-model="ruleForm.Price"
:min="1"
:max="10000"
></el-input-number>
</template>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注" style="font-weight: 800">
<el-input
class="labelClassT"
type="textarea"
:rows="2"
v-model="ruleForm.Remarks"
></el-input>
</el-form-item>
<el-divider content-position="left"> 位置信息</el-divider>
<el-form
:model="ruleForm"
ref="ruleForm2"
label-width="100px"
style="margin-top: 10px"
>
<el-row :gutter="50">
<el-form-item class="diaB" label="装备类型" prop="IsPublic">
<el-select
v-model="ruleForm.IsPublic"
style="width: 458px"
@change="equipmentTypeChange"
placeholder="请选择装备类型"
>
<el-option
v-for="item in typeoption"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-col :span="10" style="padding-left: 0px">
<el-form-item label="所属人员" class="diaB" v-if="peopleShow">
<el-select
v-model="ruleForm.policeUserID"
style="width: 208px"
placeholder="请选择所属人员"
filterable
clearable
>
<el-option
v-for="item in usersOption"
:key="item.ID"
:label="`${item.UserName}-${item.DepartName}-${item.PoliceTypeName}`"
:value="item.ID"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="仓库选择"
class="diaB"
v-if="warehouseSelect"
prop="LibraryID"
>
<el-select
v-model="ruleForm.LibraryID"
style="width: 204px"
@change="warehouseChange"
>
<el-option
v-for="item in warehouseOption"
:key="item.LibraryID"
:label="`${item.LibaryName}-${item.LibaryTypeName}`"
:value="item.LibraryID"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10" style="padding-left: 0px">
<el-form-item label="储柜选择" v-if="selectShow" class="diaB">
<el-select
v-model="ruleForm.LocationId"
style="width: 204px"
filterable
clearable
@change="storageChange"
>
<el-option
v-for="item in storageOption"
:key="item.StorageCode"
:label="`${item.StorageTypeName}-${item.LocationCode}`"
:value="item.StorageCode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="editVisible = false">取 消</el-button>
<el-button type="primary" @click="submitForm('ruleForm', title)"
>提交</el-button
>
</span>
</el-dialog>
</template>
<script>
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
components: { Treeselect },
inject:['reload'],
data() {
var checkMobile = (rule, value, cb) => {
// 验证手机的正则表达式
console.log(rule, value);
const regMobile =
/^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/;
const fg = regMobile.test(value);
if (fg) {
return cb();
}
cb(new Error("手机号码不合法"));
};
return {
rules: {
CategoryID: [
{ required: true, message: "请选择装备类型", trigger: "change" },
],
MaterielId: [
{ required: true, message: "请选择装备物料", trigger: "change" },
],
EqCode: [
{ required: true, message: "请输入装备编号", trigger: "blur" },
{ min: 1, message: "请输入装备编号", trigger: "blur" },
],
EqName: [
{ required: true, message: "请输入装备名称", trigger: "blur" },
{ min: 1, message: "请输入装备名称", trigger: "blur" },
],
IsPublic: [{ required: true, message: "请选择类型", trigger: "blur" }],
},
videoUrl:"",
IsPublicType: [
{
value: 0,
label: "全部",
},
{
value: 1,
label: "公共装备",
},
{
value: 2,
label: "单警装备",
},
],
StateType: [
{
value: "-1",
label: "全部",
},
{
value: "0",
label: "在架",
},
{
value: "1",
label: "出库",
},
{
value: "2",
label: "维修",
},
{
value: "3",
label: "报废",
}
],
aaa: "",
classDis: false,
peopleShow: false,
warehouseSelect: true,
usersOption: [],
sizeOption: [],
MaterielOption: [],
classOption: [],
editVisible: false,
warehouseOption: [],
options: [],
normalizer(node) {
//去掉children=[]的children属性
if (node.Children && !node.Children.length) {
delete node.Children;
}
return {
id: node.ID,
//将name转换成必填的label键
label: node.DepartName,
children: node.Children,
};
},
storageOption: [],
typeoption: [
{
value: 1,
label: "公共装备",
},
{
value: 2,
label: "单警装备",
},
],
selectShow: true,
searchData: {
Page: 1,
Rows: 10,
Sort: "ID",
Order: "ESC",
LibraryID: "",
CategoryID: "",
Epc: "",
LibraryName: "",
PoliceName: "",
EqName: "",
IsPublic: "",
State: "",
EqType: "",
userID: "",
},
title: "",
searchUserData: {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ESC",
UserName: "",
DeparId: "",
},
fixData: {
Page: 1,
Rows: 10,
MatId: "",
Order: "ESC",
Sort: "ID",
},
searchWarehouseData: {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "DESC",
},
searchEqCategoryData: {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ASC",
},
ruleForm: {
ID: 0,
EqType: 0,
//IsPubilc: 1,
EqName: "",
EqCode: "",
BuyTime: null,
TermTime: null,
Price: 1,
BaoYangDays: 1,
Remarks: "",
StorageCode: "",
EqHaoCai: 1,
EqCount: 1,
policeUserID: "",
IsPublic: 1,
CategoryID: "",
CategoryName: "",
EqSizeId: "",
MaterielId: "",
LibraryID: "",
LocationId: "",
LocationName: "",
LocationCode: "",
},
searchClassData: {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ESC",
CategoryID: "",
IsHaoCai:1
},
searchMaterielData: {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ESC",
MaterielId: "",
},
searchStorageData: {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ESC",
LibraryID: "",
},
resetForm() {
console.log("aaa")
this.$refs["ruleForm"].resetFields();
this.peopleShow = false;
this.warehouseSelect = true;
this.selectShow = true;
this.MaterielOption = [];
this.storageOption = [];
this.warehouseOption = [];
this.ruleForm = {
ID: 0,
EqType: 2,
//IsPubilc: 1,
EqName: "",
EqCode: "",
BuyTime: null,
TermTime: null,
Price: 1,
BaoYangDays: 1,
Remarks: "",
MaterielName: "",
StorageCode: "",
Enclosure: "",
EqHaoCai: 1,
IsNormal: "",
EqCount: 1,
policeUserID: "",
IsPublic: 1,
CategoryID: "",
CategoryName: "",
EqSizeId: "",
EqSizeName: "",
MaterielId: "",
MaterielCode: "",
LocationId: "",
LocationName: "",
LocationCode: "",
LibraryID: "",
LibraryName: "",
};
},
eqNewName:"",
eqNewCode:"",
classNewName:"",
classNewCode:"",
detailData: [],
fixdetailData: [],
loading: false,
tabLoading: false,
activeName: "first",
input: "",
form: {},
tableData: [],
fixres: [],
upkeepData: [],
imgurl: [],
borrowData: [],
borrowTableVisible: false,
picVisible: false,
formLabelWidth: "120px",
history_Num: "",
// 总条数
total: 0,
};
},
created() {
this.InitQuery();
this.getQueuData();
this.getUserInfo();
},
methods: {
// 获取当前选中部门的名称
selectDepart(node) {
console.log(node);
this.searchData.userID = node.ID;
// console.log("parentId", ruleForm.parentId);
},
//提交表单
submitForm(formName, type) {
console.log("RU", this.ruleForm);
const that = this
// if (!this.ruleForm.CategoryID) {
// return this.$message.warning("请选择装备类型");
// }
// if (!this.ruleForm.MaterielId) {
// return this.$message.warning("请选择装备物料");
// }
// if (!this.ruleForm.EqSizeId) {
// return this.$message.warning("请选择装备号型");
// }
// if (!this.ruleForm.EqName) {
// return this.$message.warning("请输入装备名称");
// }
this.$refs[formName].validate(async (valid) => {
if (valid) {
if (this.ruleForm.IsPublic === 1) {
if (!this.ruleForm.LibraryID) {
return this.$message.warning("请选择仓库");
}
if (!this.ruleForm.LocationId) {
return this.$message.warning("请选择储柜");
}
}
if (this.ruleForm.IsPublic === 2) {
if (!this.ruleForm.policeUserID) {
return this.$message.warning("请选择所属人员");
}
}
var policeUserID="";
if(that.ruleForm.policeUserID!=undefined)
{
policeUserID=that.ruleForm.policeUserID.toString();
}
console.log("rulePolice",that.ruleForm.policeUserID)
console.log(policeUserID)
const formData = new FormData();
formData.append("ID", this.ruleForm.ID);
formData.append("EqType", this.ruleForm.EqType);
formData.append("IsPublic", this.ruleForm.IsPublic.toString());
formData.append("EqCode", this.ruleForm.EqCode);
formData.append("EqName", this.ruleForm.EqName);
formData.append("BuyTime", this.ruleForm.BuyTime);
formData.append("TermTime", this.ruleForm.TermTime);
formData.append("Price", this.ruleForm.Price);
formData.append("BaoYangDays", this.ruleForm.BaoYangDays);
formData.append("Remarks", this.ruleForm.Remarks===null?"":this.ruleForm.Remarks);
formData.append("EqHaoCai", this.ruleForm.EqHaoCai);
formData.append("StorageCode", this.ruleForm.StorageCode);
formData.append("EqCount", this.ruleForm.EqCount);
formData.append(
"UserId",policeUserID
);
formData.append("CategoryID", this.ruleForm.CategoryID);
formData.append("EqSizeId", this.ruleForm.EqSizeId);
formData.append("MaterielId", this.ruleForm.MaterielId);
formData.append("LocationId", this.ruleForm.LocationId);
formData.append("LocationCode", this.ruleForm.LocationName);
formData.append("LocationName", this.ruleForm.LocationName);
formData.append("LibraryID", this.ruleForm.LibraryID);
const config = {
headers: {
"Content-Type": "multipart/form-data",
},
};
if (type === "添加装备(未贴标)") {
const { data: res } = await this.$axios.post(
"/api/Equipment",
formData,
config
);
if (res.Success !== true) return this.$message(res.message);
} else {
//修改
console.log(that.ruleForm.IsPublic, formData)
const { data: res } = await this.$axios.put(
"/api/Equipment",
formData,
config
);
if (res.Success !== true) return this.$message(res.message);
}
this.getQueuData();
this. editVisible = false;
} else {
return false;
}
});
this.reload();
},
//查看信息
async check(row) {
this.borrowTableVisible = true;
const borrowUrl = "/api/Equipment/" + row.ID;
const { data: res } = await this.$axios.get(borrowUrl);
if (res.Success == false) return this.$message(res.Remark);
this.detailData = res;
console.log("ro",row)
this.videoUrl=row.VideoUrl;
},
//删除预案
deleteClick(row) {
const url = "/api/Equipment/EQ/" + row.ID;
this.$confirm("此操作将永久删除该条数据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(async () => {
const { data: res } = await this.$axios.delete(url);
if (res.Success === true) {
this.getQueuData();
this.$message.success("已删除该数据");
} else {
this.$message.error(res.Remark);
}
})
.catch((e) => {
this.$message.error("已取消删除");
});
},
//选择橱柜
storageChange(val) {
if (val !== "") {
console.log(val);
var obj = {};
obj = this.storageOption.find(function (item) {
return item.LocationId === val;
});
console.log("obj", this.storageOption);
this.ruleForm.LocationName = obj.StorageCode;
this.ruleForm.LocationCode = obj.StorageCode;
}
},
//关闭窗口
closeForm() {
this.resetForm();
this. editVisible = false;
},
///获取物料内容
async getClass(val) {
this.ruleForm.EqCode="";
this.ruleForm.EqName="";
this.ruleForm.MaterielId = "";
this.ruleForm.EqSizeId = "";
if (val !== "") {
this.searchClassData.CategoryID = val;
const { data: res } = await this.$axios.get("api/Materiel", {
params: this.searchClassData,
});
var obj = {};
obj = this.classOption.find(function (item) {
return item.ID === val;
});
this.MaterielOption = res.Rows;
}
},
//获取号型的名字和ID
async getIDAndName(val) {
this.ruleForm.EqCode="";
this.ruleForm.EqName="";
if (val !== "") {
var obj = {};
obj = this.sizeOption.find(function (item) {
return item.ID === val;
});
console.log(obj)
this.ruleForm.EqCode=this.eqNewCode+obj.Code;
this.ruleForm.EqName=this.eqNewName+"("+obj.EqSizeName+")";
this.ruleForm.EqSizeId = obj.ID;
this.ruleForm.EqSizeName = obj.EqSizeName;
}
},
//修改装备
async edit(row) {
this.classDis = true;
this.title = "修改装备";
this. editVisible = true;
var url = "api/Equipment/" + row.ID;
const { data: res } = await this.$axios.get(url);
this.ruleForm = JSON.parse(JSON.stringify(res));
console.log("ruleF",this.ruleForm)
const { data: resclass } = await this.$axios.get("api/EqCategory", {
params: this.searchEqCategoryData,
});
const { data: userRes } = await this.$axios.get("api/User", {
params: this.searchUserData,
});
const { data: resWarehouse } = await this.$axios.get("api/Libary", {
params: this.searchWarehouseData,
});
this.searchClassData.CategoryID = this.ruleForm.CategoryID;
this.searchClassData.IsHaoCai=null;
// this.searchClassData.MaterielName = this.ruleForm.MaterielName;
const { data: resMaterie } = await this.$axios.get("api/Materiel", {
params: this.searchClassData,
});
console.log("mater", resMaterie.Rows);
if (this.ruleForm.EqSizeId !== null) {
this.searchMaterielData.EqSizeId = this.ruleForm.EqSizeId;
const { data: resSize } = await this.$axios.get("api/EqSize", {
params: this.searchMaterielData,
});
this.sizeOption = resSize.Rows;
}
this.searchStorageData.LibraryID = this.ruleForm.LibraryID;
const { data: resStorage } = await this.$axios.get("api/Storage", {
params: this.searchStorageData,
});
resMaterie.Rows.forEach((item) => {
this.MaterielOption.push({
ID: item.ID,
MaterielId: item.ID,
MaterielName: item.MaterielName,
});
});
resStorage.Rows.forEach((item) => {
this.storageOption.push({
StorageCode: item.ID,
StorageTypeName: item.StorageTypeName,
LocationCode: item.StorageCode,
LocationId: item.ID,
});
});
this.usersOption = userRes.Rows;
this.classOption = resclass.Rows;
resWarehouse.Rows.forEach((item) => {
this.warehouseOption.push({
LibraryID: item.ID,
CreateID: item.CreateID,
CreateName: item.CreateName,
CreateTime: item.CreateTime,
LibaryName: item.LibaryName,
LibaryType: item.LibaryType,
LibaryTypeName: item.LibaryTypeName,
Remarks: item.Remarks,
});
});
if (this.ruleForm.IsPublic === 1) {
//公共装备
this.selectShow = true;
this.warehouseSelect = true;
this.peopleShow = false;
} else {
//单警装备
this.peopleShow = true;
this.warehouseSelect = false;
this.selectShow = false;
}
},
//装备类型变化
equipmentTypeChange(val) {
if (val === 1) {
//公共装备
this.ruleForm.policeUserID = "";
this.selectShow = true;
this.warehouseSelect = true;
this.peopleShow = false;
} else {
//单警装备
this.ruleForm.LibraryID = "";
this.ruleForm.StorageCode = "";
this.peopleShow = true;
this.warehouseSelect = false;
this.selectShow = false;
}
},
//获取号型
async getMateriel(val) {
this.ruleForm.EqSizeId = "";
this.ruleForm.EqSizeName = "";
if (val !== "") {
var obj = {};
obj = this.MaterielOption.find(function (item) {
return item.ID === val;
});
this.ruleForm.EqCode=obj.MaterielCode;
this.ruleForm.EqName=obj.MaterielName;
this.ruleForm.MaterielId = obj.ID;
this.ruleForm.MaterielName = obj.MaterielName;
this.eqNewName=this.ruleForm.EqName
this.eqNewCode=this.ruleForm.EqCode
this.searchMaterielData.MaterielId = val;
const { data: res } = await this.$axios.get("api/EqSize", {
params: this.searchMaterielData,
});
this.sizeOption = res.Rows;
// console.log("size",this.sizeOption)
}
},
//获取详细信息
async getDetailInfo(row) {
this.picVisible = true;
this.imgurl = window._CONFIG["dlURL"] + "/" + row.ImagePath;
},
//仓库变化后选择储位
async warehouseChange(val) {
// console.log('仓库',this.warehouseOption)
(this.storageOption = []),
(this.ruleForm.LocationId = ""),
this.searchStorageData.LibraryID = val;
if (val !== "") {
const { data: resStorage } = await this.$axios.get("api/Storage", {
params: this.searchStorageData,
});
resStorage.Rows.forEach((item) => {
this.storageOption.push({
StorageCode: item.ID,
StorageTypeName: item.StorageTypeName,
LocationCode: item.StorageCode,
LocationId: item.ID,
});
});
}
},
async InitQuery()
{
if(this.$route.query.StateType!=undefined)
{ this.searchData.State=this.$route.query.StateType;}
if(this.$route.query.IsPublicType!=undefined)
{ this.searchData.IsPublic=this.$route.query.IsPublicType;}
},
async getQueuData() {
// console.log("CC",this.$route.query.StateType)
// console.log("statet",aa)
this.loading = true;
const { data: resclass } = await this.$axios.get("api/EqCategory");
this.classOption = resclass.Rows;
const { data: res } = await this.$axios.get("api/Equipment", {
params: this.searchData,
});
this.total = res.Total;
this.borrowData = res.Rows;
this.timer = setTimeout(() => {
//设置延迟执行
this.loading = false;
}, 300);
},
async getUserInfo() {
const borrowUrl = "/api/User/GetAllUser";
const { data: res } = await this.$axios.get(borrowUrl);
if (res.Success == false) return this.$message(res.Remark);
this.options = res.Rows;
},
//查询条件添加回车键
onEnterPress() {
this.getQueuData();
},
// 分页功能
// 每页显示条数发生改变时
handleSizeChange(val) {
this.searchData.Rows = val;
this.getQueuData();
},
// 当前页数发生改变时
handleCurrentChange(val) {
this.searchData.Page = val;
this.getQueuData();
},
stateFormat(row) {
if (row.EqHaoCai === 0) {
return "已贴标";
} else {
return "未贴标";
}
},
},
};
</script>
<style scoped lang="less">
body {
margin: 0;
}
.labelClassT {
width: 479px;
}
.diaB {
font-weight: 1000;
margin-left: 29px;
margin-top: 10px;
}
.inputA {
width: 180px;
}
.dialogSize {
font-size: 15px;
}
.diaC {
font-weight: 1000;
margin-left: 29px;
margin-bottom: 16px;
}
.funcButton {
margin-right: 16px;
float: right;
margin-bottom: 13px;
}
.labelBorrow {
margin: auto;
font-weight: bold;
font-size: 16px;
}
.textHeader {
background-color: #fafafa;
padding: 16px 24px;
border-right: 1px solid #e8e8e8;
text-align: center;
width: 110px;
}
.textContent {
width: 14%;
background-color: #ffffff;
padding: 16px 24px;
border-right: 1px solid #e8e8e8;
text-align: left;
}
.textContentLast {
width: 17%;
background-color: #ffffff;
padding: 16px 24px;
text-align: left;
}
.title_box {
margin-top: 0px;
}
.textboxBo {
margin-right: 16px;
float: left;
margin-bottom: 13px;
}
.logo {
margin-top: -4px;
margin-left: 29px;
}
.el-dialog {
width: 66%;
}
</style>
src/views/warehouse/cabinet.vue
...@@ -96,26 +96,36 @@ ...@@ -96,26 +96,36 @@
> >
<el-table-column prop="ID" v-if="false" /> <el-table-column prop="ID" v-if="false" />
<el-table-column prop="LibraryID" v-if="false" /> <el-table-column prop="LibraryID" v-if="false" />
<el-table-column prop="StorageCode" label="柜名" align="center"> <el-table-column prop="StorageCode" label="储位名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="StorageTypeName" label="类型" align="center"> <el-table-column prop="StorageTypeName" label="储位类型" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="LibraryName" label="仓库" align="center"> <el-table-column prop="LibraryName" label="所属仓库" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="PoliceName" label="所属人员" align="center"> <el-table-column prop="PoliceName" label="所属人员" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="DepartName" v-if="false"> </el-table-column> <el-table-column prop="DepartName" v-if="false"> </el-table-column>
<el-table-column prop="PoliceID" v-if="false"> </el-table-column> <el-table-column prop="PoliceID" v-if="false"> </el-table-column>
<el-table-column prop="DepartName" label="部门" align="center"> <el-table-column prop="DepartName" label="所属部门" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="Remarks" label="备注" align="center"> <el-table-column prop="Remarks" label="备注" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="CreateName" label="创建人" align="center"> <el-table-column prop="CreateName" label="创建人" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="CreateTime" label="创建日期" align="center"> <el-table-column prop="CreateTime" label="创建日期" sortable align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" width="200" align="center"> <el-table-column label="操作" width="200" align="center">
<template v-slot="scope"> <template v-slot="scope">
<a-button
type="primary"
class="actions"
ghost
round
size="small"
@click="check(scope.row)"
>查看</a-button
>
<a-button <a-button
type="primary" type="primary"
class="actions" class="actions"
...@@ -137,6 +147,153 @@ ...@@ -137,6 +147,153 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 查看详情 -->
<el-dialog title="查看储位详情" :visible.sync="borrowTableVisible" width="73%">
<el-card>
<div slot="header" class="clearfix" style="text-align: left">
<span class="labelBorrow">储位信息</span>
</div>
<div style="border: 1px solid #e8e8e8">
<table
size="small"
style="
table-layout: auto;
width: 100%;
border-collapse: collapse;
box-sizing: border-box;
"
>
<tbody line-height:1>
<tr style="border-bottom: 1px solid #e8e8e8">
<th class="textHeader">储位名称</th>
<td class="textContent">
{{ detailData.StorageCode }}
</td>
<th class="textHeader">储位类型</th>
<td class="textContent">
{{ detailData.StorageTypeName }}
</td>
<th class="textHeader">所属仓库</th>
<td class="textContentLast">
{{ detailData.LibraryName }}
</td>
</tr>
<tr style="border-bottom: 1px solid #e8e8e8">
<th class="textHeader">创建人</th>
<td class="textContent">
{{
detailData.CreateName
}}
</td>
<th class="textHeader">所属部门</th>
<td class="textContent">
{{ detailData.DepartName ? detailData.DepartName : "无所属" }}
</td>
<th class="textHeader">所属人员</th>
<td class="textContent">
{{ detailData.UserName ? detailData.UserName : "无所属" }}
</td>
<tr style="border-bottom: 1px solid #e8e8e8">
<th class="textHeader">储位灯光 IP地址</th>
<td class="textContent">
{{
detailData.RightAddress
}}
</td>
<th class="textHeader">地面灯带 IP地址</th>
<td class="textContent">
<pre>{{ detailData.YinDaoAddress }}</pre>
</td>
<th class="textHeader">创建时间</th>
<td class="textContent">
{{ detailData.CreateTime }}
</td>
<tr style="border-bottom: 1px solid #e8e8e8" >
<th class="textHeader">备注信息</th>
<td class="textContentLast">
{{ detailData.Remarks }}
</td>
</tr>
</tbody>
</table>
</div>
</el-card>
<el-card>
<div slot="header" class="clearfix" style="text-align: left">
<span class="labelBorrow">储位所存放装备</span>
</div>
<div style="border: 1px solid #e8e8e8">
<table
size="small"
style="
table-layout: auto;
width: 100%;
border-collapse: collapse;
box-sizing: border-box;
"
>
<el-table
v-loading="loading"
:data="detailData.EquipmentList"
stripe
style="width: 100%"
size="small"
border
highlight-current-row
max-height="260"
>
<!-- <el-table-column prop="EqName" label="装备名称" align="center">
</el-table-column> -->
<el-table-column label="装备名称" align="center">
<template slot-scope="scope" >
<el-button type="text" style="color: #1890ff; text-decoration:underline;" @click="editEqu(scope.row)">{{ scope.row.EqName }}</el-button>
</template>
</el-table-column>
<el-table-column prop="EqCode" label="装备编号" width="80" align="center">
</el-table-column>
<el-table-column prop="EqTypeName" label="装备类型" align="center">
</el-table-column>
<el-table-column prop="StateName" label="装备状态" width="70" align="center">
</el-table-column>
<el-table-column prop="DepartName" v-if="false"> </el-table-column>
<el-table-column prop="PoliceID" v-if="false"> </el-table-column>
<el-table-column prop="EqCount" label="数量" width="50" align="center">
</el-table-column>
<el-table-column prop="BuyTime" label="采购日期" width="140" align="center">
</el-table-column>
<el-table-column prop="TermTime" label="报废期限" width="140" align="center">
</el-table-column>
<el-table-column prop="BaoYangDays" label="保养周期(天)" width="90" align="center">
</el-table-column>
<el-table-column prop="NextBaoYang" label="下次保养时间" width="140" align="center">
</el-table-column>
<el-table-column label="操作" width="200" align="center">
<template v-slot="scope">
<a-button
v-if="scope.row.State!==0 && scope.row.EqHaoCai!==1"
type="primary"
class="actions"
ghost
round
size="small"
@click="equipmentIn(scope.row)"
>手动入库</a-button
>
</template>
</el-table-column>
</el-table>
</table>
</div>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button @click="borrowTableVisible = false">关 闭</el-button>
</div>
</el-dialog>
<el-dialog <el-dialog
width="25%" width="25%"
:close-on-click-modal="false" :close-on-click-modal="false"
...@@ -215,6 +372,23 @@ ...@@ -215,6 +372,23 @@
> >
<el-input :disabled="cabinetDis" v-model="ruleForm.LockAddress"></el-input> <el-input :disabled="cabinetDis" v-model="ruleForm.LockAddress"></el-input>
</el-form-item> </el-form-item>
<el-form-item
v-if="(cabinetShow == false)"
label="柜子灯地址"
prop="RightAddress"
>
<el-input v-model="ruleForm.RightAddress" placeholder="GPIO的IP: 端口(9701)-接口(0、1、2...)"></el-input>
</el-form-item>
<el-form-item
v-if="(cabinetShow == false)"
label="地面灯地址"
prop="YinDaoAddress"
>
<el-input type="textarea" :rows='5' v-model="ruleForm.YinDaoAddress" placeholder="地面灯带引导灯GPIO的IP: 端口(9701)-接口(0、1、2...),需配置多个时记得使用回车进行换行"></el-input>
</el-form-item>
<el-form-item label="备注" prop="Remarks"> <el-form-item label="备注" prop="Remarks">
<el-input v-model="ruleForm.Remarks"></el-input> <el-input v-model="ruleForm.Remarks"></el-input>
</el-form-item> </el-form-item>
...@@ -236,6 +410,9 @@ ...@@ -236,6 +410,9 @@
> >
</div> </div>
</el-dialog> </el-dialog>
<!-- 修改装备 -->
<!-- 表单组件-引用修改装备页面 -->
<cabEditEquForm ref="cabEditEquForm" />
<!-- 分页功能 --> <!-- 分页功能 -->
<el-row type="flex" justify="center" align="middle"> <el-row type="flex" justify="center" align="middle">
...@@ -256,7 +433,10 @@ ...@@ -256,7 +433,10 @@
<script> <script>
import cabEditEquForm from './cabEditEquForm'
export default { export default {
components: { cabEditEquForm },
inject:['reload'],
data() { data() {
return { return {
rules: { rules: {
...@@ -293,13 +473,17 @@ export default { ...@@ -293,13 +473,17 @@ export default {
], ],
StorageType2: [ StorageType2: [
{ {
value: 2, value: 0,
label: "储物柜", label: "公共柜",
}, },
{ {
value: 1, value: 1,
label: "单警柜", label: "单警柜",
}, },
{
value: 2,
label: "储物柜",
}
], ],
Users: [], Users: [],
searchData: { searchData: {
...@@ -318,6 +502,10 @@ export default { ...@@ -318,6 +502,10 @@ export default {
Order: "ESC", Order: "ESC",
StorageCode: "", StorageCode: "",
}, },
equipmentInData: {
Sort: "ID",
State:0
},
title: "", title: "",
...@@ -329,7 +517,7 @@ export default { ...@@ -329,7 +517,7 @@ export default {
LibraryId: "", LibraryId: "",
User: "", User: "",
StorageType: "1", StorageType: "1",
StorageType2: "2", StorageType2: "0",
StorageCode: "", StorageCode: "",
Remarks: "", Remarks: "",
StorageTypeName: "", StorageTypeName: "",
...@@ -347,11 +535,13 @@ export default { ...@@ -347,11 +535,13 @@ export default {
LibraryId: "", LibraryId: "",
User: "", User: "",
StorageType: "1", StorageType: "1",
StorageType2: "2", StorageType2: "0",
StorageCode: "", StorageCode: "",
Remarks: "", Remarks: "",
StorageTypeName: "", StorageTypeName: "",
LockAddress: "", LockAddress: "",
RightAddress:"",
YinDaoAddress:"",
}; };
}, },
detailData: [], detailData: [],
...@@ -364,14 +554,17 @@ export default { ...@@ -364,14 +554,17 @@ export default {
form: {}, form: {},
tableData: [], tableData: [],
borrowData: [], borrowData: [],
EquipmentList:[],
editData: [], editData: [],
addVisible: false, addVisible: false,
editVisible : false,
borrowTableVisible: false, borrowTableVisible: false,
picVisible: false, picVisible: false,
formLabelWidth: "120px", formLabelWidth: "120px",
history_Num: "", history_Num: "",
// 总条数 // 总条数
total: 0, total: 0,
row: null
}; };
}, },
...@@ -393,6 +586,8 @@ export default { ...@@ -393,6 +586,8 @@ export default {
formData.append("LibraryId", this.ruleForm.LibraryId); formData.append("LibraryId", this.ruleForm.LibraryId);
formData.append("Remarks", this.ruleForm.Remarks===null?"":this.ruleForm.Remarks); formData.append("Remarks", this.ruleForm.Remarks===null?"":this.ruleForm.Remarks);
formData.append("LockAddress", this.ruleForm.LockAddress); formData.append("LockAddress", this.ruleForm.LockAddress);
formData.append("RightAddress", this.ruleForm.RightAddress);
formData.append("YinDaoAddress", this.ruleForm.YinDaoAddress);
const config = { const config = {
headers: { headers: {
...@@ -424,6 +619,17 @@ export default { ...@@ -424,6 +619,17 @@ export default {
} }
}); });
}, },
//查看信息
async check(row) {
this.row = row
this.borrowTableVisible = true;
const borrowUrl = "/api/Storage/" + row.ID;
const { data: res } = await this.$axios.get(borrowUrl);
if (res.Success == false) return this.$message(res.Remark);
this.detailData = res;
console.log("ro",row)
this.videoUrl=row.VideoUrl;
},
//删除储位 //删除储位
async deleteCabinet(row) async deleteCabinet(row)
{ {
...@@ -455,6 +661,8 @@ export default { ...@@ -455,6 +661,8 @@ export default {
{ {
this.searchData.Page=1 this.searchData.Page=1
}, },
//修改仓库 //修改仓库
async edit(row) { async edit(row) {
this.typeSelect = true; this.typeSelect = true;
...@@ -497,6 +705,7 @@ export default { ...@@ -497,6 +705,7 @@ export default {
this.Libarys = Libary.Rows; this.Libarys = Libary.Rows;
this.Users = User.Rows; this.Users = User.Rows;
}, },
libraryChange(row) libraryChange(row)
{ {
var obj = {}; var obj = {};
...@@ -521,6 +730,10 @@ export default { ...@@ -521,6 +730,10 @@ export default {
async addWarehouse() { async addWarehouse() {
(this.StorageType2 = [ (this.StorageType2 = [
{ {
value: "0",
label: "公共柜",
},
{
value: "2", value: "2",
label: "储物柜", label: "储物柜",
}, },
...@@ -570,6 +783,51 @@ export default { ...@@ -570,6 +783,51 @@ export default {
onEnterPress() { onEnterPress() {
this.getQueuData(); this.getQueuData();
}, },
//修改装备
async editEqu(row) {
const _this = this.$refs.cabEditEquForm
_this.editVisible = true;
console.log('编辑装备')
//执行子组件的修改装备方法async edit(row)
_this.edit(row);
},
//手动入库
async equipmentIn(row){
//console.log(row.ID)
const equFormData = new FormData();
equFormData.append("ID", row.ID);
equFormData.append("State", 0);
const config = {
headers: {
"Content-Type": "multipart/form-data",
},
};
const url = "/api/Equipment/UpdateEquOutInState";
this.$confirm("确认手动维护将该装备入库 ?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(async () => {
const { data: res } = await this.$axios.post(url,equFormData,config);
if (res.Success === true) {
//this.getQueuData();
this.$message.success("装备入库成功！");
//刷新查看
this.check(this.row)
} else {
this.$message.error("装备入库失败！");
}
})
.catch((e) => {
this.$message.warning("已取消该操作！");
});
console.log('手动操作入库')
},
// 分页功能 // 分页功能
// 每页显示条数发生改变时 // 每页显示条数发生改变时
handleSizeChange(val) { handleSizeChange(val) {
......
src/views/warehouse/warehouseInventory.vue
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
:data="fixData" :data="fixData"
v-model="activeName" v-model="activeName"
> >
<el-tab-pane <!-- <el-tab-pane
label="已盘点装备" label="已盘点装备"
name="first" name="first"
v-loading="tabLoading" v-loading="tabLoading"
...@@ -201,8 +201,11 @@ ...@@ -201,8 +201,11 @@
<el-table-column prop="EqName" label="装备名称"> <el-table-column prop="EqName" label="装备名称">
</el-table-column> </el-table-column>
<el-table-column prop="CategoryName" label="所属物料"> <el-table-column prop="CategoryName" label="所属物料">
</el-table-column> </el-table </el-table-column>
><el-row type="flex" justify="center" align="middle"> <el-table-column prop="CategoryName" label="所属物料">
</el-table-column>
</el-table>
<el-row type="flex" justify="center" align="middle">
<el-pagination <el-pagination
background background
@size-change="handleSizeAlreadyChange" @size-change="handleSizeAlreadyChange"
...@@ -213,14 +216,16 @@ ...@@ -213,14 +216,16 @@
:total="alreadyToal" :total="alreadyToal"
/> />
</el-row> </el-row>
</el-tab-pane> </el-tab-pane> -->
<el-tab-pane label="未盘点装备" name="second" <el-tab-pane label="未盘点装备" name="first"
><el-table :data="InvetoryNoList" border class="details"> ><el-table :data="InvetoryNoList" border class="details">
<el-table-column prop="EqName" label="装备名称"> <el-table-column prop="EqName" label="装备名称">
</el-table-column> </el-table-column>
<el-table-column prop="CategoryName" label="所属物料"> <el-table-column prop="CategoryName" label="所属物料">
</el-table-column> </el-table-column>
<el-table-column prop="LocationCode" label="存放位置">
</el-table-column>
</el-table> </el-table>
<el-row type="flex" justify="center" align="middle"> <el-row type="flex" justify="center" align="middle">
<el-pagination <el-pagination
......
vue.config.js
...@@ -5,10 +5,10 @@ function resolve (dir) { ...@@ -5,10 +5,10 @@ function resolve (dir) {
module.exports = { module.exports = {
publicPath: '/', publicPath: '/',
devServer: { devServer: {
// host: '192.168.3.1', host: '192.168.2.246',
// port: 2233, port: 2233,
host: '192.168.2.105', // host: '192.168.2.105',
port: 2234, // port: 2234,
// host: '192.168.2.101', // host: '192.168.2.101',
// host: '41.204.124.248', // host: '41.204.124.248',
// port: 5002, // port: 5002,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论