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

Compare commits

base: bonus:aa2a2a7ab0938d64e31b38e8ef937ef85818219b
Branches Tags
bonus:main
bonus:dev-nx
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master
..
compare: bonus:2495ce88f591b60d3ec349a8630c6e9f96bd2e38
Branches Tags
bonus:dev-nx
bonus:main
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master

No commits in common. "aa2a2a7ab0938d64e31b38e8ef937ef85818219b" and "2495ce88f591b60d3ec349a8630c6e9f96bd2e38" have entirely different histories.
aa2a2a7ab0 ... 2495ce88f5

3 changed files with 72 additions and 167 deletions
Show Stats Expand all files Collapse all files

197
sgzb-ui/src/views/base/section/index.vue
View File

@ -1,13 +1,6 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="名称" prop="lotName">
<el-input
v-model="queryParams.lotName"
@ -19,16 +12,8 @@
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -40,8 +25,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
>新增</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@ -52,92 +36,49 @@
@click="handleExport"
>导出</el-button>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="projectLot"
@selection-change="handleSelectionChange"
>
<el-table v-loading="loading" :data="projectLot" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="lotId" />
<el-table-column
label="标段工程名称"
align="center"
prop="lotName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="工程类型"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="所属工程项目"
align="center"
prop="ownPro"
:show-overflow-tooltip="true"
/>
<el-table-column
label="所属上级"
align="center"
prop="deptName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="联系人"
align="center"
prop="linkMan"
:show-overflow-tooltip="true"
/>
<el-table-column
label="联系电话"
align="center"
prop="telphone"
:show-overflow-tooltip="true"
/>
<el-table-column label="标段工程名称" align="center" prop="lotName" :show-overflow-tooltip="true" />
<el-table-column label="工程类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="所属工程项目" align="center" prop="ownPro" :show-overflow-tooltip="true" />
<el-table-column label="所属上级" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="联系人" align="center" prop="linkMan" :show-overflow-tooltip="true" />
<el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status" width="180">
<template slot-scope="scope">
<el-switch
active-value="0"
active-value="0"
inactive-value="1"
@change="changeStatus(scope.row)"
v-model="scope.row.status"
>
v-model="scope.row.status">
</el-switch>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button
>
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
>
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -152,44 +93,30 @@
</el-form-item>
<el-form-item label="所属工程项目" prop="ownPro">
<!-- <el-input v-model="form.ownPro" placeholder="请输入所属工程项目" /> -->
<el-select
v-model="form.ownPro"
placeholder="请选择所属工程项目"
style="width: 100%"
>
<el-select v-model="form.ownPro" placeholder="请选择所属工程项目" style="width: 100%;">
<el-option
v-for="item in ProjectSelect"
:key="item.proName"
:label="item.proName"
:value="item.proName"
v-if="item.status != '1'"
v-if="item.status !='1'"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程类型" prop="typeId">
<!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> -->
<el-select
v-model="form.typeId"
placeholder="请选择工程类型"
style="width: 100%"
@change="selecType"
>
<el-select v-model="form.typeId" placeholder="请选择工程类型" style="width: 100%;" @change="selecType">
<el-option
v-for="item in typeList"
:key="item.id"
:label="item.name"
:value="item.id"
v-if="item.status != '1'"
v-if="item.status !='1'"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属上级" prop="deptId">
<treeselect
v-model="form.deptId"
:options="deptOptions"
placeholder="请选择所属上级"
@select="select"
/>
<treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择所属上级" @select="select"/>
</el-form-item>
<el-form-item label="联系人" prop="linkMan">
<el-input v-model="form.linkMan" placeholder="请输入联系人" />
@ -197,6 +124,8 @@
<el-form-item label="联系电话" prop="telphone">
<el-input v-model="form.telphone" placeholder="请输入联系电话" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -207,8 +136,8 @@
</template>
<script>
import { addProjectLot, delProjectLot, ProjectLotList, updateProjectLot, getProjectSelect } from "@/api/base/base";
import { unitTypeList } from "@/api/base/base";
import {addProjectLot, delProjectLot, ProjectLotList, updateProjectLot, getProjectSelect} from "@/api/base/base";
import { unitTypeList} from "@/api/base/base";
import { deptTreeSelect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -232,10 +161,10 @@ export default {
total: 0,
// 表格数据
projectLot: [],
//字典数据
typeList: [],
//所属项目工程列表
ProjectSelect: [],
//字典数据
typeList: [],
//所属项目工程列表
ProjectSelect: [],
// 部门树选项
deptOptions: undefined,
// 弹出层标题
@ -259,9 +188,9 @@ export default {
lotName: [
{ required: true, message: "标段工程名称不能为空", trigger: "blur" }
],
// ownPro: [
// { required: true, message: "所属工程项目不能为空", trigger: "blur" }
// ],
ownPro: [
{ required: true, message: "所属工程项目不能为空", trigger: "blur" }
],
typeId: [
{ required: true, message: "工程类型不能为空", trigger: "blur" }
],
@ -282,18 +211,18 @@ export default {
},
methods: {
//获取所属项目工程下拉数据
getProjectSelect() {
getProjectSelect(){
getProjectSelect().then(response => {
this.ProjectSelect = response.rows;
})
this.ProjectSelect = response.rows;
})
},
//获取工程类型
getType() {
unitTypeList({ id: "5" }).then(response => {
this.typeList = response.rows;
})
getType(){
unitTypeList({id:"5"}).then(response => {
this.typeList = response.rows;
})
},
selecType(id) {
selecType(id){
// this.typeList.forEach(item => {
// if(item.id == id){
// this.form.typeName = item.name
@ -306,28 +235,28 @@ export default {
this.deptOptions = response.data;
});
},
select(row) {
select(row){
// console.log(row.label)
// this.form.deptName = row.label;
},
//更新
changeStatus(row) {
changeStatus(row){
let param = {
lotId: row.lotId,
status: row.status
lotId:row.lotId,
status:row.status
}
updateProjectLot(param).then(response => {
this.getList();
});
this.getList();
});
},
/** 查询字典类型列表 */
getList() {
this.loading = true;
ProjectLotList(this.queryParams).then(response => {
this.projectLot = response.rows;
this.total = response.total;
this.loading = false;
}
this.projectLot = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
// 取消按钮
@ -366,21 +295,21 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.lotId)
this.single = selection.length != 1
this.single = selection.length!=1
this.multiple = !selection.length
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
ProjectLotList({ lotId: row.lotId }).then(response => {
this.form = response.rows[0]
});
this.open = true;
this.title = "编辑";
this.reset();
ProjectLotList({lotId:row.lotId}).then(response => {
this.form = response.rows[0]
});
this.open = true;
this.title = "编辑";
},
/** 提交按钮 */
submitForm: function () {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.lotId != undefined) {
@ -402,12 +331,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const lotIds = row.lotId || this.ids;
this.$modal.confirm('是否确认删除该数据项？').then(function () {
this.$modal.confirm('是否确认删除该数据项？').then(function() {
return delProjectLot(lotIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {

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

@ -273,14 +273,6 @@
</el-select>
<!-- <el-input v-model="form.labelCode" placeholder="请输入标签编号" /> -->
</el-form-item>
<el-form-item label="规格型号" prop="typeId">
<treeselect
v-model="form.typeId"
:options="deptOptions"
placeholder="请选择规格型号"
@select="select"
/>
</el-form-item>
<el-form-item label="设备编码" prop="maCode">
<el-input v-model="form.maCode" placeholder="请输入设备编码" />
</el-form-item>
@ -386,16 +378,11 @@ import html2canvas from "html2canvas";
import QRCode from 'qrcodejs2'
import JSZip from 'jszip'
import FileSaver from "file-saver"
import { getDeviceTypeTree } from "@/api/claimAndRefund/receive";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Dict",
dicts: ['sys_normal_disable'],
components: { Treeselect },
data() {
return {
deptOptions: undefined,
rowObj: {},
userInfo: user.state,
// 遮罩层
@ -436,14 +423,11 @@ export default {
form: {},
// 表单校验
rules: {
// labelType: [
// { required: true, message: "标签类型不能为空", trigger: "blur" }
// ],
// labelCode: [
// { required: true, message: "标签编号不能为空", trigger: "blur" }
// ],
typeId: [
{ required: true, message: "规格型号不能为空", trigger: "blur" }
labelType: [
{ required: true, message: "标签类型不能为空", trigger: "blur" }
],
labelCode: [
{ required: true, message: "标签编号不能为空", trigger: "blur" }
],
maCode: [
{ required: true, message: "设备编码不能为空", trigger: "blur" }
@ -546,14 +530,11 @@ export default {
this.open = true;
this.title = "绑定";
this.form.id = this.ids[0].id;
// this.form.typeId = this.ids[0].typeId;
this.form.typeId = this.ids[0].typeId;
this.form.maId = this.ids[0].maId;
this.form.labelId = this.ids[0].labelId;
this.form.labelType = this.ids[0].labelType;
this.form.labelCode = this.ids[0].labelCode;
getDeviceTypeTree({ "level": "4" }).then(response => {
this.deptOptions = response.data;
});
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -568,8 +549,7 @@ export default {
/** 提交按钮 */
submitForm: function () {
this.form.binder = this.userInfo.id + '';
// this.form.typeId
console.log(this.form);
this.form.typeId
this.$refs["form"].validate(valid => {
if (valid) {
addLabelBind(this.form).then(response => {
@ -580,9 +560,6 @@ export default {
}
});
},
select(val) {
this.form.typeId = val.id
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;

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

@ -169,11 +169,10 @@
<el-table-column label="绑定时间" align="center" prop="bindTime" />
<el-table-column label="操作类型" align="center" prop="status">
<template slot-scope="scope">
{{ scope.row.status == 0 ? '停用' : '正常' }}
<!-- <dict-tag
<dict-tag
:options="dict.type.sys_normal_disable"
:value="scope.row.status"
/> -->
/>
</template>
</el-table-column>