修改项目Bug

main
jinna 2 years ago
parent 5e59ea7ff3
commit 8f2b80cbc4
  1. 341
      src/const/capital/productclass.js
  2. 5
      src/views/capital/productstoreList.vue
  3. 5
      src/views/limsConfig/equipmentManage.vue
  4. 2
      src/views/purchasing/checkList.vue
  5. 22
      src/views/purchasing/purchaseApply.vue
  6. 2
      src/views/repair/repairAppyDetail.vue

@ -1,183 +1,176 @@
const num = (rule, value, callback) => { const num = (rule, value, callback) => {
if (value < 0) { if (value < 0) {
callback(new Error('必须大于0')); callback(new Error("必须大于0"));
return false return false;
} }
callback(); callback();
}; };
const statisticsTypeDic = const statisticsTypeDic = [
[ {
{ label: "否",
label: '否', value: 0,
value: 0 },
}, {
{ label: "是",
label: '是', value: 1,
value: 1 },
}, ];
] const gType = [
const gType = {
[ label: "启用",
{ value: 0,
label: '启用', },
value: 0 {
}, { label: "禁用",
label: '禁用', value: 1,
value: 1 },
} ];
] const Type = [
const Type = {
[ label: "固定资产",
{ value: 1,
label:'固定资产', },
value:1 // {
}, // label:'试剂类',
{ // value:2
label:'试剂类', // },
value:2 // {
}, // label:'耗材类',
{ // value:3
label:'耗材类', // }
value:3 ];
}
]
export const tableOption = { export const tableOption = {
calcHeight: 210, calcHeight: 210,
searchShow: true, searchShow: true,
searchMenuSpan: 4, searchMenuSpan: 4,
border: false, border: false,
viewBtn: false, viewBtn: false,
editBtn: false, editBtn: false,
addBtn: false, addBtn: false,
delBtn: false, delBtn: false,
index: false, index: false,
columnBtn: false, columnBtn: false,
refreshBtn: false, refreshBtn: false,
searchShowBtn: false, searchShowBtn: false,
menuWidth: 280, menuWidth: 280,
headerAlign: "left", headerAlign: "left",
align: "left", align: "left",
menuPosition: "left", menuPosition: "left",
emptyBtnText: "重置", emptyBtnText: "重置",
searchBtnText: "查询", searchBtnText: "查询",
searchSpan: 5, searchSpan: 5,
selection: false, selection: false,
tip: false, tip: false,
tree: true, tree: true,
searchBtn:false, searchBtn: false,
emptyBtn:false, emptyBtn: false,
slot: true, slot: true,
//弹框 //弹框
saveBtn:false, saveBtn: false,
cancelBtn:false, cancelBtn: false,
dialogWidth: 920, dialogWidth: 920,
addBtn:false, addBtn: false,
updateBtn:false, updateBtn: false,
tip: false, tip: false,
labelPosition: "top", labelPosition: "top",
columnBtn: false, columnBtn: false,
refreshBtn: false, refreshBtn: false,
dialogCustomClass:"custom", dialogCustomClass: "custom",
addTitle:"新增", addTitle: "新增",
menuHeaderAlign: 'left', menuHeaderAlign: "left",
column: column: [
[ {
{ label: "类型",
label: "类型", prop: "name",
prop: "name", searchLabelWidth: 60,
searchLabelWidth: 60, span: 8,
span: 8, rules: [
rules: {
[ required: true,
{ message: "请输入类型名称",
required: true, trigger: "blur",
message: "请输入类型名称", },
trigger: "blur" ],
} overHidden: true,
], },
overHidden:true, {
}, label: "资产类型",
{ prop: "productCategory",
label: "资产类型", type: "select",
prop: "productCategory", span: 8,
type: "select", dicData: Type,
span: 8, editDisabled: true,
dicData: Type, rules: [
editDisabled: true, {
rules: required: true,
[ message: "请选择资产类型",
{ trigger: "blur",
required: true, },
message: "请选择资产类型", ],
trigger: "blur", overHidden: true,
} },
], {
overHidden:true, label: "上级类型",
}, prop: "parentId",
{ dicData: [],
label: "上级类型", type: "tree",
prop: "parentId", hide: true,
dicData: [], addDisabled: false,
type: "tree", span: 8,
hide: true, props: {
addDisabled: false, label: "title",
span: 8, },
props: { rules: [
label: "title" {
}, required: false,
rules: message: "上级类型",
[ trigger: "click",
{ },
required: false, ],
message: "上级类型", overHidden: true,
trigger: "click" },
} {
], label: "状态",
overHidden:true, prop: "status",
type: "select",
}, span: 8,
{ dicData: gType,
label: "状态", overHidden: true,
prop: "status", rules: [
type: "select", {
span: 8, required: true,
dicData: gType, message: "请选择固定资产",
overHidden:true, trigger: "blur",
rules: },
[ ],
{ // value: 1,
required: true, slot: true,
message: "请选择固定资产", },
trigger: "blur", {
} label: "危险品",
], prop: "danger",
// value: 1, type: "switch",
slot:true, overHidden: true,
}, span: 8,
{ dicData: statisticsTypeDic,
label: "危险品", },
prop: "danger", {
type: "switch", label: "排序",
overHidden:true, prop: "sort",
span: 8, type: "number",
dicData: statisticsTypeDic, overHidden: true,
}, span: 8,
{ width: 100,
label: "排序", cell: true,
prop: "sort", // minRows: 1,
type: "number", rules: [
overHidden:true, {
span: 8, required: true,
width: 100, message: "请输入排序",
cell: true, trigger: "blur",
// minRows: 1, },
rules: [{ ],
required: true, },
message: "请输入排序", ],
trigger: "blur" };
}],
},
]
}

@ -244,6 +244,7 @@
class="menuLeft" class="menuLeft"
size="small" size="small"
style="float: right" style="float: right"
v-if="permission.goods_list_check_btn"
@click="goodsconfirm" @click="goodsconfirm"
>&ensp;物品确认</el-button >&ensp;物品确认</el-button
> >
@ -549,8 +550,8 @@
/> />
</div> </div>
<div class="goodnumsc" style="width: 240px; margin-right: 20px"> <div class="goodnumsc" style="width: 240px; margin-right: 20px">
<!-- <span class="choice" @click="choiceBatch(item, 1)">选择批次</span> --> <span class="choice" @click="choiceBatch(item, 1)">选择批次</span>
<span>申领数:&emsp;&emsp;&emsp;</span> <!-- <span>申领数:&emsp;&emsp;&emsp;</span> -->
<el-input <el-input
v-model="item.applyNum" v-model="item.applyNum"
placeholder="请输入申领数" placeholder="请输入申领数"

@ -58,6 +58,7 @@
type="primary" type="primary"
style="float: right; margin-right: 20px" style="float: right; margin-right: 20px"
@click="confirmDevice" @click="confirmDevice"
v-if="permission.Instrument_equipment_check"
>设备确认</el-button >设备确认</el-button
> >
</SearchHeader> </SearchHeader>
@ -109,7 +110,7 @@
@click="scrapHandle(row, index)" @click="scrapHandle(row, index)"
>报废</el-button >报废</el-button
> >
<el-button <!-- <el-button
class="look" class="look"
size="small" size="small"
v-if=" v-if="
@ -119,7 +120,7 @@
" "
@click="routerToInspection(row)" @click="routerToInspection(row)"
>校准</el-button >校准</el-button
> > -->
<el-button <el-button
v-if="permission.Instrument_equipment_delete" v-if="permission.Instrument_equipment_delete"
class="look" class="look"

@ -542,7 +542,7 @@ export default {
} }
.file_box{ .file_box{
background: red; // background: red;
} }
</style> </style>

