完成h5开发

This commit is contained in:
wulin 2020-09-15 19:39:40 +08:00
parent 1f4b8d0e5c
commit ccd74231c3
2 changed files with 627 additions and 527 deletions

View File

@ -1,47 +1,93 @@
<template> <template>
<div v-loading='dataListLoading'> <div v-loading="dataListLoading">
<el-row> <el-row>
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">设备类型</label></div> <el-col :span="5">
<div class="grid-content flex">
<label class="flex_son">设备类型</label>
</div>
</el-col> </el-col>
<el-col :span="19"><div class="grid-content bg-purple-light"><el-button class="div_width div_height" @click="btnClic(0)">{{deviceInfo.type}}<i class="el-icon-arrow-right el-icon--right"></i></el-button></div> <el-col :span="19">
<div class="grid-content bg-purple-light">
<el-button class="div_width div_height" @click="btnClic(0)">
{{deviceInfo.type}}
<i class="el-icon-arrow-right el-icon--right"></i>
</el-button>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row margin-bottom="0"> <el-row margin-bottom="0">
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">设备名称</label></div> <el-col :span="5">
</el-col> <div class="grid-content flex">
<el-col :span="19"><div class="grid-content bg-purple-light"><el-button class="div_width div_height" @click="btnClic(1)">{{deviceInfo.brandName}}<i class="el-icon-arrow-right el-icon--right"></i></el-button></div> <label class="flex_son">设备名称</label>
</el-col> </div>
</el-row>
<el-row>
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">规格型号</label></div>
</el-col>
<el-col :span="19"><div class="grid-content bg-purple-light"><el-button class="div_width div_height" @click="btnClic(2)">{{deviceInfo.specType}}<i class="el-icon-arrow-right el-icon--right"></i></el-button></div>
</el-col>
</el-row>
<el-row>
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">条码编号</label></div>
</el-col>
<el-col :span="19"><div class="grid-content bg-purple-light"><el-button class="div_width div_height" @click="btnClic(3)">{{deviceInfo.code}}<i class="el-icon-arrow-right el-icon--right"></i></el-button></div>
</el-col>
</el-row>
<el-row>
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">设备状态</label></div>
</el-col> </el-col>
<el-col :span="19"> <el-col :span="19">
<el-select v-model="deviceInfo.selectValue" ref="pop" class="div_width" @change="selectChange(deviceInfo.selectValue)"> <div class="grid-content bg-purple-light">
<el-button class="div_width div_height" @click="btnClic(1)">
{{deviceInfo.brandName}}
<i class="el-icon-arrow-right el-icon--right"></i>
</el-button>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="grid-content flex">
<label class="flex_son">规格型号</label>
</div>
</el-col>
<el-col :span="19">
<div class="grid-content bg-purple-light">
<el-button class="div_width div_height" @click="btnClic(2)">
{{deviceInfo.specType}}
<i class="el-icon-arrow-right el-icon--right"></i>
</el-button>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="grid-content flex">
<label class="flex_son">条码编号</label>
</div>
</el-col>
<el-col :span="19">
<div class="grid-content bg-purple-light">
<el-button class="div_width div_height" @click="btnClic(3)">
{{deviceInfo.code}}
<i class="el-icon-arrow-right el-icon--right"></i>
</el-button>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="grid-content flex">
<label class="flex_son">设备状态</label>
</div>
</el-col>
<el-col :span="19">
<el-select
v-model="deviceInfo.selectValue"
ref="pop"
class="div_width"
@change="selectChange(deviceInfo.selectValue)"
>
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value"
</el-option> ></el-option>
</el-select> </el-select>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">使用者</label></div> <el-col :span="5">
<div class="grid-content flex">
<label class="flex_son">使用者</label>
</div>
</el-col> </el-col>
<el-col :span="19"> <el-col :span="19">
<div class="grid-content bg-purple-light"> <div class="grid-content bg-purple-light">
@ -49,7 +95,8 @@
placement="bottom" placement="bottom"
trigger="click" trigger="click"
@command="batchOperate" @command="batchOperate"
class="div_width div_height"> class="div_width div_height"
>
<el-button class="div_width div_height"> <el-button class="div_width div_height">
{{deviceInfo.user}} {{deviceInfo.user}}
<i class="el-icon-arrow-right el-icon--right"></i> <i class="el-icon-arrow-right el-icon--right"></i>
@ -61,319 +108,384 @@
</el-dropdown> </el-dropdown>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">自带编码</label></div> <el-col :span="5">
<div class="grid-content flex">
<label class="flex_son">自带编码</label>
</div>
</el-col> </el-col>
<el-col :span="19"><div class="grid-content bg-purple-light"><el-button class="div_width div_height" @click="btnClic(5)">{{deviceInfo.qr}}<i class="el-icon-arrow-right el-icon--right"></i></el-button></div> <el-col :span="19">
<div class="grid-content bg-purple-light">
<el-button class="div_width div_height" @click="btnClic(5)">
{{deviceInfo.qr}}
<i class="el-icon-arrow-right el-icon--right"></i>
</el-button>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">入库时间</label></div> <el-col :span="5">
<div class="grid-content flex">
<label class="flex_son">入库时间</label>
</div>
</el-col> </el-col>
<el-col :span="19"><div class="grid-content bg-purple-light"><el-button class="div_width div_height" @click="btnClic(6)">{{deviceInfo.gmtInbound}}</el-button></div> <el-col :span="19">
<div class="grid-content bg-purple-light">
<el-button class="div_width div_height" @click="btnClic(6)">{{deviceInfo.gmtInbound}}</el-button>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">出借时间</label></div> <el-col :span="5">
<div class="grid-content flex">
<label class="flex_son">出借时间</label>
</div>
</el-col> </el-col>
<el-col :span="19"><div class="grid-content bg-purple-light"><el-button class="div_width div_height" @click="btnClic(7)">{{deviceInfo.gmtOutbound}}</el-button></div> <el-col :span="19">
<div class="grid-content bg-purple-light">
<el-button class="div_width div_height" @click="btnClic(7)">{{deviceInfo.gmtOutbound}}</el-button>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"><div class="grid-content flex"><label class="flex_son">备注</label></div> <el-col :span="5">
<div class="grid-content flex">
<label class="flex_son">备注</label>
</div>
</el-col> </el-col>
<el-col :span="19"><div class="grid-content bg-purple-light"><el-button class="div_width div_height" @click="btnClic(8)">{{deviceInfo.mark}}<i class="el-icon-arrow-right el-icon--right"></i></el-button></div> <el-col :span="19">
<div class="grid-content bg-purple-light">
<el-button class="div_width div_height" @click="btnClic(8)">
{{deviceInfo.mark}}
<i class="el-icon-arrow-right el-icon--right"></i>
</el-button>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-button type="primary" class="div_width" @click="goOrGo">{{btnScanValue}}</el-button> <el-button type="primary" class="div_width" @click="goOrGo">{{btnScanValue}}</el-button>
</div> </div>
</template>> </template>>
<script> <script>
import {apiFindEquipmentByCode, apiChangeEquipment} from '@/api/api_equipment' import {
import * as dd from 'dingtalk-jsapi' apiFindEquipmentByCode,
apiChangeEquipment,
} from "@/api/api_equipment";
import * as dd from "dingtalk-jsapi";
export default { export default {
data () { data() {
return{ return {
options: [{ options: [
{
value: 0, value: 0,
label: '入库' label: "入库",
}, { },
{
value: 1, value: 1,
label: '售出' label: "售出",
} },
, { {
value: 2, value: 2,
label: '不可用' label: "不可用",
} },
, { {
value: 3, value: 3,
label: '调拨' label: "调拨",
} },
, { {
value: 4, value: 4,
label: '申领' label: "申领",
}], },
staff: '', ],
deviceInfo:{ staff: "",
deviceInfo: {
id: 0, id: 0,
code: '', code: "",
selectValue: '', selectValue: "",
type: '', type: "",
specType: '', specType: "",
brandName: '', brandName: "",
typeId: '', typeId: "",
specId: '', specId: "",
brandId: '', brandId: "",
user: '', user: "",
userId: '', userId: "",
gmtInbound: '', gmtInbound: "",
gmtOutbound: '', gmtOutbound: "",
originalCode: '',// originalCode: "", //
mark: '', mark: "",
employee: true, //使 employee: true, //使
state: 0, // state: 0, //
equipmentState: 0,// equipmentState: 0, //
no: '',// no: "", //
buyAmount: 0.0,// buyAmount: 0.0, //
saleAmount: 0.0,// saleAmount: 0.0, //
qr: '',// qr: "", //
owner: '',// owner: "", //
unit: '',// unit: "", //
num: 0// num: 0, //
}, },
dataListLoading: false, dataListLoading: false,
btnScanValue: '继续盘点', btnScanValue: "继续盘点",
btnOpt: 0, //0 1 btnOpt: 0, //0 1
oldKey: '' // oldKey: "", //
} userId: 0, //id
};
}, },
created () { created() {
// this.handleGetImgCaptcha() // this.handleGetImgCaptcha()
}, },
mounted () { mounted() {
this.getDateCookie() this.getDateCookie();
console.log(this.deviceInfo.code.length) console.log(this.deviceInfo.code.length);
if(this.deviceInfo.code.length == 0){//
this.scan()
this.deviceInfo.selectValue = this.options[0].value
if (typeof this.$route.query.type == "undefined") {
if (this.deviceInfo.code.length == 0) {
//
this.scan();
this.deviceInfo.selectValue = this.options[0].value;
} }
if(typeof this.$route.query.type == 'undefined'){ } else if (this.$route.query.type == 4) {
//
this.btnScanValue = "继续回收";
this.userId = this.$cookie.get("idUser");
} else if(this.$route.query.type == 4){// this.scan();
} else if(this.$route.query.type == 5){//使 } else {
this.checkEditDevicinfo();
if (this.$route.query.type == 2) {
//
this.deviceInfo.employee = true;
} else if (this.$route.query.type == 3) {
//使
this.deviceInfo.employee = false;
} }
else{
this.checkEditDevicinfo()
if(this.$route.query.type == 2){//
this.deviceInfo.employee = true
}else if(this.$route.query.type == 3){//使
this.deviceInfo.employee = false
}
} }
}, },
methods: { methods: {
batchOperate(command) { batchOperate(command) {
this.saveDateCookie() this.saveDateCookie();
switch (command) { switch (command) {
case 'staff': case "staff":
// //
this.$router.push({name: 'devicestaffdepat', query: {type: 0}}) this.$router.push({ name: "devicestaffdepat", query: { type: 0 } });
break; break;
case "depat": case "depat":
// //
this.$router.push({name: 'devicestaffdepat', query: {type: 1}}) this.$router.push({ name: "devicestaffdepat", query: { type: 1 } });
break; break;
} }
}, },
goOrGo () { goOrGo() {
console.log(this.btnOpt) console.log(this.btnOpt);
console.log console.log;
if(this.btnOpt == 0){ if (this.btnOpt == 0) {
this.scan() this.scan();
}else{ } else {
// //
// //
if(this.deviceInfo.user == ''){ if (this.deviceInfo.user == "") {
this.$message.error('请选择使用者') this.$message.error("请选择使用者");
return; return;
} }
if(this.deviceInfo.code == ''){ if (this.deviceInfo.code == "") {
this.$message.error('请扫码后再编辑') this.$message.error("请扫码后再编辑");
return; return;
} }
if(this.deviceInfo.type == ''){ if (this.deviceInfo.type == "") {
this.$message.error('请选择设备类型') this.$message.error("请选择设备类型");
return; return;
} }
if(this.deviceInfo.brandName == ''){ if (this.deviceInfo.brandName == "") {
this.$message.error('请选择设备名称') this.$message.error("请选择设备名称");
return; return;
} }
if(this.deviceInfo.specType == ''){ if (this.deviceInfo.specType == "") {
this.$message.error('请选择规格型号') this.$message.error("请选择规格型号");
return; return;
} }
this.dataListLoading = true this.dataListLoading = true;
apiChangeEquipment(this.deviceInfo).then(data => { apiChangeEquipment(this.deviceInfo).then((data) => {
console.log(data.data) console.log(data.data);
if(data.code == 0){ if (data.code == 0) {
this.$message('更新成功') if(this.$route.query.type == 4){
this.btnOpt = 0 this.$message("回收成功");
this.btnScanValue = '继续盘点' this.btnOpt = 0;
this.btnScanValue = "继续回收";
}else{ }else{
this.$message.error('异常') this.$message("更新成功");
this.btnOpt = 0;
this.btnScanValue = "继续盘点";
} }
this.dataListLoading = false } else {
}) this.$message.error("异常");
} }
this.dataListLoading = false;
});
}
}, },
scan () { scan() {
this.clearDateCookie() this.clearDateCookie();
console.log('开始扫码') console.log("开始扫码");
console.log(dd) console.log(dd);
dd.biz.util.scan({ dd.biz.util.scan({
type: 'all' , // type allqrCodebarCodeall type: "all", // type allqrCodebarCodeall
onSuccess: function(data) { onSuccess: function (data) {
console.log('sucess') console.log("sucess");
console.log(data) console.log(data);
this.deviceInfo.code = data.text this.deviceInfo.code = data.text;
this.getDeviceInfo() this.getDeviceInfo();
}.bind(this), }.bind(this),
onFail : function(err) { onFail: function (err) {
console.log('fail') console.log("fail");
console.log(err) console.log(err);
}.bind(this) }.bind(this),
}) });
}, },
btnClic(type){ btnClic(type) {
console.log('btnClick') console.log("btnClick");
this.saveDateCookie() this.saveDateCookie();
if(type === 0){// if (type === 0) {
this.$router.push({name: 'devicetype'}) //
}else if(type === 1){// this.$router.push({ name: "devicetype" });
this.$router.push({name: 'devicetype', query: {type: 1}}) } else if (type === 1) {
}else if(type === 2){// //
this.$router.push({name: 'devicetype', query: {type: 2}}) this.$router.push({ name: "devicetype", query: { type: 1 } });
}else if(type === 3){// } else if (type === 2) {
this.scan() //
this.$router.push({ name: "devicetype", query: { type: 2 } });
}else if(type === 4){//使 } else if (type === 3) {
this.$refs.pop.$el.click() //
}else if(type === 5){// this.scan();
this.$router.push({name: 'deviceqr'}) } else if (type === 4) {
}else if(type === 6){// //使
this.$refs.pop.$el.click();
}else if(type === 7){// } else if (type === 5) {
//
}else if(type === 8){// this.$router.push({ name: "deviceqr" });
this.$router.push({name: 'devicemark'}) } else if (type === 6) {
//
} else if (type === 7) {
//
} else if (type === 8) {
//
this.$router.push({ name: "devicemark" });
} }
}, },
checkEditDevicinfo(){ checkEditDevicinfo() {
if(this.oldKey !== this.getKey()){ if (this.oldKey !== this.getKey()) {
this.btnOpt = 1 this.btnOpt = 1;
this.btnScanValue = '更新设备信息' this.btnScanValue = "更新设备信息";
} }
}, },
selectChange(value) { selectChange(value) {
this.deviceInfo.state = value this.deviceInfo.state = value;
this.deviceInfo.equipmentState = value this.deviceInfo.equipmentState = value;
//console.log(value) //console.log(value)
this.saveDateCookie() this.saveDateCookie();
this.checkEditDevicinfo() this.checkEditDevicinfo();
}, },
getDeviceInfo(){ getDeviceInfo() {
this.dataListLoading = true this.dataListLoading = true;
apiFindEquipmentByCode({}, this.deviceInfo.code).then(data => { apiFindEquipmentByCode({}, this.deviceInfo.code).then((data) => {
console.log(data.data) console.log(data.data);
if(data.code == 0){ if (data.code == 0) {
if(typeof data.data == 'undefined'){ if (typeof data.data == "undefined") {
this.$message('未绑定设备') this.$message("未绑定设备");
}else{ } else {
this.deviceInfo.type = data.data.type this.deviceInfo.type = data.data.type;
this.deviceInfo.typeId = data.data.typeId this.deviceInfo.typeId = data.data.typeId;
this.deviceInfo.specType = data.data.specType this.deviceInfo.specType = data.data.specType;
this.deviceInfo.specId = data.data.specId this.deviceInfo.specId = data.data.specId;
this.deviceInfo.brandName = data.data.brandName this.deviceInfo.brandName = data.data.brandName;
this.deviceInfo.brandId = data.data.brandId this.deviceInfo.brandId = data.data.brandId;
this.deviceInfo.code = data.data.code this.deviceInfo.code = data.data.code;
this.deviceInfo.user = data.data.user this.deviceInfo.user = data.data.user;
this.deviceInfo.userId = data.data.userId this.deviceInfo.userId = data.data.userId;
this.deviceInfo.gmtInbound = data.data.gmtInbound this.deviceInfo.gmtInbound = data.data.gmtInbound;
this.deviceInfo.gmtOutbound = data.data.gmtOutbound this.deviceInfo.gmtOutbound = data.data.gmtOutbound;
this.deviceInfo.originalCode = data.data.originalCode this.deviceInfo.originalCode = data.data.originalCode;
this.deviceInfo.mark = data.data.mark this.deviceInfo.mark = data.data.mark;
this.deviceInfo.id = data.data.id this.deviceInfo.id = data.data.id;
this.deviceInfo.num = data.data.num this.deviceInfo.num = data.data.num;
this.deviceInfo.unit = data.data.unit this.deviceInfo.unit = data.data.unit;
this.deviceInfo.owner = data.data.owner this.deviceInfo.owner = data.data.owner;
this.deviceInfo.qr = data.data.qr this.deviceInfo.qr = data.data.qr;
this.deviceInfo.state = data.data.state this.deviceInfo.state = data.data.state;
this.deviceInfo.equipmentState = data.data.equipmentState this.deviceInfo.equipmentState = data.data.equipmentState;
this.deviceInfo.buyAmount = data.data.buyAmount this.deviceInfo.buyAmount = data.data.buyAmount;
this.deviceInfo.saleAmount = data.data.saleAmount this.deviceInfo.saleAmount = data.data.saleAmount;
this.deviceInfo.no = data.data.no this.deviceInfo.no = data.data.no;
this.deviceInfo.employee = data.data.employee this.deviceInfo.employee = data.data.employee;
//this.deviceInfo.selectValue = data.data.selectValue //this.deviceInfo.selectValue = data.data.selectValue
this.deviceInfo.selectValue = this.options[this.deviceInfo.equipmentState].value this.deviceInfo.selectValue = this.options[
this.deviceInfo.equipmentState
].value;
this.oldKey = this.getKey() this.oldKey = this.getKey();
} if (this.$route.query.type == 4) {
}else{ if (data.data.userId != this.userId) {
this.$message.error('异常') this.$message.error("改设备不在该人员名下!请核对!");
} } else {
this.dataListLoading = false
})
},
clearDateCookie(){
this.deviceInfo.type = ''
this.deviceInfo.typeId = ''
this.deviceInfo.specType = ''
this.deviceInfo.specId = ''
this.deviceInfo.brandName = ''
this.deviceInfo.brandId = ''
this.deviceInfo.code = ''
this.deviceInfo.user = ''
this.deviceInfo.userId = ''
this.deviceInfo.gmtInbound = ''
this.deviceInfo.gmtOutbound = ''
this.deviceInfo.originalCode = ''
this.deviceInfo.mark = ''
this.deviceInfo.id = 0
this.deviceInfo.num = 0
this.deviceInfo.unit = ''
this.deviceInfo.owner = ''
this.deviceInfo.qr = ''
this.deviceInfo.state = 0 this.deviceInfo.state = 0
this.deviceInfo.equipmentState = 0 this.deviceInfo.equipmentState = 0
this.deviceInfo.buyAmount = 0.0 this.deviceInfo.selectValue = this.options[
this.deviceInfo.saleAmount = 0.0 this.deviceInfo.equipmentState
this.deviceInfo.no = '' ].value;
this.deviceInfo.employee = true this.deviceInfo.employee = false
//this.deviceInfo.selectValue = this.$cookie.set('selectValue') this.deviceInfo.userId = 217
this.deviceInfo.selectValue = this.options[this.deviceInfo.equipmentState].value this.deviceInfo.user = '库房'
this.deviceInfo.owner = '库房'
this.saveDateCookie() this.btnScanValue = '资产回收'
this.btnOpt = 1
}
}
}
} else {
this.$message.error("异常");
}
this.dataListLoading = false;
});
}, },
getKey(){ clearDateCookie() {
return this.deviceInfo.type + this.deviceInfo.type = "";
this.deviceInfo.typeId = "";
this.deviceInfo.specType = "";
this.deviceInfo.specId = "";
this.deviceInfo.brandName = "";
this.deviceInfo.brandId = "";
this.deviceInfo.code = "";
this.deviceInfo.user = "";
this.deviceInfo.userId = "";
this.deviceInfo.gmtInbound = "";
this.deviceInfo.gmtOutbound = "";
this.deviceInfo.originalCode = "";
this.deviceInfo.mark = "";
this.deviceInfo.id = 0;
this.deviceInfo.num = 0;
this.deviceInfo.unit = "";
this.deviceInfo.owner = "";
this.deviceInfo.qr = "";
this.deviceInfo.state = 0;
this.deviceInfo.equipmentState = 0;
this.deviceInfo.buyAmount = 0.0;
this.deviceInfo.saleAmount = 0.0;
this.deviceInfo.no = "";
this.deviceInfo.employee = true;
//this.deviceInfo.selectValue = this.$cookie.set('selectValue')
this.deviceInfo.selectValue = this.options[
this.deviceInfo.equipmentState
].value;
this.saveDateCookie();
},
getKey() {
return (
this.deviceInfo.type +
this.deviceInfo.typeId + this.deviceInfo.typeId +
this.deviceInfo.specType + this.deviceInfo.specType +
this.deviceInfo.specId + this.deviceInfo.specId +
@ -397,125 +509,125 @@ export default {
this.deviceInfo.saleAmount + this.deviceInfo.saleAmount +
this.deviceInfo.no + this.deviceInfo.no +
this.deviceInfo.employee this.deviceInfo.employee
);
}, },
saveDateCookie(){ saveDateCookie() {
this.$cookie.set('strFirs', this.deviceInfo.type) this.$cookie.set("strFirs", this.deviceInfo.type);
this.$cookie.set('idFirs', this.deviceInfo.typeId) this.$cookie.set("idFirs", this.deviceInfo.typeId);
this.$cookie.set('strThir', this.deviceInfo.specType) this.$cookie.set("strThir", this.deviceInfo.specType);
this.$cookie.set('idThir', this.deviceInfo.specId) this.$cookie.set("idThir", this.deviceInfo.specId);
this.$cookie.set('strSec', this.deviceInfo.brandName) this.$cookie.set("strSec", this.deviceInfo.brandName);
this.$cookie.set('idSec', this.deviceInfo.brandId) this.$cookie.set("idSec", this.deviceInfo.brandId);
this.$cookie.set('qrCode', this.deviceInfo.code) this.$cookie.set("qrCode", this.deviceInfo.code);
this.$cookie.set('userName', this.deviceInfo.user) this.$cookie.set("userName", this.deviceInfo.user);
this.$cookie.set('idUser', this.deviceInfo.userId) this.$cookie.set("idUser", this.deviceInfo.userId);
this.$cookie.set('inputTime', this.deviceInfo.gmtInbound) this.$cookie.set("inputTime", this.deviceInfo.gmtInbound);
this.$cookie.set('outTime', this.deviceInfo.gmtOutbound) this.$cookie.set("outTime", this.deviceInfo.gmtOutbound);
this.$cookie.set('code', this.deviceInfo.originalCode) this.$cookie.set("code", this.deviceInfo.originalCode);
this.$cookie.set('reamrk', this.deviceInfo.mark) this.$cookie.set("reamrk", this.deviceInfo.mark);
this.$cookie.set('devId', this.deviceInfo.id) this.$cookie.set("devId", this.deviceInfo.id);
this.$cookie.set('devNum', this.deviceInfo.num) this.$cookie.set("devNum", this.deviceInfo.num);
this.$cookie.set('devUnit', this.deviceInfo.unit) this.$cookie.set("devUnit", this.deviceInfo.unit);
this.$cookie.set('devOwner', this.deviceInfo.owner) this.$cookie.set("devOwner", this.deviceInfo.owner);
this.$cookie.set('devQr', this.deviceInfo.qr) this.$cookie.set("devQr", this.deviceInfo.qr);
this.$cookie.set('devState', this.deviceInfo.state) this.$cookie.set("devState", this.deviceInfo.state);
this.$cookie.set('devEQState', this.deviceInfo.equipmentState) this.$cookie.set("devEQState", this.deviceInfo.equipmentState);
this.$cookie.set('devBuyAmount', this.deviceInfo.buyAmount) this.$cookie.set("devBuyAmount", this.deviceInfo.buyAmount);
this.$cookie.set('devSaleAmount', this.deviceInfo.saleAmount) this.$cookie.set("devSaleAmount", this.deviceInfo.saleAmount);
this.$cookie.set('devNo', this.deviceInfo.no) this.$cookie.set("devNo", this.deviceInfo.no);
this.$cookie.set('devIsEmployee', this.deviceInfo.employee) this.$cookie.set("devIsEmployee", this.deviceInfo.employee);
//this.$cookie.set('selectValue', this.deviceInfo.selectValue) //this.$cookie.set('selectValue', this.deviceInfo.selectValue)
}, },
getDateCookie(){ getDateCookie() {
this.deviceInfo.type = this.$cookie.get('strFirs') this.deviceInfo.type = this.$cookie.get("strFirs");
this.deviceInfo.typeId = this.$cookie.get('idFirs') this.deviceInfo.typeId = this.$cookie.get("idFirs");
this.deviceInfo.specType = this.$cookie.get('strThir') this.deviceInfo.specType = this.$cookie.get("strThir");
this.deviceInfo.specId = this.$cookie.get('idThir') this.deviceInfo.specId = this.$cookie.get("idThir");
this.deviceInfo.brandName = this.$cookie.get('strSec') this.deviceInfo.brandName = this.$cookie.get("strSec");
this.deviceInfo.brandId = this.$cookie.get('idSec') this.deviceInfo.brandId = this.$cookie.get("idSec");
this.deviceInfo.code = this.$cookie.get('qrCode') this.deviceInfo.code = this.$cookie.get("qrCode");
this.deviceInfo.user = this.$cookie.get('userName') this.deviceInfo.user = this.$cookie.get("userName");
this.deviceInfo.userId = this.$cookie.get('idUser') this.deviceInfo.userId = this.$cookie.get("idUser");
this.deviceInfo.gmtInbound = this.$cookie.get('inputTime') this.deviceInfo.gmtInbound = this.$cookie.get("inputTime");
this.deviceInfo.gmtOutbound = this.$cookie.get('outTime') this.deviceInfo.gmtOutbound = this.$cookie.get("outTime");
this.deviceInfo.originalCode = this.$cookie.get('code') this.deviceInfo.originalCode = this.$cookie.get("code");
this.deviceInfo.mark = this.$cookie.get('reamrk') this.deviceInfo.mark = this.$cookie.get("reamrk");
this.deviceInfo.id = this.$cookie.get('devId') this.deviceInfo.id = this.$cookie.get("devId");
this.deviceInfo.num = this.$cookie.get('devNum') this.deviceInfo.num = this.$cookie.get("devNum");
this.deviceInfo.unit = this.$cookie.get('devUnit') this.deviceInfo.unit = this.$cookie.get("devUnit");
this.deviceInfo.owner = this.$cookie.get('devOwner') this.deviceInfo.owner = this.$cookie.get("devOwner");
this.deviceInfo.qr = this.$cookie.get('devQr') this.deviceInfo.qr = this.$cookie.get("devQr");
this.deviceInfo.state = this.$cookie.get('devState') this.deviceInfo.state = this.$cookie.get("devState");
this.deviceInfo.equipmentState = this.$cookie.get('devEQState') this.deviceInfo.equipmentState = this.$cookie.get("devEQState");
this.deviceInfo.buyAmount = this.$cookie.get('devBuyAmount') this.deviceInfo.buyAmount = this.$cookie.get("devBuyAmount");
this.deviceInfo.saleAmount = this.$cookie.get('devSaleAmount') this.deviceInfo.saleAmount = this.$cookie.get("devSaleAmount");
this.deviceInfo.no = this.$cookie.get('devNo') this.deviceInfo.no = this.$cookie.get("devNo");
this.deviceInfo.employee = this.$cookie.get('devIsEmployee') this.deviceInfo.employee = this.$cookie.get("devIsEmployee");
//this.deviceInfo.selectValue = this.$cookie.set('selectValue') //this.deviceInfo.selectValue = this.$cookie.set('selectValue')
this.deviceInfo.selectValue = this.options[this.deviceInfo.equipmentState].value this.deviceInfo.selectValue = this.options[
} this.deviceInfo.equipmentState
} ].value;
} },
},
};
</script> </script>
<style> <style>
.el-row { .el-row {
margin-bottom: 20px; margin-bottom: 20px;
}
} .el-col {
.el-col {
border-radius: 10px; border-radius: 10px;
} }
.bg-purple-dark { .bg-purple-dark {
background: #99a9bf; background: #99a9bf;
} }
.bg-purple { .bg-purple {
background: #d3dce6; background: #d3dce6;
} }
.bg-purple-light { .bg-purple-light {
background: #e5f2f1; background: #e5f2f1;
} }
.grid-content { .grid-content {
border-radius: 4px; border-radius: 4px;
min-height: 36px; min-height: 36px;
} }
.row-bg { .row-bg {
padding: 10px 0; padding: 10px 0;
background-color: #f9fafc; background-color: #f9fafc;
} }
.div_height{ .div_height {
height: 38px; height: 38px;
} }
.div_width{ .div_width {
width: 100%; width: 100%;
} }
.width_100{ .width_100 {
width: 100px; width: 100px;
} }
.center{ .center {
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
padding: 1em; padding: 1em;
}
.flex{
display:flex;
align-items: center;
justify-content:center;
width:100%;
height:100%;
border:1px solid;
}
.flex_son{
width:100%;
height:100%;
border:0x solid;
} }
.zero_size{ .flex {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
border: 1px solid;
}
.flex_son {
width: 100%;
height: 100%;
border: 0x solid;
}
.zero_size {
width: 1px; width: 1px;
height: 1px; height: 1px;
} }
</style> </style>

