bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端bug修改3.26

This commit is contained in:
zhouzy062 2024-03-26 11:29:39 +08:00
parent a78e50c8b3
commit df2f7805e4
13 changed files with 72 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -602,14 +602,8 @@ export default {
}, },
checkNum(row){ checkNum(row){
if(row.preNum>=0){ if(row.preNum<=1){
// if(row.preNum>=row.num){ row.preNum = 1
// row.preNum = row.num
// }else{
row.preNum = row.preNum
// }
}else{
row.preNum = 0
} }
}, },
/////// 设备类型树 切换 /////// 设备类型树 切换

3
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -305,8 +305,7 @@ export default {
async GetUserInfo(){ async GetUserInfo(){
const res = await getInfo() const res = await getInfo()
this.user = res.user this.user = res.user
this.user.roles.for // console.log(this.user)
console.log(this.user)
this.getList(); this.getList();
}, },
/** 查询列表 */ /** 查询列表 */

10
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
View File

@ -631,14 +631,8 @@ export default {
}, },
checkNum(row){ checkNum(row){
if(row.preNum>=0){ if(row.preNum<=1){
// if(row.preNum>=row.num){ row.preNum = 1
// row.preNum = row.num
// }else{
row.preNum = row.preNum
// }
}else{
row.preNum = 0
} }
}, },
/////// 设备类型树 切换 /////// 设备类型树 切换

3
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
View File

@ -292,8 +292,7 @@ export default {
async GetUserInfo(){ async GetUserInfo(){
const res = await getInfo() const res = await getInfo()
this.user = res.user this.user = res.user
this.user.roles.for // console.log(this.user)
console.log(this.user)
this.getList(); this.getList();
}, },
/** 查询列表 */ /** 查询列表 */

17
sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
View File

@ -756,22 +756,9 @@ export default {
}, },
checkNum(row){ checkNum(row){
if(row.num>=0){ if(row.num<=1){
row.num = row.num row.num = 1
}else{
row.num = 0
} }
// if(row.num>=0){
// if(row.num>=row.preNum){
// row.num = Number(row.preNum)
// }else{
// row.num = row.num
// }
// }else{
// row.num = 0
// }
}, },
/////// 设备类型树 切换 /////// 设备类型树 切换

17
sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
View File

@ -756,22 +756,9 @@ export default {
}, },
checkNum(row){ checkNum(row){
if(row.num>=0){ if(row.num<=1){
row.num = row.num row.num = 1
}else{
row.num = 0
} }
// if(row.num>=0){
// if(row.num>=row.preNum){
// row.num = Number(row.preNum)
// }else{
// row.num = row.num
// }
// }else{
// row.num = 0
// }
}, },
/////// 设备类型树 切换 /////// 设备类型树 切换