@ -387,7 +387,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="供应商" prop="supplierId"> <el-form-item label="供应商" prop="supplierId">
<el-select <el-select
:readonly=" :disabled="
(dialogType == 'view' && addForm.applyStatus != 0) || (dialogType == 'view' && addForm.applyStatus != 0) ||
(dialogType == 'examine' && addForm.applyStatus == 1) (dialogType == 'examine' && addForm.applyStatus == 1)
" "
@ -489,7 +489,7 @@
<el-table-column width="57px"> <el-table-column width="57px">
<template slot="header"> <template slot="header">
<el-button <el-button
:readonly=" :disabled="
(dialogType == 'view' && addForm.applyStatus != 0) || (dialogType == 'view' && addForm.applyStatus != 0) ||
(dialogType == 'examine' && addForm.applyStatus == 1) (dialogType == 'examine' && addForm.applyStatus == 1)
" "
@ -502,7 +502,7 @@
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:readonly=" :disabled="
(dialogType == 'view' && addForm.applyStatus != 0) || (dialogType == 'view' && addForm.applyStatus != 0) ||
(dialogType == 'examine' && addForm.applyStatus == 1) (dialogType == 'examine' && addForm.applyStatus == 1)
" "
@ -632,7 +632,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col style="width: 90%; margin-left: 1%"> <el-col style="width: 90%; margin-left: 1%">
<p style="font-size: 14px; color: #606266">审批意见</p> <p style="font-size: 14px; color: #606266">审批意见</p>
<el-select v-model="examineValue" :readonly="(addForm.applyStatus == 2 || addForm.applyStatus == 3 || addForm.applyStatus == 4) && dialogType == 'view'"> <el-select v-model="addForm.status" :readonly="(addForm.applyStatus == 2 || addForm.applyStatus == 3 || addForm.applyStatus == 4) && dialogType == 'view'">
<el-option v-for="item in examineList" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in examineList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-col> </el-col>
@ -641,7 +641,7 @@
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button v-show="(dialogType == 'view' && addForm.applyStatus != 1 && addForm.applyStatus != 2 && addForm.applyStatus != 3 && addForm.applyStatus != 4) || (dialogType == 'examine' && addForm.applyStatus == 1)" @click="handleSubmit()" <el-button v-show="(dialogType == 'view' && addForm.applyStatus != 1 && addForm.applyStatus != 2 && addForm.applyStatus != 3 && addForm.applyStatus != 4) || (dialogType == 'examine' && addForm.applyStatus == 1) || dialogType == 'add'" @click="handleSubmit()"
> </el-button > </el-button
> >
<el-button <el-button
@ -953,6 +953,7 @@ export default {
getDetail({ id: row.id }).then((res) => { getDetail({ id: row.id }).then((res) => {
this.addForm = res.data.data; this.addForm = res.data.data;
this.examineValue = '' this.examineValue = ''
this.addForm.status = ''
this.goodsList = this.addForm.orderList; this.goodsList = this.addForm.orderList;
this.dialogInputVisible = true; this.dialogInputVisible = true;
}); });
@ -965,6 +966,7 @@ export default {
this.addForm = res.data.data; this.addForm = res.data.data;
this.goodsList = this.addForm.orderList; this.goodsList = this.addForm.orderList;
this.examineValue = this.addForm.applyStatus this.examineValue = this.addForm.applyStatus
this.addForm.status = this.addForm.status + ''
this.dialogInputVisible = true; this.dialogInputVisible = true;
if (this.addForm.applyStatus == 0) { if (this.addForm.applyStatus == 0) {
this.isSave = true; this.isSave = true;
@ -991,6 +993,7 @@ export default {
}, },
// //
handleCheck(row) { handleCheck(row) {
console.log('row ====>',row)
this.fileList = [] this.fileList = []
this.filesList = [] this.filesList = []
this.dialogcheckVisible = true; this.dialogcheckVisible = true;
@ -998,7 +1001,10 @@ export default {
this.$refs.checkForm.clearValidate() this.$refs.checkForm.clearValidate()
this.checkForm = { this.checkForm = {
applyId : row.id, applyId : row.id,
checkUserName : this.userInfo.real_name name:row.name,
supplierId:row.supplierId,
checkUserName : this.userInfo.real_name,
receiveDate:row.expectedArrivalDate
} }
console.log('check ==============>',this.checkForm) console.log('check ==============>',this.checkForm)
}) })
@ -1099,10 +1105,10 @@ export default {
} }
}else if(this.dialogType == 'examine'){ }else if(this.dialogType == 'examine'){
console.log('examine ==================>') console.log('examine ==================>')
if(this.examineValue == ''){ if(this.addForm.status == ''){
this.$message.error('请填写审批意见') this.$message.error('请填写审批意见')
}else{ }else{
this.addForm.applyStatus = this.examineValue; this.addForm.applyStatus = this.addForm.status;
savePurchase(this.addForm).then((res) => { savePurchase(this.addForm).then((res) => {
console.log("add ===========>", res); console.log("add ===========>", res);
if (res.data.code == 200) { if (res.data.code == 200) {

@ -181,7 +181,7 @@
" "
> >
</span </span
>&ensp;<b>报修单审核</b> {{status}} {{viewType}} >&ensp;<b>报修单审核</b>
</h1> </h1>
</div> </div>
<el-row> <el-row>

Loading…
Cancel
Save