测试问题修改

master
zhangdi 1 year ago
parent 6f0457633a
commit a086b2993a
  1. 29
      src/views/businessManagement/ordinary.vue
  2. 4
      src/views/device/deviceSystem.vue
  3. 4
      src/views/goodsManagement/reciviceList.vue
  4. 41
      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

@ -45,8 +45,10 @@
<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.ordinaryRefuse && row.status == 201" @click="repairReject(row)">驳回</el-button>
<el-button @click="handleExport(row)"
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() {
this.$refs.rejectForm.validate((valid) => {
if (valid) {
if (this.role_id == '1839552581620793346') {
// if (this.role_id == '1839552581620793346') {
let query = {
id: this.rejectForm.id,
repaiRejectReason: this.rejectForm.reason
@ -1585,7 +1587,7 @@ export default {
this.onLoad()
}
})
}
// }
}
})
@ -1715,7 +1717,23 @@ export default {
this.$message.error('请至少填写一条维修材料信息')
} else {
let data = []
let goodsList = []
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({
orderId: this.repairForm.id,
materialName: item.productName,
@ -1746,14 +1764,15 @@ export default {
query.discount = 0
}
let query1 = {
details: data,
details: goodsList,
applyUserId: this.userInfo.user_id, //Id
applyUser: this.userInfo.user_name, //
applyTime: moment().format('YYYY-MM-DD HH:mm:ss'), //(yyyy-MM-dd HH:mm:ss)
status: 0,
workId: this.addForm.id,
remark:'维修单申领'
workId: this.repairForm.id,
remark: '维修单申领'
}
editData(query).then(res => {

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

@ -12,7 +12,7 @@
<el-table-column label="型号" prop="xh"></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="outNum"></el-table-column>
<el-table-column label="实际出库数量" prop="outNum"></el-table-column>
<el-table-column label="归还日期" prop="returnTime"></el-table-column>
</el-table>
</template>
@ -57,7 +57,7 @@
<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="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">
<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>

@ -4,13 +4,12 @@
<el-col :span="24">
<basic-container>
<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"
@row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange"
@search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
:before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
<template slot-scope="scope" slot="menuLeft">
<el-button v-show="permission.contentAdd" type="primary" size="small"
@click="handleAdd">新建</el-button>
<el-button v-show="permission.contentAdd" type="primary" size="small" @click="handleAdd">新建</el-button>
</template>
<template slot-scope="{ row }" slot="isOpen">
<el-tag :type="row.isOpen == 0 ? 'danger' : 'success'">{{ row.isOpen == 0 ? '停用' : '启用'
@ -19,18 +18,16 @@
<template slot-scope="{ row }" slot="menu">
<el-button v-show="permission.contentView" @click="handleView(row)">查看</el-button>
<el-button v-show="permission.contentEdit" @click="handleEdit(row)">编辑</el-button>
<el-button @click="startPlan(row)"
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="startPlan(row)" 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="deletePlan(row)" v-show="permission.contentDelete">删除</el-button>
<el-button @click="handleDownload(row)"
v-show="permission.contentDelete">下载</el-button>
<el-button @click="handleDownload(row)" v-show="permission.contentDelete">下载</el-button>
<el-button type="primary" @click="handleExportDevice(row)">导出</el-button>
<!-- <el-button @click="handleImport(row)">导入</el-button> -->
</template>
</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>
<span slot="footer" class="dialog-footer">
@ -142,12 +139,12 @@ export default {
columnBtn: false,
menuWidth: 300,
searchShowBtn: false,   //
        refreshBtn: false,      //
        columnBtn: false,       //
        gridBtn:false,
        excelBtn: false,       // Excel
        printBtn: false,       //
        filterBtn: false,      //
refreshBtn: false,      //
columnBtn: false,       //
gridBtn: false,
excelBtn: false,       // Excel
printBtn: false,       //
filterBtn: false,      //
column: [
{
label: "巡检计划单号",
@ -263,6 +260,10 @@ export default {
})
},
deletePlan(row) {
if (row.isOpen == 1) {
this.$message.error('请先停用巡检计划!')
return false
}
this.$confirm('确定删除该计划?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -344,7 +345,7 @@ export default {
URL.revokeObjectURL(link.href)
document.body.removeChild(link)
})
}else{
} else {
this.$message.error('该巡检内容没有维护合同附件')
}
})

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

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

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

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

Loading…
Cancel
Save