main
zhangqun 2 years ago
parent 8f2b80cbc4
commit fc5674c6b5
  1. 5
      package-lock.json
  2. 30
      src/const/limsConfig/equipmentManage.js
  3. 2
      src/styles/element-ui.scss
  4. 65
      src/views/limsConfig/equipmentManage.vue
  5. 4
      src/views/repair/proposer.vue

5
package-lock.json generated

@ -7175,6 +7175,11 @@
"esprima": "^4.0.0"
}
},
"jsbarcode": {
"version": "3.11.6",
"resolved": "https://registry.npmmirror.com/jsbarcode/-/jsbarcode-3.11.6.tgz",
"integrity": "sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA=="
},
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",

@ -141,20 +141,20 @@ export const tableOption = {
align: "left",
overHidden: true,
},
{
type: "select",
span: 8,
label: "是否需要检定",
prop: "isVerification",
slot: true,
align: "left",
overHidden: true,
dicData: [
{ label: "是", value: "1" },
{ label: "否", value: "0" },
],
rules: [{ required: true, message: "请选择是否需要检定" }],
},
// {
// type: "select",
// span: 8,
// label: "是否需要检定",
// prop: "isVerification",
// slot: true,
// align: "left",
// overHidden: true,
// dicData: [
// { label: "是", value: "1" },
// { label: "否", value: "0" },
// ],
// rules: [{ required: true, message: "请选择是否需要检定" }],
// },
{
span: 8,
label: "是否已确认",
@ -177,7 +177,7 @@ export const tableOption = {
{
type: "select",
span: 8,
label: "状态",
label: "设备状态",
prop: "instrumentStatus",
slot: true,
align: "left",

@ -63,7 +63,7 @@
}
.el-card__body {
//padding: 16px !important;
padding: 20px 20px 40px !important;
}
.el-divider--horizontal {

@ -8,7 +8,7 @@
@searchHandle="searchHandle"
@addHandle="$refs.crud.rowAdd()"
>
<el-select
<!-- <el-select
class="inputHeight"
v-model="searchForm.isVerification"
placeholder="请选择是否需要检定"
@ -22,9 +22,39 @@
:value="item.value"
>
</el-option>
</el-select> -->
<!-- <el-select
class="inputHeight"
v-model="searchForm.status"
placeholder="请选择设备状态"
size="small"
clearable
>
<el-option
v-for="item in statusList"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select> -->
<el-select
class="inputHeight"
v-model="searchForm.runStatus"
placeholder="请选择运行状态"
size="small"
clearable
>
<el-option
v-for="item in runList"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
<el-button
<!-- <el-button
class="cus-confirm"
slot="otherBtn"
size="small"
@ -32,7 +62,7 @@
style="float: right; margin-right: 20px"
@click="batchPrint"
>批量打印</el-button
>
> -->
<el-button
class="cus-confirm"
slot="otherBtn"
@ -244,7 +274,7 @@ export default {
},
//
searchForm: { name: "", isVerification: "" },
searchForm: { name: "", isVerification: "", status: "", instrumentStatus: "", runStatus: "" },
//
searchText: { addText: "新增", flag: 3 },
option: tableOption,
@ -320,14 +350,25 @@ export default {
if(tmp){
this.$message.warning('请选择未处理的设备')
}else{
let params = this.selectionList[0]
params.status = 1
update(params).then(res =>{
if(res.data){
this.$message.success('设备确认成功')
this.onLoad(this.page[0], this.searchForm)
}
})
this.$confirm("是否确认选中设备?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
let params = this.selectionList[0]
params.status = 1
update(params).then(res =>{
if(res.data){
this.$message.success('设备确认成功')
this.onLoad(this.page[0], this.searchForm)
}
}).catch(err => {
this.$message({
type: 'error',
message: "设备确认失败!"
});
})
});
}
}
},

@ -60,11 +60,11 @@
</el-row>
</el-form>
</template>
<template slot="menuRight">
<!-- <template slot="menuRight">
<el-button class="search" style="width: 120px" @click="printRepair"
>打印报修单</el-button
>
</template>
</template> -->
<template slot-scope="{ row }" slot="status">
<span v-if="row.status === 0" style="color: #ee922f">待审核</span>
<span v-if="row.status === 1" style="color: #e56926">待派单</span>

Loading…
Cancel
Save