suojin
/
lab-ops-ui-web
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改

Browse Source
master
zhangdi 1 year ago
parent 6f0457633a
commit a086b2993a
8 changed files with 451 additions and 427 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      src/views/businessManagement/ordinary.vue
  2. 4
      src/views/device/deviceSystem.vue
  3. 4
      src/views/goodsManagement/reciviceList.vue
  4. 39
      src/views/labManagement/inspectionManagement.vue
  5. 4
      src/views/system/dept.vue
  6. 32
      src/views/system/user.vue
  7. 2
      src/views/workbench/index.vue
  8. 4
      vue.config.js

27
src/views/businessManagement/ordinary.vue
Unescape View File

@ -45,8 +45,10 @@
<el-button v-show="permission.ordinaryClose && row.status == 101" @click="handleClone(row)">关闭</el-button> <el-button v-show="permission.ordinaryClose && row.status == 101" @click="handleClone(row)">关闭</el-button>
<el-button v-show="permission.ordinaryConfirm && row.status == 201" @click="reciveOrder(row)">确认</el-button> <el-button v-show="permission.ordinaryConfirm && row.status == 201" @click="reciveOrder(row)">确认</el-button>
<!-- 维修人员驳回 -->
<el-button v-show="permission.ordinaryRefuse && row.status == 201" @click="repairReject(row)">驳回</el-button> <el-button v-show="permission.ordinaryRefuse && row.status == 201" @click="repairReject(row)">驳回</el-button>
<el-button @click="handleExport(row)" <el-button @click="handleExport(row)"
v-show="row.status == 104 || row.status == 403 || row.status == 202 || row.status == 203 || row.status == 204">报告</el-button> v-show="row.status == 104 || row.status == 403 || row.status == 202 || row.status == 203 || row.status == 204">报告</el-button>
@ -1572,7 +1574,7 @@ export default {
handleReject() { handleReject() {
this.$refs.rejectForm.validate((valid) => { this.$refs.rejectForm.validate((valid) => {
if (valid) { if (valid) {
if (this.role_id == '1839552581620793346') { // if (this.role_id == '1839552581620793346') {
let query = { let query = {
id: this.rejectForm.id, id: this.rejectForm.id,
repaiRejectReason: this.rejectForm.reason repaiRejectReason: this.rejectForm.reason
@ -1585,7 +1587,7 @@ export default {
this.onLoad() this.onLoad()
} }
}) })
} // }
} }
}) })
@ -1715,7 +1717,23 @@ export default {
this.$message.error('请至少填写一条维修材料信息') this.$message.error('请至少填写一条维修材料信息')
} else { } else {
let data = [] let data = []
let goodsList = []
this.tableData.map((item, index) => { this.tableData.map((item, index) => {
goodsList.push({
productId: item.id,
productName: item.productName,
applyNum: item.number,
orderId: this.repairForm.id,
materialName: item.productName,
materialCount: item.number,
materialPrice: item.price,
bigClassId: item.productType.node,
rule: item.rule,
unit: item.unit,
xh: item.xh,
inventoryId: item.inventoryId
// outNum:""
})
data.push({ data.push({
orderId: this.repairForm.id, orderId: this.repairForm.id,
materialName: item.productName, materialName: item.productName,
@ -1746,13 +1764,14 @@ export default {
query.discount = 0 query.discount = 0
} }
let query1 = { let query1 = {
details: data, details: goodsList,
applyUserId: this.userInfo.user_id, //申领人Id applyUserId: this.userInfo.user_id, //申领人Id
applyUser: this.userInfo.user_name, //申领人 applyUser: this.userInfo.user_name, //申领人
applyTime: moment().format('YYYY-MM-DD HH:mm:ss'), //申领时间(yyyy-MM-dd HH:mm:ss) applyTime: moment().format('YYYY-MM-DD HH:mm:ss'), //申领时间(yyyy-MM-dd HH:mm:ss)
status: 0, status: 0,
workId: this.addForm.id, workId: this.repairForm.id,
remark: '维修单申领' remark: '维修单申领'
} }

4
src/views/device/deviceSystem.vue
Unescape View File

@ -127,8 +127,8 @@
format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择生产时间"> format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择生产时间">
</el-date-picker> </el-date-picker>
</el-form-item> --> </el-form-item> -->
<el-form-item label="描述" prop="supplier"> <el-form-item label="备注" prop="supplier">
<el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入描述" <el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入备注"
v-model="addForm.description"></el-input> v-model="addForm.description"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关联实验室" prop="lab"> <el-form-item label="关联实验室" prop="lab">

4
src/views/goodsManagement/reciviceList.vue
Unescape View File

@ -12,7 +12,7 @@
<el-table-column label="型号" prop="xh"></el-table-column> <el-table-column label="型号" prop="xh"></el-table-column>
<el-table-column label="参数" prop="rule"></el-table-column> <el-table-column label="参数" prop="rule"></el-table-column>
<el-table-column label="申领数量" prop="applyNum"></el-table-column> <el-table-column label="申领数量" prop="applyNum"></el-table-column>
<el-table-column label="出库数量" prop="outNum"></el-table-column> <el-table-column label="实际出库数量" prop="outNum"></el-table-column>
<el-table-column label="归还日期" prop="returnTime"></el-table-column> <el-table-column label="归还日期" prop="returnTime"></el-table-column>
</el-table> </el-table>
</template> </template>
@ -57,7 +57,7 @@
<el-table-column label="型号" :resizable="false" prop="xh"></el-table-column> <el-table-column label="型号" :resizable="false" prop="xh"></el-table-column>
<el-table-column label="参数" :resizable="false" prop="rule"></el-table-column> <el-table-column label="参数" :resizable="false" prop="rule"></el-table-column>
<el-table-column label="申领数量" :resizable="false" prop="applyNum"></el-table-column> <el-table-column label="申领数量" :resizable="false" prop="applyNum"></el-table-column>
<el-table-column label="出库数量" :resizable="false" prop="outNum" v-if="receiveForm.status != 0"> <el-table-column label="实际出库数量" :resizable="false" prop="outNum" v-if="receiveForm.status != 0">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number @change="changeCount(scope.row)" :disabled="viewType != 'import'" style="width:98%" <el-input-number @change="changeCount(scope.row)" :disabled="viewType != 'import'" style="width:98%"
:min="0" :max="scope.row.applyNum" v-model="scope.row.outNum" label="出库数量"></el-input-number> :min="0" :max="scope.row.applyNum" v-model="scope.row.outNum" label="出库数量"></el-input-number>

39
src/views/labManagement/inspectionManagement.vue
Unescape View File

@ -4,13 +4,12 @@
<el-col :span="24"> <el-col :span="24">
<basic-container> <basic-container>
<avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
@row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
@search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange" @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"> @refresh-change="refreshChange" @on-load="onLoad">
<template slot-scope="scope" slot="menuLeft"> <template slot-scope="scope" slot="menuLeft">
<el-button v-show="permission.contentAdd" type="primary" size="small" <el-button v-show="permission.contentAdd" type="primary" size="small" @click="handleAdd">新建</el-button>
@click="handleAdd">新建</el-button>
</template> </template>
<template slot-scope="{ row }" slot="isOpen"> <template slot-scope="{ row }" slot="isOpen">
<el-tag :type="row.isOpen == 0 ? 'danger' : 'success'">{{ row.isOpen == 0 ? '停用' : '启用' <el-tag :type="row.isOpen == 0 ? 'danger' : 'success'">{{ row.isOpen == 0 ? '停用' : '启用'
@ -19,18 +18,16 @@
<template slot-scope="{ row }" slot="menu"> <template slot-scope="{ row }" slot="menu">
<el-button v-show="permission.contentView" @click="handleView(row)">查看</el-button> <el-button v-show="permission.contentView" @click="handleView(row)">查看</el-button>
<el-button v-show="permission.contentEdit" @click="handleEdit(row)">编辑</el-button> <el-button v-show="permission.contentEdit" @click="handleEdit(row)">编辑</el-button>
<el-button @click="startPlan(row)" <el-button @click="startPlan(row)" v-show="row.isOpen == 0 && permission.contentSetting">启用</el-button>
v-show="row.isOpen == 0 && permission.contentSetting">启用</el-button> <el-button @click="stopPlan(row)" v-show="row.isOpen == 1 && permission.contentSetting">停用</el-button>
<el-button @click="stopPlan(row)"
v-show="row.isOpen == 1 && permission.contentSetting">停用</el-button>
<el-button @click="deletePlan(row)" v-show="permission.contentDelete">删除</el-button> <el-button @click="deletePlan(row)" v-show="permission.contentDelete">删除</el-button>
<el-button @click="handleDownload(row)" <el-button @click="handleDownload(row)" v-show="permission.contentDelete">下载</el-button>
v-show="permission.contentDelete">下载</el-button>
<el-button type="primary" @click="handleExportDevice(row)">导出</el-button> <el-button type="primary" @click="handleExportDevice(row)">导出</el-button>
<!-- <el-button @click="handleImport(row)">导入</el-button> --> <!-- <el-button @click="handleImport(row)">导入</el-button> -->
</template> </template>
</avue-crud> </avue-crud>
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :append-to-body="true" width="70%" :close-on-click-modal="false"> <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :append-to-body="true" width="70%"
:close-on-click-modal="false">
<addDialog :unitData="unitData" :title="dialogTitle" :detailForm="detailForm" ref="addDialog"> <addDialog :unitData="unitData" :title="dialogTitle" :detailForm="detailForm" ref="addDialog">
</addDialog> </addDialog>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -142,12 +139,12 @@ export default {
columnBtn: false, columnBtn: false,
menuWidth: 300, menuWidth: 300,
searchShowBtn: false,   // 栏目折叠显隐 searchShowBtn: false,   // 栏目折叠显隐
        refreshBtn: false,      // 刷新 refreshBtn: false,      // 刷新
        columnBtn: false,       // 操作列显隐 columnBtn: false,       // 操作列显隐
        gridBtn:false, gridBtn: false,
        excelBtn: false,       // 导出Excel excelBtn: false,       // 导出Excel
        printBtn: false,       // 表格打印导出 printBtn: false,       // 表格打印导出
        filterBtn: false,      // 筛选 filterBtn: false,      // 筛选
column: [ column: [
{ {
label: "巡检计划单号", label: "巡检计划单号",
@ -263,6 +260,10 @@ export default {
}) })
}, },
deletePlan(row) { deletePlan(row) {
if (row.isOpen == 1) {
this.$message.error('请先停用巡检计划！')
return false
}
this.$confirm('确定删除该计划?', '提示', { this.$confirm('确定删除该计划?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',

4
src/views/system/dept.vue
Unescape View File

@ -260,6 +260,7 @@ export default {
}); });
// 数据回调进行刷新 // 数据回调进行刷新
done(row); done(row);
this.onLoad();
}, error => { }, error => {
window.console.log(error); window.console.log(error);
loading(); loading();
@ -273,8 +274,10 @@ export default {
}); });
// 数据回调进行刷新 // 数据回调进行刷新
done(row); done(row);
this.onLoad();
}, error => { }, error => {
window.console.log(error); window.console.log(error);
loading(); loading();
}); });
}, },
@ -387,6 +390,7 @@ export default {
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
this.data = []
getLazyList(this.parentId, Object.assign(params, this.query)).then(res => { getLazyList(this.parentId, Object.assign(params, this.query)).then(res => {
this.data = res.data.data; this.data = res.data.data;
this.loading = false; this.loading = false;

32
src/views/system/user.vue
Unescape View File

@ -728,14 +728,14 @@ export default {
row.deptId = func.join(row.deptId); row.deptId = func.join(row.deptId);
row.roleId = func.join(row.roleId); row.roleId = func.join(row.roleId);
row.postId = func.join(row.postId); row.postId = func.join(row.postId);
if (row.deptId.split(',').length > 1) { // if (row.deptId.split(',').length > 1) {
this.$message({ // this.$message({
type: "error", // type: "error",
message: "所属部门只能选择一个！" // message: "所属部门只能选择一个！"
}); // });
loading(); // loading();
return false // return false
} // }
add(row).then(() => { add(row).then(() => {
this.initFlag = false; this.initFlag = false;
this.onLoad(this.page); this.onLoad(this.page);
@ -753,14 +753,14 @@ export default {
row.deptId = func.join(row.deptId); row.deptId = func.join(row.deptId);
row.roleId = func.join(row.roleId); row.roleId = func.join(row.roleId);
row.postId = func.join(row.postId); row.postId = func.join(row.postId);
if (row.deptId.split(',').length > 1) { // if (row.deptId.split(',').length > 1) {
this.$message({ // this.$message({
type: "error", // type: "error",
message: "所属部门只能选择一个！" // message: "所属部门只能选择一个！"
}); // });
loading(); // loading();
return false // return false
} // }
update(row).then(() => { update(row).then(() => {
this.initFlag = false; this.initFlag = false;
this.onLoad(this.page); this.onLoad(this.page);

2
src/views/workbench/index.vue
Unescape View File

@ -893,7 +893,7 @@ export default {
{ {
name: '维修数量', name: '维修数量',
type: 'bar', type: 'bar',
barWidth: this.numData == 1 ? 50 : null, barWidth: this.numData == 1 ? 30 : 30,
data: this.peopleNum, data: this.peopleNum,
itemStyle: { itemStyle: {
color: '#2478f2' color: '#2478f2'

4
vue.config.js
Unescape View File

@ -28,8 +28,8 @@ module.exports = {
//本地服务接口地址 //本地服务接口地址
// target: 'http://localhost', // target: 'http://localhost',
// target:'http://192.168.0.111:80', // target:'http://192.168.0.111:80',
// target:'http://192.168.1.12:10001', target:'http://192.168.1.12:10001',
target:'http://192.168.1.4:10001', // target:'http://192.168.1.4:10001',
// target:'http://192.168.0.116:80', // target:'http://192.168.0.116:80',
// target:'http://192.168.0.108:80', // target:'http://192.168.0.108:80',
//远程演示服务地址,可用于直接启动项目 //远程演示服务地址,可用于直接启动项目

Write Preview
Loading…
Cancel
Save