6
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -797,10 +797,8 @@ export default {
} }
}, },
checkNum(row){ checkNum(row){
if(row.num>=0){ if(row.num<=1){
row.num = row.num row.num = 1
}else{
row.num = 0
} }
}, },
handleExam() { handleExam() {

19
sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
View File

@ -18,6 +18,14 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工程名称" prop="proId">
<el-select v-model="queryParams.proId" placeholder="请选择工程名称" clearable>
<el-option
v-for="item in proList" filterable
:key="item.id" :label="item.name" :value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="类型名称" prop="typeId"> <el-form-item label="类型名称" prop="typeId">
<el-select <el-select
v-model="queryParams.typeId" v-model="queryParams.typeId"
@ -68,6 +76,7 @@
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" /> <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" /> <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
<el-table-column label="退库数量" align="center" prop="num" :show-overflow-tooltip="true" /> <el-table-column label="退库数量" align="center" prop="num" :show-overflow-tooltip="true" />
@ -89,7 +98,7 @@
<script> <script>
import { getOperateList } from "@/api/claimAndRefund/secondStore"; import { getOperateList } from "@/api/claimAndRefund/secondStore";
import { getUnitData } from "@/api/claimAndRefund/receive.js" import { getUnitData,getProData } from "@/api/claimAndRefund/receive.js"
import { getTypeList } from "@/api/store/warehousing"; import { getTypeList } from "@/api/store/warehousing";
import { equipmentTypeTree } from "@/api/store/tools"; import { equipmentTypeTree } from "@/api/store/tools";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
@ -124,6 +133,7 @@ export default {
dateRange: [], dateRange: [],
// 单位数据 // 单位数据
unitList: [], unitList: [],
proList: [],
//搜索下拉数据 //搜索下拉数据
typeList: [], typeList: [],
equipmentTypeList: [], equipmentTypeList: [],
@ -141,6 +151,7 @@ export default {
created() { created() {
this.getTypeList(); this.getTypeList();
this.getUnitList(); this.getUnitList();
this.getProList();
this.equipmentType(); this.equipmentType();
this.getList(); this.getList();
}, },
@ -151,6 +162,12 @@ export default {
this.unitList = response.data; this.unitList = response.data;
}) })
}, },
//获取工程
getProList(){
getProData().then(response => {
this.proList = response.data;
})
},
getTypeList() { getTypeList() {
getTypeList({level:'3'}).then(response => { getTypeList({level:'3'}).then(response => {
this.typeList = response.data; this.typeList = response.data;

24
sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
View File

@ -18,6 +18,14 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工程名称" prop="proId">
<el-select v-model="queryParams.proId" placeholder="请选择工程名称" clearable>
<el-option
v-for="item in proList" filterable
:key="item.id" :label="item.name" :value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="类型名称" prop="typeId"> <el-form-item label="类型名称" prop="typeId">
<el-select <el-select
v-model="queryParams.typeId" v-model="queryParams.typeId"
@ -71,6 +79,7 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" /> <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" /> <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
<el-table-column label="出库数量" align="center" prop="num" :show-overflow-tooltip="true" /> <el-table-column label="出库数量" align="center" prop="num" :show-overflow-tooltip="true" />
@ -92,7 +101,7 @@
<script> <script>
import { getOperateList } from "@/api/claimAndRefund/secondStore"; import { getOperateList } from "@/api/claimAndRefund/secondStore";
import { getUnitData } from "@/api/claimAndRefund/receive.js" import { getUnitData,getProData } from "@/api/claimAndRefund/receive.js"
import { getTypeList } from "@/api/store/warehousing"; import { getTypeList } from "@/api/store/warehousing";
import { equipmentTypeTree } from "@/api/store/tools"; import { equipmentTypeTree } from "@/api/store/tools";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
@ -117,6 +126,8 @@ export default {
total: 0, total: 0,
// 字典表格数据 // 字典表格数据
tableList: [], tableList: [],
unitList: [],
proList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -138,16 +149,23 @@ export default {
created() { created() {
this.getTypeList(); this.getTypeList();
this.getUnitList(); this.getUnitList();
this.getProList();
this.equipmentType(); this.equipmentType();
this.getList(); this.getList();
}, },
methods: { methods: {
//获取单位 //获取单位
getUnitList(){ getUnitList(){
getUnitData().then(response => { getUnitData().then(response => {
this.unitList = response.data; this.unitList = response.data;
}) })
}, },
//获取工程
getProList(){
getProData().then(response => {
this.proList = response.data;
})
},
getTypeList() { getTypeList() {
getTypeList({level:'3'}).then(response => { getTypeList({level:'3'}).then(response => {
this.typeList = response.data; this.typeList = response.data;

19
sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
View File

@ -18,6 +18,14 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工程名称" prop="proId">
<el-select v-model="queryParams.proId" placeholder="请选择工程名称" clearable>
<el-option
v-for="item in proList" filterable
:key="item.id" :label="item.name" :value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="类型名称" prop="typeId"> <el-form-item label="类型名称" prop="typeId">
<el-select <el-select
v-model="queryParams.typeId" v-model="queryParams.typeId"
@ -70,6 +78,7 @@
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" /> <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" /> <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
<el-table-column label="进场数量" align="center" prop="jcNum" :show-overflow-tooltip="true"> <el-table-column label="进场数量" align="center" prop="jcNum" :show-overflow-tooltip="true">
@ -234,7 +243,7 @@
<script> <script>
import { secondaryWarehouseList,operate,getRecords } from "@/api/claimAndRefund/secondStore"; import { secondaryWarehouseList,operate,getRecords } from "@/api/claimAndRefund/secondStore";
import { getUnitData } from "@/api/claimAndRefund/receive.js" import { getUnitData,getProData } from "@/api/claimAndRefund/receive.js"
import { getTypeList } from "@/api/store/warehousing"; import { getTypeList } from "@/api/store/warehousing";
import { equipmentTypeTree } from "@/api/store/tools"; import { equipmentTypeTree } from "@/api/store/tools";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
@ -268,6 +277,7 @@ export default {
dateRange: [], dateRange: [],
// 单位数据 // 单位数据
unitList: [], unitList: [],
proList: [],
//搜索下拉数据 //搜索下拉数据
typeList: [], typeList: [],
equipmentTypeList: [], equipmentTypeList: [],
@ -319,6 +329,7 @@ export default {
created() { created() {
this.getTypeList(); this.getTypeList();
this.getUnitList(); this.getUnitList();
this.getProList();
this.equipmentType(); this.equipmentType();
this.getList(); this.getList();
@ -330,6 +341,12 @@ export default {
this.unitList = response.data; this.unitList = response.data;
}) })
}, },
//获取工程
getProList(){
getProData().then(response => {
this.proList = response.data;
})
},
getTypeList() { getTypeList() {
getTypeList({level:'3'}).then(response => { getTypeList({level:'3'}).then(response => {
this.typeList = response.data; this.typeList = response.data;

2
sgzb-ui/src/views/store/label/labelBinding.vue
View File

@ -507,7 +507,7 @@ export default {
codeId: true, codeId: true,
isShowQrCode: -1, isShowQrCode: -1,
labelmaCode: '', labelmaCode: '',
qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=', qrUrl:'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode=',
json_fields:{"二维码地址":'exportUrl',"标签编号":'labelCode',"设备编码":'maCode'}, json_fields:{"二维码地址":'exportUrl',"标签编号":'labelCode',"设备编码":'maCode'},
}; };
}, },

2
sgzb-ui/src/views/store/label/labelBindingHistory.vue
View File

@ -183,7 +183,7 @@ export default {
rowObj: {}, rowObj: {},
labelmaCode: '', labelmaCode: '',
uploadOpen: false, uploadOpen: false,
qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=', qrUrl:'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode=',
}; };
}, },
created() { created() {

2
sgzb-ui/src/views/store/tools/devices.vue
View File

@ -384,7 +384,7 @@ export default {
title: "", title: "",
uploadOpen: false, uploadOpen: false,
qrCode: '', qrCode: '',
qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=', qrUrl:'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode=',
rowObj:{}, rowObj:{},
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,