View File

@ -30,6 +30,7 @@
:distance="100" :distance="100"
spinner="circles" spinner="circles"
:identifier="infiniteId" :identifier="infiniteId"
> >
<!-- orce-use-infinite-wrapper 属性在存在多个 el-table 需要更详细的css选择器 --> <!-- orce-use-infinite-wrapper 属性在存在多个 el-table 需要更详细的css选择器 -->
<div class="no-more" slot="no-more">~是有底线的 ()</div> <div class="no-more" slot="no-more">~是有底线的 ()</div>
@ -127,7 +128,8 @@ export default {
console.log("totalPage", this.findEqInfo.totalPage) console.log("totalPage", this.findEqInfo.totalPage)
if(this.findEqInfo.currPage < this.findEqInfo.totalPage){ if(this.findEqInfo.currPage < this.findEqInfo.totalPage){
this.findEqInfo.currPage++ this.findEqInfo.currPage++
apiFindStaffDevice(this.findEqInfo).then((data) => { this.getData()
/*apiFindStaffDevice(this.findEqInfo).then((data) => {
console.log(data); console.log(data);
if (data && data.code === 0) { if (data && data.code === 0) {
this.findEqInfo.list = [...this.findEqInfo.list, ...data.data.list] this.findEqInfo.list = [...this.findEqInfo.list, ...data.data.list]
@ -147,27 +149,13 @@ export default {
this.findEqInfo.totalPage = 1 this.findEqInfo.totalPage = 1
$state.complete()// $state.complete()//
} }
}) })*/
} }
}, },
scan() { scan() {
this.clearDateCookie(); this.$cookie.set('idUser', this.findEqInfo.userId)
console.log("开始扫码"); this.$router.push({name: 'devicedetail', query: {type: 4}})
console.log(dd);
dd.biz.util.scan({
type: "all", // type allqrCodebarCodeall
onSuccess: function (data) {
console.log("sucess");
console.log(data);
this.deviceInfo.code = data.text;
this.getDeviceInfo();
}.bind(this),
onFail: function (err) {
console.log("fail");
console.log(err);
}.bind(this),
});
}, },
reset () { reset () {
this.findEqInfo.list = [] this.findEqInfo.list = []